Refactor client cert private key handling.

chrome/browser/chromeos/platform_keys/platform_keys_nss.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 <cert.h>
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <secder.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 528 matching lines @@
       {base::MayBlock(), base::TaskPriority::BACKGROUND,
        base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
       base::Bind(&SignRSAOnWorkerThread, base::Passed(&state)));
 }
 
 // Called when ClientCertStoreChromeOS::GetClientCerts is done. Builds the list
 // of net::CertificateList and calls back. Used by
 // SelectCertificatesOnIOThread().
 void DidSelectCertificatesOnIOThread(
     std::unique_ptr<SelectCertificatesState> state,
-    net::CertificateList certs) {
+    net::ClientCertIdentityList identities) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  state->CallBack(FROM_HERE,
-                  base::MakeUnique<net::CertificateList>(std::move(certs)),
-                  std::string() /* no error */);
+  // Convert the ClientCertIdentityList to a CertificateList since returning
+  // ClientCertIdentities would require changing the platformKeys extension
+  // api. This assumes that the necessary keys can be found later with
+  // crypto::FindNSSKeyFromPublicKeyInfo.
+  std::unique_ptr<net::CertificateList> certs =
+      base::MakeUnique<net::CertificateList>();
+  for (const std::unique_ptr<net::ClientCertIdentity>& identity : identities)
+    certs->push_back(identity->certificate());
+  state->CallBack(FROM_HERE, std::move(certs), std::string() /* no error */);
 }
 
 // Continues selecting certificates on the IO thread. Used by
 // SelectClientCertificates().
 void SelectCertificatesOnIOThread(
     std::unique_ptr<SelectCertificatesState> state) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   state->cert_store_.reset(new ClientCertStoreChromeOS(
       nullptr,  // no additional provider
       base::MakeUnique<ClientCertFilterChromeOS>(state->use_system_key_slot_,
@@ skipping 335 matching lines @@
   NSSOperationState* state_ptr = state.get();
   GetCertDatabase(std::string() /* don't get any specific slot */,
                   base::Bind(&GetTokensWithDB, base::Passed(&state)),
                   browser_context,
                   state_ptr);
 }
 
 }  // namespace platform_keys
 
 }  // namespace chromeos