Rename ServerBoundCert => ChannelID to reflect the current name.

chromecast/shell/browser/url_request_context_factory.cc

 // Copyright 2014 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 "chromecast/shell/browser/url_request_context_factory.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/threading/worker_pool.h"
 #include "chromecast/shell/browser/cast_http_user_agent_settings.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cookies/cookie_store.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream_factory.h"
 #include "net/ocsp/nss_ocsp.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/next_proto.h"
-#include "net/ssl/default_server_bound_cert_store.h"
-#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/channel_id_service.h"
+#include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 
 namespace chromecast {
 namespace shell {
 
@@ skipping 136 matching lines @@
   return media_getter_.get();
 }
 
 void URLRequestContextFactory::InitializeSystemContextDependencies() {
   if (system_dependencies_initialized_)
     return;
 
   host_resolver_ = net::HostResolver::CreateDefaultResolver(NULL);
 
   // TODO(lcwu): http://crbug.com/392352. For performance and security reasons,
-  // a persistent (on-disk) HttpServerProperties and ServerBoundCertService
-  // might be desirable in the future.
-  server_bound_cert_service_.reset(new net::ServerBoundCertService(
-      new net::DefaultServerBoundCertStore(NULL),
-      base::WorkerPool::GetTaskRunner(true)));
+  // a persistent (on-disk) HttpServerProperties and ChannelIDService might be
+  // desirable in the future.
+  channel_id_service_.reset(
+      new net::ChannelIDService(new net::DefaultChannelIDStore(NULL),
+                                base::WorkerPool::GetTaskRunner(true)));
 
   cert_verifier_.reset(net::CertVerifier::CreateDefault());
 
   ssl_config_service_ = new net::SSLConfigServiceDefaults;
 
   transport_security_state_.reset(new net::TransportSecurityState());
   http_auth_handler_factory_.reset(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver_.get()));
 
   http_server_properties_.reset(new net::HttpServerPropertiesImpl);
@@ skipping 58 matching lines @@
 
   media_transaction_factory_.reset(transaction_factory);
   media_dependencies_initialized_ = true;
 }
 
 void URLRequestContextFactory::PopulateNetworkSessionParams(
     bool ignore_certificate_errors,
     net::HttpNetworkSession::Params* params) {
   params->host_resolver = host_resolver_.get();
   params->cert_verifier = cert_verifier_.get();
-  params->server_bound_cert_service = server_bound_cert_service_.get();
+  params->channel_id_service = channel_id_service_.get();
   params->ssl_config_service = ssl_config_service_.get();
   params->transport_security_state = transport_security_state_.get();
   params->http_auth_handler_factory = http_auth_handler_factory_.get();
   params->http_server_properties = http_server_properties_->GetWeakPtr();
   params->ignore_certificate_errors = ignore_certificate_errors;
   params->proxy_service = proxy_service_.get();
 
   // TODO(lcwu): http://crbug.com/329681. Remove this once spdy is enabled
   // by default at the content level.
   params->next_protos = net::NextProtosSpdy31();
   params->use_alternate_protocols = true;
 }
 
 net::URLRequestContext* URLRequestContextFactory::CreateSystemRequestContext() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   InitializeSystemContextDependencies();
   net::HttpNetworkSession::Params system_params;
   PopulateNetworkSessionParams(false, &system_params);
   system_transaction_factory_.reset(new net::HttpNetworkLayer(
       new net::HttpNetworkSession(system_params)));
 
   net::URLRequestContext* system_context = new net::URLRequestContext();
   system_context->set_host_resolver(host_resolver_.get());
-  system_context->set_server_bound_cert_service(
-      server_bound_cert_service_.get());
+  system_context->set_channel_id_service(channel_id_service_.get());
   system_context->set_cert_verifier(cert_verifier_.get());
   system_context->set_proxy_service(proxy_service_.get());
   system_context->set_ssl_config_service(ssl_config_service_.get());
   system_context->set_transport_security_state(
       transport_security_state_.get());
   system_context->set_http_auth_handler_factory(
       http_auth_handler_factory_.get());
   system_context->set_http_server_properties(
       http_server_properties_->GetWeakPtr());
   system_context->set_http_transaction_factory(
@@ skipping 51 matching lines @@
       browser_context->GetPath().Append(kCookieStoreFile),
       content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES,
       NULL, NULL);
   cookie_config.background_task_runner =
       scoped_refptr<base::SequencedTaskRunner>();
   scoped_refptr<net::CookieStore> cookie_store =
       content::CreateCookieStore(cookie_config);
 
   net::URLRequestContext* main_context = new net::URLRequestContext();
   main_context->set_host_resolver(host_resolver_.get());
-  main_context->set_server_bound_cert_service(
-      server_bound_cert_service_.get());
+  main_context->set_channel_id_service(channel_id_service_.get());
   main_context->set_cert_verifier(cert_verifier_.get());
   main_context->set_proxy_service(proxy_service_.get());
   main_context->set_ssl_config_service(ssl_config_service_.get());
   main_context->set_transport_security_state(transport_security_state_.get());
   main_context->set_http_auth_handler_factory(
       http_auth_handler_factory_.get());
   main_context->set_http_server_properties(
       http_server_properties_->GetWeakPtr());
   main_context->set_cookie_store(cookie_store.get());
   main_context->set_http_user_agent_settings(
       http_user_agent_settings_.get());
 
   main_context->set_http_transaction_factory(
       main_transaction_factory_.get());
   main_context->set_job_factory(main_job_factory_.get());
   return main_context;
 }
 
 }  // namespace shell
 }  // namespace chromecast