Rename ServerBoundCert => ChannelID to reflect the current name.

These were missed by the big renaming CL
https://codereview.chromium.org/356713005/.

R=rch@chromium.org,asargent@chromium.org,lcwu@chromium.org
TBR=twilson@chromium.org
BUG=

Review URL: https://codereview.chromium.org/430673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287932 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/socket/tls_socket_unittest.cc

@@ -27,10 +27,6 @@ using testing::SaveArg;
 using testing::WithArgs;
 using base::StringPiece;
 
-namespace net {
-class ServerBoundCertService;
-}
-
 namespace extensions {
 
 class MockSSLClientSocket : public net::SSLClientSocket {
@@ -69,7 +65,6 @@ class MockSSLClientSocket : public net::SSLClientSocket {
   MOCK_METHOD1(GetSSLCertRequestInfo, void(net::SSLCertRequestInfo*));
   MOCK_METHOD1(GetNextProto,
                net::SSLClientSocket::NextProtoStatus(std::string*));
-  MOCK_CONST_METHOD0(GetServerBoundCertService, net::ServerBoundCertService*());
   MOCK_CONST_METHOD0(GetUnverifiedServerCertificateChain,
                      scoped_refptr<net::X509Certificate>());
   MOCK_CONST_METHOD0(GetChannelIDService, net::ChannelIDService*());

chromecast/shell/browser/url_request_context_factory.cc

@@ -26,8 +26,8 @@
 #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"
@@ -184,11 +184,11 @@ void URLRequestContextFactory::InitializeSystemContextDependencies() {
   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());
 
@@ -267,7 +267,7 @@ void URLRequestContextFactory::PopulateNetworkSessionParams(
     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();
@@ -291,8 +291,7 @@ net::URLRequestContext* URLRequestContextFactory::CreateSystemRequestContext() {
 
   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());
@@ -364,8 +363,7 @@ net::URLRequestContext* URLRequestContextFactory::CreateMainRequestContext(
 
   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());

chromecast/shell/browser/url_request_context_factory.h

@@ -79,7 +79,7 @@ class URLRequestContextFactory {
   // instance of URLRequestContext only.
   bool system_dependencies_initialized_;
   scoped_ptr<net::HostResolver> host_resolver_;
-  scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
+  scoped_ptr<net::ChannelIDService> channel_id_service_;
   scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   scoped_ptr<net::TransportSecurityState> transport_security_state_;

components/policy/core/common/cloud/system_policy_request_context.cc

@@ -57,7 +57,7 @@ SystemPolicyRequestContext::GetURLRequestContext() {
     context_->set_http_transaction_factory(http_transaction_factory_.get());
 
     // No cookies, please. We also don't track channel IDs (no
-    // ServerBoundCertService).
+    // ChannelIDService).
     context_->set_cookie_store(new net::CookieMonster(NULL, NULL));
   }