Change Origin bound certs -> Domain bound certs.

BUG=115348
TEST=unit tests, manually checked 'Origin Bound Certs' contents after browsing
TBR=jam@chromium.org,willchan@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9617039

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

5 files changed, 23 insertions, 23 deletions

diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index c2c7843..e42d465 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -18,7 +18,7 @@ URLRequestContext::URLRequestContext()
       net_log_(NULL),
       host_resolver_(NULL),
       cert_verifier_(NULL),
-      origin_bound_cert_service_(NULL),
+      server_bound_cert_service_(NULL),
       fraudulent_certificate_reporter_(NULL),
       http_auth_handler_factory_(NULL),
       proxy_service_(NULL),
@@ -36,7 +36,7 @@ void URLRequestContext::CopyFrom(URLRequestContext* other) {
   set_net_log(other->net_log());
   set_host_resolver(other->host_resolver());
   set_cert_verifier(other->cert_verifier());
-  set_origin_bound_cert_service(other->origin_bound_cert_service());
+  set_server_bound_cert_service(other->server_bound_cert_service());
   set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter());
   set_http_auth_handler_factory(other->http_auth_handler_factory());
   set_proxy_service(other->proxy_service());
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 7d9d2e6..f4fb5ea 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -31,7 +31,7 @@ class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpTransactionFactory;
 class NetworkDelegate;
-class OriginBoundCertService;
+class ServerBoundCertService;
 class ProxyService;
 class URLRequest;
 class URLRequestJobFactory;
@@ -77,13 +77,13 @@ class NET_EXPORT URLRequestContext
     cert_verifier_ = cert_verifier;
   }
 
-  OriginBoundCertService* origin_bound_cert_service() const {
-    return origin_bound_cert_service_;
+  ServerBoundCertService* server_bound_cert_service() const {
+    return server_bound_cert_service_;
   }
 
-  void set_origin_bound_cert_service(
-      OriginBoundCertService* origin_bound_cert_service) {
-    origin_bound_cert_service_ = origin_bound_cert_service;
+  void set_server_bound_cert_service(
+      ServerBoundCertService* server_bound_cert_service) {
+    server_bound_cert_service_ = server_bound_cert_service;
   }
 
   FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
@@ -207,7 +207,7 @@ class NET_EXPORT URLRequestContext
   NetLog* net_log_;
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
-  OriginBoundCertService* origin_bound_cert_service_;
+  ServerBoundCertService* server_bound_cert_service_;
   FraudulentCertificateReporter* fraudulent_certificate_reporter_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   ProxyService* proxy_service_;
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index 8890839..2c9f816 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -44,10 +44,10 @@ void URLRequestContextStorage::set_cert_verifier(CertVerifier* cert_verifier) {
   cert_verifier_.reset(cert_verifier);
 }
 
-void URLRequestContextStorage::set_origin_bound_cert_service(
-    OriginBoundCertService* origin_bound_cert_service) {
-  context_->set_origin_bound_cert_service(origin_bound_cert_service);
-  origin_bound_cert_service_.reset(origin_bound_cert_service);
+void URLRequestContextStorage::set_server_bound_cert_service(
+    ServerBoundCertService* server_bound_cert_service) {
+  context_->set_server_bound_cert_service(server_bound_cert_service);
+  server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
 void URLRequestContextStorage::set_fraudulent_certificate_reporter(
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 8ae2a00..1e62fb1 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -23,7 +23,7 @@ class HttpServerProperties;
 class HttpTransactionFactory;
 class NetLog;
 class NetworkDelegate;
-class OriginBoundCertService;
+class ServerBoundCertService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityState;
@@ -46,8 +46,8 @@ class NET_EXPORT URLRequestContextStorage {
   void set_net_log(NetLog* net_log);
   void set_host_resolver(HostResolver* host_resolver);
   void set_cert_verifier(CertVerifier* cert_verifier);
-  void set_origin_bound_cert_service(
-      OriginBoundCertService* origin_bound_cert_service);
+  void set_server_bound_cert_service(
+      ServerBoundCertService* server_bound_cert_service);
   void set_fraudulent_certificate_reporter(
       FraudulentCertificateReporter* fraudulent_certificate_reporter);
   void set_http_auth_handler_factory(
@@ -75,7 +75,7 @@ class NET_EXPORT URLRequestContextStorage {
   scoped_ptr<NetLog> net_log_;
   scoped_ptr<HostResolver> host_resolver_;
   scoped_ptr<CertVerifier> cert_verifier_;
-  scoped_ptr<OriginBoundCertService> origin_bound_cert_service_;
+  scoped_ptr<ServerBoundCertService> server_bound_cert_service_;
   scoped_ptr<FraudulentCertificateReporter> fraudulent_certificate_reporter_;
   scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
   scoped_ptr<ProxyService> proxy_service_;
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index dc5fa05..274a411 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -143,10 +143,10 @@ void TestURLRequestContext::Init() {
   if (!cookie_store())
     context_storage_.set_cookie_store(new net::CookieMonster(NULL, NULL));
   // In-memory origin bound cert service.
-  if (!origin_bound_cert_service()) {
-    context_storage_.set_origin_bound_cert_service(
-        new net::OriginBoundCertService(
-            new net::DefaultOriginBoundCertStore(NULL)));
+  if (!server_bound_cert_service()) {
+    context_storage_.set_server_bound_cert_service(
+        new net::ServerBoundCertService(
+            new net::DefaultServerBoundCertStore(NULL)));
   }
   if (accept_language().empty())
     set_accept_language("en-us,fr");