Added an OriginBoundCertStore field to the SSLClientSocketNSS class and

did the plumbing to pass this field through the layers. In addition,
this CL groups several fields together into a single struct |SSLClientSocket::Context|.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/7315009

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

2 files changed, 12 insertions, 0 deletions

diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 608196c..2349a23 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -16,6 +16,7 @@ URLRequestContext::URLRequestContext()
     : net_log_(NULL),
       host_resolver_(NULL),
       cert_verifier_(NULL),
+      origin_bound_cert_service_(NULL),
       dnsrr_resolver_(NULL),
       dns_cert_checker_(NULL),
       http_auth_handler_factory_(NULL),
@@ -33,6 +34,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_dnsrr_resolver(other->dnsrr_resolver());
   set_dns_cert_checker(other->dns_cert_checker());
   set_http_auth_handler_factory(other->http_auth_handler_factory());
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 4e3b9c1..d64db3d 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -30,6 +30,7 @@ class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpTransactionFactory;
 class NetworkDelegate;
+class OriginBoundCertService;
 class ProxyService;
 class URLRequest;
 class URLRequestJobFactory;
@@ -71,6 +72,14 @@ class NET_API URLRequestContext
     cert_verifier_ = cert_verifier;
   }
 
+  OriginBoundCertService* origin_bound_cert_service() const {
+    return origin_bound_cert_service_;
+  }
+  void set_origin_bound_cert_service(
+      OriginBoundCertService* origin_bound_cert_service) {
+    origin_bound_cert_service_ = origin_bound_cert_service;
+  }
+
   DnsRRResolver* dnsrr_resolver() const {
     return dnsrr_resolver_;
   }
@@ -189,6 +198,7 @@ class NET_API URLRequestContext
   NetLog* net_log_;
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
+  OriginBoundCertService* origin_bound_cert_service_;
   DnsRRResolver* dnsrr_resolver_;
   DnsCertProvenanceChecker* dns_cert_checker_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;