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..bca89626866d818c2e9e00fc4021d1f90300b5fc 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:
@@ -143,6 +144,23 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
   int call_count_;
 };
 
+class ResourceContextStub : public MockResourceContext {
+ public:
+  explicit ResourceContextStub(net::URLRequestContext* test_request_context)
+      : MockResourceContext(test_request_context) {}
+
+  virtual scoped_ptr<net::ClientCertStore> GetClientCertStore() OVERRIDE {
+    return dummy_cert_store_.Pass();
+  }
+
+  void SetClientCertStore(scoped_ptr<net::ClientCertStore> store) {
+    dummy_cert_store_ = store.Pass();
+  }
+
+ private:
+  scoped_ptr<net::ClientCertStore> dummy_cert_store_;
+};
+
 }  // namespace
 
 class ResourceLoaderTest : public testing::Test,
@@ -182,7 +200,7 @@ class ResourceLoaderTest : public testing::Test,
   content::TestBrowserThreadBundle thread_bundle_;
 
   net::TestURLRequestContext test_url_request_context_;
-  content::MockResourceContext resource_context_;
+  ResourceContextStub resource_context_;
 };
 
 // When OpenSSL is used, client cert store is not being queried in
@@ -218,10 +236,11 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
   // later.
   net::URLRequest* raw_ptr_to_request = request.get();
   ClientCertStoreStub* raw_ptr_to_store = test_store.get();
+  resource_context_.SetClientCertStore(
+      test_store.PassAs<net::ClientCertStore>());
 
   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(