Revert of Remove client_certs from SSLCertRequestInfo.

remoting/host/token_validator_base.cc

 // Copyright 2014 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 "remoting/host/token_validator_base.h"
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 181 matching lines @@
   HCERTSTORE cert_store = ::CertOpenStore(
       CERT_STORE_PROV_SYSTEM, 0, NULL,
       CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_STORE_READONLY_FLAG, L"MY");
   client_cert_store = new net::ClientCertStoreWin(cert_store);
 #elif defined(OS_MACOSX)
   client_cert_store = new net::ClientCertStoreMac();
 #else
   // OpenSSL does not use the ClientCertStore infrastructure.
   client_cert_store = nullptr;
 #endif
-  // The callback is uncancellable, and GetClientCert requires
-  // client_cert_store to stay alive until the callback is called. So we must
-  // give it a WeakPtr for |this|, and ownership of the other parameters.
+  // The callback is uncancellable, and GetClientCert requires selected_certs
+  // and client_cert_store to stay alive until the callback is called. So we
+  // must give it a WeakPtr for |this|, and ownership of the other parameters.
+  net::CertificateList* selected_certs(new net::CertificateList());
   client_cert_store->GetClientCerts(
-      *cert_request_info,
+      *cert_request_info, selected_certs,
       base::Bind(&TokenValidatorBase::OnCertificatesSelected,
-                 weak_factory_.GetWeakPtr(), base::Owned(client_cert_store)));
+                 weak_factory_.GetWeakPtr(), base::Owned(selected_certs),
+                 base::Owned(client_cert_store)));
 }
 
 void TokenValidatorBase::OnCertificatesSelected(
-    net::ClientCertStore* unused,
-    net::CertificateList selected_certs) {
+    net::CertificateList* selected_certs,
+    net::ClientCertStore* unused) {
   const std::string& issuer =
       third_party_auth_config_.token_validation_cert_issuer;
 
   base::Time now = base::Time::Now();
 
   auto best_match_position =
-      std::max_element(selected_certs.begin(), selected_certs.end(),
+      std::max_element(selected_certs->begin(), selected_certs->end(),
                        std::bind(&WorseThan, issuer, now, std::placeholders::_1,
                                  std::placeholders::_2));
 
-  if (best_match_position == selected_certs.end() ||
+  if (best_match_position == selected_certs->end() ||
       !IsCertificateValid(issuer, now, *best_match_position)) {
     ContinueWithCertificate(nullptr, nullptr);
   } else {
     ContinueWithCertificate(
         best_match_position->get(),
         net::FetchClientCertPrivateKey(best_match_position->get()).get());
   }
 }
 
 void TokenValidatorBase::ContinueWithCertificate(
@@ skipping 46 matching lines @@
     return std::string();
   }
 
   std::string shared_secret;
   // Everything is valid, so return the shared secret to the caller.
   dict->GetStringWithoutPathExpansion("access_token", &shared_secret);
   return shared_secret;
 }
 
 }  // namespace remoting