Update from https://crrev.com/312398

net/url_request/url_request_context_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 191 matching lines @@
 
 URLRequestContextBuilder::URLRequestContextBuilder()
     : data_enabled_(false),
 #if !defined(DISABLE_FILE_SUPPORT)
       file_enabled_(false),
 #endif
 #if !defined(DISABLE_FTP_SUPPORT)
       ftp_enabled_(false),
 #endif
       http_cache_enabled_(true),
-      throttling_enabled_(false),
-      channel_id_enabled_(true) {
+      throttling_enabled_(false) {
 }
 
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
 
 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) {
   http_cache_enabled_ = true;
   http_cache_params_ = params;
 }
 
 void URLRequestContextBuilder::DisableHttpCache() {
   http_cache_enabled_ = false;
   http_cache_params_ = HttpCacheParams();
 }
 
 void URLRequestContextBuilder::SetSpdyAndQuicEnabled(bool spdy_enabled,
                                                      bool quic_enabled) {
   http_network_session_params_.next_protos =
       NextProtosWithSpdyAndQuic(spdy_enabled, quic_enabled);
   http_network_session_params_.enable_quic = quic_enabled;
 }
 
+void URLRequestContextBuilder::SetCookieAndChannelIdStores(
+      const scoped_refptr<CookieStore>& cookie_store,
+      scoped_ptr<ChannelIDService> channel_id_service) {
+  DCHECK(cookie_store);
+  cookie_store_ = cookie_store;
+  channel_id_service_ = channel_id_service.Pass();
+}
+
 URLRequestContext* URLRequestContextBuilder::Build() {
   BasicURLRequestContext* context = new BasicURLRequestContext;
   URLRequestContextStorage* storage = context->storage();
 
   storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
       accept_language_, user_agent_));
 
   if (!network_delegate_)
     network_delegate_.reset(new BasicNetworkDelegate);
   NetworkDelegate* network_delegate = network_delegate_.release();
@@ skipping 38 matching lines @@
   storage->set_ssl_config_service(new net::SSLConfigServiceDefaults);
   HttpAuthHandlerRegistryFactory* http_auth_handler_registry_factory =
       net::HttpAuthHandlerRegistryFactory::CreateDefault(
            context->host_resolver());
   for (size_t i = 0; i < extra_http_auth_handlers_.size(); ++i) {
     http_auth_handler_registry_factory->RegisterSchemeFactory(
         extra_http_auth_handlers_[i].scheme,
         extra_http_auth_handlers_[i].factory);
   }
   storage->set_http_auth_handler_factory(http_auth_handler_registry_factory);
-  storage->set_cookie_store(new CookieMonster(NULL, NULL));
 
-  if (channel_id_enabled_) {
+  if (cookie_store_) {
+    storage->set_cookie_store(cookie_store_.get());
+    storage->set_channel_id_service(channel_id_service_.Pass());
+  } else {
+    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()));
+    storage->set_channel_id_service(make_scoped_ptr(
+        new ChannelIDService(new DefaultChannelIDStore(NULL),
+                             context->GetFileThread()->message_loop_proxy())));
   }
 
   storage->set_transport_security_state(new net::TransportSecurityState());
   if (!transport_security_persister_path_.empty()) {
     context->set_transport_security_persister(
         make_scoped_ptr<TransportSecurityPersister>(
             new TransportSecurityPersister(
                 context->transport_security_state(),
                 transport_security_persister_path_,
                 context->GetFileThread()->message_loop_proxy(),
@@ skipping 89 matching lines @@
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   storage->set_job_factory(job_factory);
 
   // TODO(willchan): Support sdch.
 
   return context;
 }
 
 }  // namespace net