Instantiate OriginBoundCertService in relevant places and do plumbing to pass it down to HttpNetw...

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2011 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 "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
+#include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/resource_context.h"
+#include "net/base/origin_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
 }
@@ skipping 11 matching lines @@
   for (ChromeURLRequestContextGetterMap::iterator iter =
            app_request_context_getter_map_.begin();
        iter != app_request_context_getter_map_.end();
        ++iter) {
     iter->second->CleanupOnUIThread();
   }
 
   io_data_.release()->ShutdownOnUIThread();
 }
 
-void ProfileImplIOData::Handle::Init(const FilePath& cookie_path,
-                                     const FilePath& cache_path,
-                                     int cache_max_size,
-                                     const FilePath& media_cache_path,
-                                     int media_cache_max_size,
-                                     const FilePath& extensions_cookie_path,
-                                     const FilePath& app_path) {
+void ProfileImplIOData::Handle::Init(
+    const FilePath& cookie_path,
+    const FilePath& origin_bound_cert_path,
+    const FilePath& cache_path,
+    int cache_max_size,
+    const FilePath& media_cache_path,
+    int media_cache_max_size,
+    const FilePath& extensions_cookie_path,
+    const FilePath& extensions_origin_bound_cert_path,
+    const FilePath& app_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_.get());
   LazyParams* lazy_params = new LazyParams;
 
   lazy_params->cookie_path = cookie_path;
+  lazy_params->origin_bound_cert_path = origin_bound_cert_path;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
   lazy_params->media_cache_path = media_cache_path;
   lazy_params->media_cache_max_size = media_cache_max_size;
   lazy_params->extensions_cookie_path = extensions_cookie_path;
+  lazy_params->extensions_origin_bound_cert_path =
+      extensions_origin_bound_cert_path;
 
   io_data_->lazy_params_.reset(lazy_params);
 
   // Keep track of isolated app path separately so we can use it on demand.
   io_data_->app_path_ = app_path;
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
 ProfileImplIOData::Handle::GetChromeURLDataManagerBackendGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 141 matching lines @@
       io_thread_globals->http_auth_handler_factory.get());
   media_request_context_->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
 
   main_context->set_dns_cert_checker(dns_cert_checker());
   media_request_context_->set_dns_cert_checker(dns_cert_checker());
 
   main_context->set_proxy_service(proxy_service());
   media_request_context_->set_proxy_service(proxy_service());
 
+  // BEGIN(rkn)

[wtc, 2011/08/01 18:21:24]

Remove the "BEGIN(rkn)" and "END(rkn)" comments.

+  scoped_refptr<net::OriginBoundCertService> origin_bound_cert_service = NULL;
+  if (record_mode || playback_mode) {
+    // Don't use existing cookies and use an in-memory store.
+    origin_bound_cert_service= new net::OriginBoundCertService(
+        new net::DefaultOriginBoundCertStore(NULL));
+  }
+
+  // Setup origin bound cert service.
+  if (!origin_bound_cert_service) {
+    DCHECK(!lazy_params_->origin_bound_cert_path.empty());
+
+    scoped_refptr<SQLiteOriginBoundCertStore> origin_bound_cert_db =
+        new SQLiteOriginBoundCertStore(lazy_params_->origin_bound_cert_path);
+    origin_bound_cert_db->SetClearLocalStateOnExit(
+        profile_params->clear_local_state_on_exit);
+    origin_bound_cert_service =
+        new net::OriginBoundCertService(
+            new net::DefaultOriginBoundCertStore(origin_bound_cert_db.get()));
+  }
+
+  net::OriginBoundCertService* extensions_origin_bound_cert_service =

[wtc, 2011/08/01 18:21:24]

Store this in a scoped_refptr.  As a general rule, pointers
to ref-counted objects should always be stored in
scoped_refptrs to avoid reference leaks.

+      new net::OriginBoundCertService(
+          new net::DefaultOriginBoundCertStore(
+              new SQLiteOriginBoundCertStore(
+                  lazy_params_->extensions_origin_bound_cert_path)));
+
+  main_context->set_origin_bound_cert_service(origin_bound_cert_service);
+  media_request_context_->set_origin_bound_cert_service(
+      origin_bound_cert_service);
+  extensions_context->set_origin_bound_cert_service(
+      extensions_origin_bound_cert_service);
+  // END(rkn)

[wtc, 2011/08/01 18:21:24]

Is it OK to put this code next to the code that sets up the
cookie store, so that we can compare them easily?

I think some of the origin-bound cert code may need to
interleave with the cookie store code on lines
303-310.

+
   net::HttpCache::DefaultBackend* main_backend =
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           lazy_params_->cache_path,
           lazy_params_->cache_max_size,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   net::HttpCache* main_cache = new net::HttpCache(
       main_context->host_resolver(),
       main_context->cert_verifier(),
+      main_context->origin_bound_cert_service(),
       main_context->dnsrr_resolver(),
       main_context->dns_cert_checker(),
       main_context->proxy_service(),
       main_context->ssl_config_service(),
       main_context->http_auth_handler_factory(),
       main_context->network_delegate(),
       main_context->net_log(),
       main_backend);
 
   net::HttpCache::DefaultBackend* media_backend =
@@ skipping 133 matching lines @@
 scoped_refptr<ProfileIOData::RequestContext>
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   scoped_refptr<RequestContext> app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }