Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/extensions/extension_messages_apitest.cc

Index: chrome/browser/extensions/extension_messages_apitest.cc
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 5d219d8d2849a7e6ca0d913772f9d4cdd7a6b1b8..df14d0235b330b54bd1d2a558da31a11f142bf8d 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -34,7 +34,7 @@
 #include "net/cert/asn1_util.h"
 #include "net/cert/jwk_serializer.h"
 #include "net/dns/mock_host_resolver.h"
-#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/channel_id_service.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -837,7 +837,7 @@ class ExternallyConnectableMessagingWithTlsChannelIdTest :
         profile()->GetRequestContext());
   std::string domain_bound_private_key;
   std::string domain_bound_cert;

[wtc, 2014/07/01 19:50:50]

These two members should be renamed channel_id_private_key and channel_id_cert.

[Ryan Hamilton, 2014/07/21 19:12:05]

Done.

-  net::ServerBoundCertService::RequestHandle request_handle;
+  net::ChannelIDService::RequestHandle request_handle;
     content::BrowserThread::PostTask(
         content::BrowserThread::IO,
         FROM_HERE,
@@ -864,13 +864,13 @@ class ExternallyConnectableMessagingWithTlsChannelIdTest :
   void CreateDomainBoundCertOnIOThread(
       std::string* domain_bound_private_key,
       std::string* domain_bound_cert,
-      net::ServerBoundCertService::RequestHandle* request_handle,
+      net::ChannelIDService::RequestHandle* request_handle,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    net::ServerBoundCertService* server_bound_cert_service =
+    net::ChannelIDService* channel_id_service =
         request_context_getter->GetURLRequestContext()->
-            server_bound_cert_service();
-    int status = server_bound_cert_service->GetOrCreateDomainBoundCert(
+            channel_id_service();
+    int status = channel_id_service->GetOrCreateDomainBoundCert(
         chromium_org_url().host(),
         domain_bound_private_key,
         domain_bound_cert,