Remove Channel ID feature from Webview
Bug: 17177684
The feature requires a public api to share channel IDs or disable them.
We will enable the feature after the APIs are added.
The chromium counterpart of this code already landed here:
https://codereview.chromium.org/497963002/
Change-Id: I2ae0b0bf4a9476cf6b2ebc8759c49805f303db6b
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index d0d7d5e..261bed9 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -210,12 +210,6 @@
#endif
url_request_context_.reset(builder.Build());
- server_bound_cert_service_.reset(
- new net::ServerBoundCertService(
- new net::DefaultServerBoundCertStore(NULL),
- base::WorkerPool::GetTaskRunner(true)));
- url_request_context_->set_server_bound_cert_service(
- server_bound_cert_service_.get());
// TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
net::HttpNetworkSession::Params network_session_params;
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 8eedbc4..02eb745 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -11,7 +11,6 @@
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h"
#include "net/http/http_network_session.h"
-#include "net/ssl/server_bound_cert_service.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_job_factory.h"
@@ -69,7 +68,6 @@
scoped_ptr<DataReductionProxyConfigService> proxy_config_service_;
scoped_ptr<net::URLRequestJobFactory> job_factory_;
scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
- scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
// ProtocolHandlers and interceptors are stored here between
// SetHandlersAndInterceptors() and the first GetURLRequestContext() call.
