diff options
| author | Selim Gurun <sgurun@google.com> | 2014-11-17 18:36:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-17 18:36:42 +0000 |
| commit | b036d6a1ec5bda0be48156dfcd779a9563a4feb3 (patch) | |
| tree | 4e68f8f093456c82ff8bb47437f2bb60a2b6d72b | |
| parent | eb33a44eef586f62300547e65a8f666276540b64 (diff) | |
| parent | 3c9a4a7bbec40de49d55363e12a368fe0b01dca9 (diff) | |
| download | chromium_org-b036d6a1ec5bda0be48156dfcd779a9563a4feb3.tar.gz | |
Merge "Disable channel id" into m39
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 1 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.cc | 17 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.h | 5 |
3 files changed, 16 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 44c081d958..94678cd13d 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -208,6 +208,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() { builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( AwContentBrowserClient::GetAcceptLangsImpl())); builder.set_net_log(net_log_.get()); + builder.set_channel_id_enabled(false); ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); url_request_context_.reset(builder.Build()); diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index a7f5a0b90c..f687699bf5 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -218,7 +218,8 @@ URLRequestContextBuilder::URLRequestContextBuilder() ftp_enabled_(false), #endif http_cache_enabled_(true), - throttling_enabled_(false) { + throttling_enabled_(false), + channel_id_enabled_(true) { } URLRequestContextBuilder::~URLRequestContextBuilder() {} @@ -300,12 +301,14 @@ URLRequestContext* URLRequestContextBuilder::Build() { storage->set_http_auth_handler_factory(http_auth_handler_registry_factory); storage->set_cookie_store(new CookieMonster(NULL, NULL)); - // TODO(mmenke): This always creates a file thread, even when it ends up - // not being used. Consider lazily creating the thread. - storage->set_channel_id_service( - new ChannelIDService( - new DefaultChannelIDStore(NULL), - context->GetFileThread()->message_loop_proxy())); + if (channel_id_enabled_) { + // TODO(mmenke): This always creates a file thread, even when it ends up + // not being used. Consider lazily creating the thread. + storage->set_channel_id_service( + new ChannelIDService( + new DefaultChannelIDStore(NULL), + context->GetFileThread()->message_loop_proxy())); + } storage->set_transport_security_state(new net::TransportSecurityState()); if (!transport_security_persister_path_.empty()) { diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h index 9053372709..233918cdf1 100644 --- a/net/url_request/url_request_context_builder.h +++ b/net/url_request/url_request_context_builder.h @@ -166,6 +166,10 @@ class NET_EXPORT URLRequestContextBuilder { throttling_enabled_ = throttling_enabled; } + void set_channel_id_enabled(bool enable) { + channel_id_enabled_ = enable; + } + URLRequestContext* Build(); private: @@ -192,6 +196,7 @@ class NET_EXPORT URLRequestContextBuilder { #endif bool http_cache_enabled_; bool throttling_enabled_; + bool channel_id_enabled_; HttpCacheParams http_cache_params_; HttpNetworkSessionParams http_network_session_params_; |