Update from https://crrev.com/312398

net/url_request/url_request_context_builder.h

Index: net/url_request/url_request_context_builder.h
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index f26552a1d085ca398f676c8382fa7ecba903178f..209b36ab809e39111b68700f805b655076cac47f 100644
--- a/net/url_request/url_request_context_builder.h
+++ b/net/url_request/url_request_context_builder.h
@@ -32,6 +32,8 @@
 
 namespace net {
 
+class ChannelIDService;
+class CookieStore;
 class FtpTransactionFactory;
 class HostMappingRules;
 class HttpAuthHandlerFactory;
@@ -174,9 +176,16 @@ class NET_EXPORT URLRequestContextBuilder {
     throttling_enabled_ = throttling_enabled;
   }
 
-  void set_channel_id_enabled(bool enable) {
-    channel_id_enabled_ = enable;
-  }
+  // Override the default in-memory cookie store and channel id service.
+  // |cookie_store| must not be NULL. |channel_id_service| may be NULL to
+  // disable channel id for this context.
+  // Note that a persistent cookie store should not be used with an in-memory
+  // channel id service, and one cookie store should not be shared between
+  // multiple channel-id stores (or used both with and without a channel id
+  // store).
+  void SetCookieAndChannelIdStores(
+      const scoped_refptr<CookieStore>& cookie_store,
+      scoped_ptr<ChannelIDService> channel_id_service);
 
   URLRequestContext* Build();
 
@@ -204,16 +213,17 @@ 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_;
   base::FilePath transport_security_persister_path_;
   scoped_ptr<NetLog> net_log_;
   scoped_ptr<HostResolver> host_resolver_;
+  scoped_ptr<ChannelIDService> channel_id_service_;
   scoped_ptr<ProxyConfigService> proxy_config_service_;
   scoped_ptr<ProxyService> proxy_service_;
   scoped_ptr<NetworkDelegate> network_delegate_;
+  scoped_refptr<CookieStore> cookie_store_;
   scoped_ptr<FtpTransactionFactory> ftp_transaction_factory_;
   std::vector<SchemeFactory> extra_http_auth_handlers_;