diff options
| author | sgurun <sgurun@chromium.org> | 2014-08-23 15:26:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-23 22:26:34 +0000 |
| commit | 3197cce8af19aca297a9acd3a8b8c75c8d64e9cf (patch) | |
| tree | 6d1d55e94c5c0d991cc981b2e49cb26e01649041 | |
| parent | d19a1692e6b582d8caf07e24c77e95b0e3355d0f (diff) | |
| download | chromium_src-3197cce8af19aca297a9acd3a8b8c75c8d64e9cf.zip chromium_src-3197cce8af19aca297a9acd3a8b8c75c8d64e9cf.tar.gz chromium_src-3197cce8af19aca297a9acd3a8b8c75c8d64e9cf.tar.bz2 | |
Disable Channel ID
BUG=406854
Bug: b/17177684
Enabling channel ID causes problems for apps that use multiple network
stacks (such as httpurlconnection and webview) or multiple webviews
and want to share cookies. Disable until we provide some solution.
Review URL: https://codereview.chromium.org/497963002
Cr-Commit-Position: refs/heads/master@{#291610}
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 5 | ||||
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.h | 2 |
2 files changed, 0 insertions, 7 deletions
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 22666fb..6e39cd7 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -208,11 +208,6 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() { ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); url_request_context_.reset(builder.Build()); - channel_id_service_.reset( - new net::ChannelIDService( - new net::DefaultChannelIDStore(NULL), - base::WorkerPool::GetTaskRunner(true))); - url_request_context_->set_channel_id_service(channel_id_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 712893a..1ec4123 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/channel_id_service.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_job_factory.h" @@ -75,7 +74,6 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter { data_reduction_proxy_auth_request_handler_; scoped_ptr<net::URLRequestJobFactory> job_factory_; scoped_ptr<net::HttpTransactionFactory> main_http_factory_; - scoped_ptr<net::ChannelIDService> channel_id_service_; // ProtocolHandlers and interceptors are stored here between // SetHandlersAndInterceptors() and the first GetURLRequestContext() call. |