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

chromeos/network/cert_loader.h

Index: chromeos/network/cert_loader.h
diff --git a/chromeos/network/cert_loader.h b/chromeos/network/cert_loader.h
deleted file mode 100644
index a57d29a362069c05badc8527e98e6cd0816b5e9c..0000000000000000000000000000000000000000
--- a/chromeos/network/cert_loader.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2013 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 CHROMEOS_NETWORK_CERT_LOADER_H_
-#define CHROMEOS_NETWORK_CERT_LOADER_H_
-
-#include <string>
-
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/observer_list_threadsafe.h"
-#include "base/threading/thread_checker.h"
-#include "chromeos/chromeos_export.h"
-#include "chromeos/dbus/dbus_method_call_status.h"
-#include "chromeos/login/login_state.h"
-#include "chromeos/network/network_handler.h"
-#include "net/cert/cert_database.h"
-#include "net/cert/x509_certificate.h"
-
-namespace crypto {
-class SymmetricKey;
-}
-
-namespace chromeos {
-
-// This class is responsible for initializing the TPM token and loading
-// certificates once the TPM is initialized. It is expected to be constructed
-// on the UI thread and public methods should all be called from the UI thread.
-// When certificates have been loaded (after login completes), or the cert
-// database changes, observers are called with OnCertificatesLoaded().
-class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer,
-                                   public LoginState::Observer {
- public:
-  class Observer {
-   public:
-    virtual ~Observer() {}
-
-    // Called when the certificates, passed for convenience as |cert_list|,
-    // have completed loading. |initial_load| is true the first time this
-    // is called.
-    virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
-                                      bool initial_load) = 0;
-
-   protected:
-    Observer() {}
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(Observer);
-  };
-
-  virtual ~CertLoader();
-
-  void AddObserver(CertLoader::Observer* observer);
-  void RemoveObserver(CertLoader::Observer* observer);
-
-  // Returns true when the certificate list has been requested but not loaded.
-  bool CertificatesLoading() const;
-
-  // Returns true if the TPM is available for hardware-backed certificates.
-  bool IsHardwareBacked() const;
-
-  std::string GetPkcs11IdForCert(const net::X509Certificate& cert) const;
-
-  bool certificates_loaded() const { return certificates_loaded_; }
-
-  // TPM info is only valid once the TPM is available (IsHardwareBacked is
-  // true). Otherwise empty strings will be returned.
-  const std::string& tpm_token_name() const { return tpm_token_name_; }
-  const std::string& tpm_token_slot() const { return tpm_token_slot_; }
-  const std::string& tpm_user_pin() const { return tpm_user_pin_; }
-
-  // This will be empty until certificates_loaded() is true.
-  const net::CertificateList& cert_list() const { return cert_list_; }
-
- private:
-  friend class NetworkHandler;
-  CertLoader();
-
-  void RequestCertificates();
-
-  // This is the cyclic chain of callbacks to initialize the TPM token and to
-  // kick off the update of the certificate list.
-  void InitializeTokenAndLoadCertificates();
-  void RetryTokenInitializationLater();
-  void OnTpmIsEnabled(DBusMethodCallStatus call_status,
-                      bool tpm_is_enabled);
-  void OnPkcs11IsTpmTokenReady(DBusMethodCallStatus call_status,
-                               bool is_tpm_token_ready);
-  void OnPkcs11GetTpmTokenInfo(DBusMethodCallStatus call_status,
-                               const std::string& token_name,
-                               const std::string& user_pin);
-  void InitializeNSSForTPMToken();
-
-  // These calls handle the updating of the certificate list after the TPM token
-  // was initialized.
-  void StartLoadCertificates();
-  void UpdateCertificates(net::CertificateList* cert_list);
-
-  void NotifyCertificatesLoaded(bool initial_load);
-
-  // net::CertDatabase::Observer
-  virtual void OnCertTrustChanged(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertAdded(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertRemoved(const net::X509Certificate* cert) OVERRIDE;
-
-  // LoginState::Observer
-  virtual void LoggedInStateChanged(LoginState::LoggedInState state) OVERRIDE;
-
-  ObserverList<Observer> observers_;
-
-  bool certificates_requested_;
-  bool certificates_loaded_;
-  bool certificates_update_required_;
-  bool certificates_update_running_;
-
-  // The states are traversed in this order but some might get omitted or never
-  // be left.
-  enum TPMTokenState {
-    TPM_STATE_UNKNOWN,
-    TPM_DISABLED,
-    TPM_ENABLED,
-    TPM_TOKEN_READY,
-    TPM_TOKEN_INFO_RECEIVED,
-    TPM_TOKEN_NSS_INITIALIZED,
-  };
-  TPMTokenState tpm_token_state_;
-
-  // The current request delay before the next attempt to initialize the
-  // TPM. Will be adapted after each attempt.
-  base::TimeDelta tpm_request_delay_;
-
-  // Cached TPM token info.
-  std::string tpm_token_name_;
-  std::string tpm_token_slot_;
-  std::string tpm_user_pin_;
-
-  // Cached Certificates.
-  net::CertificateList cert_list_;
-
-  base::ThreadChecker thread_checker_;
-
-  // This factory should be used only for callbacks during TPMToken
-  // initialization.
-  base::WeakPtrFactory<CertLoader> initialize_token_factory_;
-
-  // This factory should be used only for callbacks during updating the
-  // certificate list.
-  base::WeakPtrFactory<CertLoader> update_certificates_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(CertLoader);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROMEOS_NETWORK_CERT_LOADER_H_