Make CertificateProviderService vend ClientCertIdentities directly.

chrome/browser/certificate_manager_model.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 "chrome/browser/certificate_manager_model.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 125 matching lines @@
 
 void CertificateManagerModel::RefreshSlotsUnlocked() {
   DVLOG(1) << "refresh listing certs...";
   // TODO(tbarzic): Use async |ListCerts|.
   cert_db_->ListCertsSync(&cert_list_);
   observer_->CertificatesRefreshed();
   DVLOG(1) << "refresh finished for platform provided certificates";
 }
 
 void CertificateManagerModel::RefreshExtensionCertificates(
-    const net::CertificateList& new_certs) {
-  extension_cert_list_ = new_certs;
+    net::ClientCertIdentityList new_cert_identities) {
+  extension_cert_list_.clear();
+  extension_cert_list_.reserve(new_cert_identities.size());
+  for (const auto& identity : new_cert_identities)
+    extension_cert_list_.push_back(identity->certificate());
   observer_->CertificatesRefreshed();
   DVLOG(1) << "refresh finished for extension provided certificates";
 }
 
 void CertificateManagerModel::FilterAndBuildOrgGroupingMap(
     net::CertType filter_type,
     CertificateManagerModel::OrgGroupingMap* map) const {
   for (net::CertificateList::const_iterator i = cert_list_.begin();
        i != cert_list_.end(); ++i) {
     net::X509Certificate* cert = i->get();
@@ skipping 167 matching lines @@
   net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
       context, did_get_cert_db_callback);
 
   // The callback is run here instead of the actual function call because of
   // extension_certificate_provider ownership semantics, ie. ownership can only
   // be released once. The callback will only be run once (either inside the
   // function above or here).
   if (cert_db)
     did_get_cert_db_callback.Run(cert_db);
 }