Follow-up changes to https://codereview.chromium.org/795773002/

content/browser/ssl/ssl_client_auth_handler.cc

 // Copyright (c) 2012 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 "content/browser/ssl/ssl_client_auth_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 38 matching lines @@
        scoped_ptr<net::ClientCertStore> client_cert_store,
        net::SSLCertRequestInfo* cert_request_info)
       : handler_(handler),
         client_cert_store_(client_cert_store.Pass()),
         cert_request_info_(cert_request_info) {}
 
   bool has_client_cert_store() const { return client_cert_store_; }
 
   void GetClientCerts() {
     if (client_cert_store_) {
+      // TODO(davidben): This is still a cyclical ownership where
+      // GetClientCerts' requirement that |client_cert_store_| remains alive
+      // until the call completes is maintained by the reference held in the
+      // callback.
       client_cert_store_->GetClientCerts(
           *cert_request_info_, &cert_request_info_->client_certs,
           base::Bind(&SSLClientAuthHandler::Core::DidGetClientCerts, this));
     } else {
       DidGetClientCerts();
     }
   }
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
 
   ~Core() {}
 
   // Called when |client_cert_store_| is done retrieving the cert list.
   void DidGetClientCerts() {
     if (handler_)
       handler_->DidGetClientCerts();
   }
 
   base::WeakPtr<SSLClientAuthHandler> handler_;
   scoped_ptr<net::ClientCertStore> client_cert_store_;
   scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
 };
 
 SSLClientAuthHandler::SSLClientAuthHandler(
     scoped_ptr<net::ClientCertStore> client_cert_store,
     net::URLRequest* request,
     net::SSLCertRequestInfo* cert_request_info,
     const SSLClientAuthHandler::CertificateCallback& callback)
-    : core_(nullptr),
-      request_(request),
+    : request_(request),
       cert_request_info_(cert_request_info),
       callback_(callback),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   core_ = new Core(weak_factory_.GetWeakPtr(), client_cert_store.Pass(),
                    cert_request_info_.get());
 }
 
 SSLClientAuthHandler::~SSLClientAuthHandler() {
@@ skipping 35 matching lines @@
                  render_frame_host_id, cert_request_info_,
                  base::Bind(&SSLClientAuthHandler::CertificateSelected,
                             weak_factory_.GetWeakPtr())));
 }
 
 void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) {
   DVLOG(1) << this << " DoCertificateSelected " << cert;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   callback_.Run(cert);
-  // |this| may be deleted at this point.
 }
 
 }  // namespace content