Get ClientCertStore through ResourceContext.

content/browser/loader/resource_loader_unittest.cc

Index: content/browser/loader/resource_loader_unittest.cc
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index bf4f52f27c47089c9381558dee3229eda0b3defc..3e1fe26855c682b64d9c6b61fa8f87e3b8366dc9 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -48,12 +48,13 @@ class ClientCertStoreStub : public net::ClientCertStore {
   }
 
   // net::ClientCertStore:
-  virtual bool GetClientCerts(const net::SSLCertRequestInfo& cert_request_info,
-                              net::CertificateList* selected_certs) OVERRIDE {
+  virtual void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info,
+                              net::CertificateList* selected_certs,
+                              const base::Closure& callback) OVERRIDE {
     ++request_count_;
     requested_authorities_ = cert_request_info.cert_authorities;
     *selected_certs = response_;
-    return true;
+    callback.Run();
   }
 
  private:
@@ -118,7 +119,14 @@ class ResourceHandlerStub : public ResourceHandler {
 // records the arguments of the most recent call for later inspection.
 class SelectCertificateBrowserClient : public TestContentBrowserClient {
  public:
-  SelectCertificateBrowserClient() : call_count_(0) {}
+  SelectCertificateBrowserClient(
+      scoped_ptr<net::ClientCertStore> dummy_cert_store)
+      : dummy_cert_store_(dummy_cert_store.Pass()), call_count_(0) {}
+
+  virtual scoped_ptr<net::ClientCertStore> GetClientCertStore(
+      content::ResourceContext* context) OVERRIDE {
+    return dummy_cert_store_.Pass();
+  }
 
   virtual void SelectClientCertificate(
       int render_process_id,
@@ -139,6 +147,7 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
   }
 
  private:
+  scoped_ptr<net::ClientCertStore> dummy_cert_store_;
   net::CertificateList passed_certs_;
   int call_count_;
 };
@@ -220,8 +229,7 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
   ClientCertStoreStub* raw_ptr_to_store = test_store.get();
 
   scoped_ptr<ResourceHandler> resource_handler(new ResourceHandlerStub());
-  ResourceLoader loader(request.Pass(), resource_handler.Pass(), this,
-                        test_store.PassAs<net::ClientCertStore>());
+  ResourceLoader loader(request.Pass(), resource_handler.Pass(), this);
 
   // Prepare a dummy certificate request.
   scoped_refptr<net::SSLCertRequestInfo> cert_request_info(
@@ -230,7 +238,8 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
   cert_request_info->cert_authorities = dummy_authority;
 
   // Plug in test content browser client.
-  SelectCertificateBrowserClient test_client;
+  SelectCertificateBrowserClient test_client(
+      test_store.PassAs<net::ClientCertStore>());
   ContentBrowserClient* old_client = SetBrowserClientForTesting(&test_client);
 
   // Everything is set up. Trigger the resource loader certificate request event