Make CertificateProviderService vend ClientCertIdentities directly.

chrome/browser/certificate_manager_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 #define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "net/cert/nss_cert_database.h"
+#include "net/ssl/client_cert_identity.h"
 
 namespace chromeos {
 class CertificateProvider;
 }  // namespace chromeos
 
 namespace content {
 class BrowserContext;
 class ResourceContext;
 }  // namespace content
 
@@ skipping 135 matching lines @@
       CertificateManagerModel::Observer* observer,
       std::unique_ptr<chromeos::CertificateProvider>
           extension_certificate_provider,
       const CreationCallback& callback);
 
   // Callback used by Refresh() for when the cert slots have been unlocked.
   // This method does the actual refreshing.
   void RefreshSlotsUnlocked();
 
   // Callback used to refresh extension provided certificates. Refreshes UI.
-  void RefreshExtensionCertificates(const net::CertificateList& new_certs);
+  void RefreshExtensionCertificates(
+      net::ClientCertIdentityList new_cert_identities);
 
   net::NSSCertDatabase* cert_db_;
   net::CertificateList cert_list_;
   net::CertificateList extension_cert_list_;
   // Whether the certificate database has a public slot associated with the
   // profile. If not set, importing certificates is not allowed with this model.
   bool is_user_db_available_;
   bool is_tpm_available_;
 
   // The observer to notify when certificate list is refreshed.
   Observer* observer_;
 
   // Certificate provider used to fetch extension provided certificates.
   std::unique_ptr<chromeos::CertificateProvider>
       extension_certificate_provider_;
 
   base::WeakPtrFactory<CertificateManagerModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };
 
 #endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_