Move client certificates retrieval logic out of the SSL sockets.

content/browser/loader/resource_loader.cc

Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index a45229ee70ec4df164d8686cd132b5e862d3ae64..4c905b2141b4bba65121ba30ba3282764141ce71 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -21,6 +21,8 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/url_constants.h"
+#include "net/base/client_cert_store.h"
+#include "net/base/client_cert_store_impl.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/appcache/appcache_interceptor.h"
@@ -65,6 +67,9 @@ ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
       last_upload_position_(0),
       waiting_for_upload_progress_ack_(false),
       is_transferring_(false),
+#if !defined(USE_OPENSSL)
+      client_cert_store_(new net::ClientCertStoreImpl()),
+#endif
       weak_ptr_factory_(this) {
   request_->set_delegate(this);
   handler_->SetController(this);
@@ -195,6 +200,11 @@ void ResourceLoader::OnUploadProgressACK() {
   waiting_for_upload_progress_ack_ = false;
 }
 
+void ResourceLoader::swap_client_cert_store_for_testing(
+      scoped_ptr<net::ClientCertStore>& store) {
+  client_cert_store_.swap(store);
+}
+
 void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
                                         const GURL& new_url,
                                         bool* defer) {
@@ -269,11 +279,14 @@ void ResourceLoader::OnCertificateRequested(
     return;
   }
 
+#if !defined(USE_OPENSSL)
+  client_cert_store_->GetClientCerts(*cert_info, &cert_info->client_certs);
   if (cert_info->client_certs.empty()) {
     // No need to query the user if there are no certs to choose from.
     request_->ContinueWithCertificate(NULL);
     return;
   }
+#endif
 
   DCHECK(!ssl_client_auth_handler_) <<
       "OnCertificateRequested called with ssl_client_auth_handler pending";