Revert of Remove client_certs from SSLCertRequestInfo.

net/ssl/client_cert_store_win.cc

 // Copyright 2013 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 "net/ssl/client_cert_store_win.h"
 
 #include <algorithm>
 #include <string>
 
 #define SECURITY_WIN32  // Needs to be defined before including security.h
@@ skipping 153 matching lines @@
 
 ClientCertStoreWin::ClientCertStoreWin() {}
 
 ClientCertStoreWin::ClientCertStoreWin(HCERTSTORE cert_store) {
   DCHECK(cert_store);
   cert_store_.reset(cert_store);
 }
 
 ClientCertStoreWin::~ClientCertStoreWin() {}
 
-void ClientCertStoreWin::GetClientCerts(
-    const SSLCertRequestInfo& request,
-    const ClientCertListCallback& callback) {
-  CertificateList selected_certs;
+void ClientCertStoreWin::GetClientCerts(const SSLCertRequestInfo& request,
+                                        CertificateList* selected_certs,
+                                        const base::Closure& callback) {
   if (cert_store_) {
     // Use the existing client cert store. Note: Under some situations,
     // it's possible for this to return certificates that aren't usable
     // (see below).
-    GetClientCertsImpl(cert_store_, request, &selected_certs);
-    callback.Run(std::move(selected_certs));
+    GetClientCertsImpl(cert_store_, request, selected_certs);
+    callback.Run();
     return;
   }
 
   // Always open a new instance of the "MY" store, to ensure that there
   // are no previously cached certificates being reused after they're
   // no longer available (some smartcard providers fail to update the "MY"
   // store handles and instead interpose CertOpenSystemStore).
   ScopedHCERTSTORE my_cert_store(CertOpenSystemStore(NULL, L"MY"));
   if (!my_cert_store) {
     PLOG(ERROR) << "Could not open the \"MY\" system certificate store: ";
-    callback.Run(CertificateList());
+    selected_certs->clear();
+    callback.Run();
     return;
   }
 
-  GetClientCertsImpl(my_cert_store, request, &selected_certs);
-  callback.Run(std::move(selected_certs));
+  GetClientCertsImpl(my_cert_store, request, selected_certs);
+
+  callback.Run();
 }
 
 bool ClientCertStoreWin::SelectClientCertsForTesting(
     const CertificateList& input_certs,
     const SSLCertRequestInfo& request,
     CertificateList* selected_certs) {
   ScopedHCERTSTORE test_store(CertOpenStore(CERT_STORE_PROV_MEMORY, 0, NULL, 0,
                                             NULL));
   if (!test_store)
     return false;
@@ skipping 20 matching lines @@
     // copy).
     if (!CertFreeCertificateContext(cert))
       return false;
   }
 
   GetClientCertsImpl(test_store.get(), request, selected_certs);
   return true;
 }
 
 }  // namespace net