Remove SSLClientAuthHandler's RDH dependency.

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 1997f8923148582cfc6594cfa7f22783659d127c..1626ff5c2ea54a3184c8740d7e7b8ac0e0f9b262 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -193,10 +193,6 @@ void ResourceLoader::ClearLoginDelegate() {
   login_delegate_ = NULL;
 }
 
-void ResourceLoader::ClearSSLClientAuthHandler() {
-  ssl_client_auth_handler_ = NULL;
-}
-
 void ResourceLoader::OnUploadProgressACK() {
   waiting_for_upload_progress_ack_ = false;
 }
@@ -274,7 +270,9 @@ void ResourceLoader::OnCertificateRequested(
   ssl_client_auth_handler_ = new SSLClientAuthHandler(
       GetRequestInfo()->GetContext()->CreateClientCertStore(),
       request_.get(),
-      cert_info);
+      cert_info,
+      base::Bind(&ResourceLoader::ContinueWithCertificate,
+                 weak_ptr_factory_.GetWeakPtr()));
   ssl_client_auth_handler_->SelectCertificate();
 }
 
@@ -712,4 +710,9 @@ void ResourceLoader::RecordHistograms() {
   }
 }
 
+void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) {
+  request_->ContinueWithCertificate(cert);
+  ssl_client_auth_handler_ = NULL;

[mmenke, 2014/09/23 19:24:23]

Should we clear the auth handler first?

Hrm...I'm assuming the auth handler is refcounted for more reasons than just to
be safely cleaned up here.

[davidben, 2014/09/23 21:22:02]

Done. Yeah, that's probably better; just in case everything else goes through
synchronously and we get another one. (It won't, but does //net promise that? I
guess we try to avoid that kind of re-entrancy in general, so if it does, that
would be a bug...)
Made it not ref-counted. The thing it was ref-counted for turns out to be broken
anyway.

+}
+
 }  // namespace content