Call crypto::InitializeTPMToken on the IO thread (Take 2)

chrome/browser/chromeos/cros/cert_library.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/chromeos/cros/cert_library.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 103 matching lines @@
   CHECK(g_cert_library) << "CertLibrary::Get() called before Initialize()";
   return g_cert_library;
 }
 
 // static
 bool CertLibrary::IsInitialized() {
   return g_cert_library;
 }
 
 CertLibrary::CertLibrary() {
-  NetworkHandler::Get()->cert_loader()->AddObserver(this);
+  CertLoader::Get()->AddObserver(this);
 }
 
 CertLibrary::~CertLibrary() {
-  NetworkHandler::Get()->cert_loader()->RemoveObserver(this);
+  CertLoader::Get()->RemoveObserver(this);
 }
 
 void CertLibrary::AddObserver(CertLibrary::Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void CertLibrary::RemoveObserver(CertLibrary::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 bool CertLibrary::CertificatesLoading() const {
-  return NetworkHandler::Get()->cert_loader()->CertificatesLoading();
+  return CertLoader::Get()->CertificatesLoading();
 }
 
 bool CertLibrary::CertificatesLoaded() const {
-  return NetworkHandler::Get()->cert_loader()->certificates_loaded();
+  return CertLoader::Get()->certificates_loaded();
 }
 
 bool CertLibrary::IsHardwareBacked() const {
-  return NetworkHandler::Get()->cert_loader()->IsHardwareBacked();
+  return CertLoader::Get()->IsHardwareBacked();
 }
 
 int CertLibrary::NumCertificates(CertType type) const {
   const net::CertificateList& cert_list = GetCertificateListForType(type);
   return static_cast<int>(cert_list.size());
 }
 
 string16 CertLibrary::GetCertDisplayStringAt(CertType type, int index) const {
   net::X509Certificate* cert = GetCertificateAt(type, index);
   bool hardware_backed = IsCertHardwareBackedAt(type, index);
   return GetDisplayString(cert, hardware_backed);
 }
 
 std::string CertLibrary::GetCertPEMAt(CertType type, int index) const {
   return CertToPEM(*GetCertificateAt(type, index));
 }
 
 std::string CertLibrary::GetCertPkcs11IdAt(CertType type, int index) const {
   net::X509Certificate* cert = GetCertificateAt(type, index);
   return x509_certificate_model::GetPkcs11Id(cert->os_cert_handle());
 }
 
 bool CertLibrary::IsCertHardwareBackedAt(CertType type, int index) const {
-  if (!NetworkHandler::Get()->cert_loader()->IsHardwareBacked())
+  if (!CertLoader::Get()->IsHardwareBacked())
     return false;
   net::X509Certificate* cert = GetCertificateAt(type, index);
   std::string cert_token_name =
       x509_certificate_model::GetTokenName(cert->os_cert_handle());
   return cert_token_name ==
-      NetworkHandler::Get()->cert_loader()->tpm_token_name();
+      CertLoader::Get()->tpm_token_name();
 }
 
 int CertLibrary::GetCertIndexByPEM(CertType type,
                                    const std::string& pem_encoded) const {
   int num_certs = NumCertificates(type);
   for (int index = 0; index < num_certs; ++index) {
     net::X509Certificate* cert = GetCertificateAt(type, index);
     if (CertToPEM(*cert) != pem_encoded)
       continue;
     return index;
@@ skipping 86 matching lines @@
     return user_certs_;
   if (type == CERT_TYPE_SERVER)
     return server_certs_;
   if (type == CERT_TYPE_SERVER_CA)
     return server_ca_certs_;
   DCHECK(type == CERT_TYPE_DEFAULT);
   return certs_;
 }
 
 }  // namespace chromeos