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

chrome/browser/chromeos/settings/device_settings_service.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_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/policy/cloud/cloud_policy_validator.h"
+#include "chromeos/cert_loader.h"
 #include "chromeos/dbus/session_manager_client.h"
 
 namespace crypto {
 class RSAPrivateKey;
 }
 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 class PolicyData;
 class PolicyFetchResponse;
@@ skipping 35 matching lines @@
 // signature generated by a key in the device owner's possession. Key and
 // settings are brokered by the session_manager daemon.
 //
 // The purpose of DeviceSettingsService is to keep track of the current key and
 // settings blob. For reading and writing device settings, use CrosSettings
 // instead, which provides a high-level interface that allows for manipulation
 // of individual settings.
 //
 // DeviceSettingsService generates notifications for key and policy update
 // events so interested parties can reload state as appropriate.
-class DeviceSettingsService : public SessionManagerClient::Observer {
+class DeviceSettingsService : public SessionManagerClient::Observer,
+                              public CertLoader::Observer {
  public:
   // Indicates ownership status of the device.
   enum OwnershipStatus {
     // Listed in upgrade order.
     OWNERSHIP_UNKNOWN = 0,
     OWNERSHIP_NONE,
     OWNERSHIP_TAKEN
   };
 
   typedef base::Callback<void(OwnershipStatus, bool)> OwnershipStatusCallback;
@@ skipping 96 matching lines @@
 
   // Adds an observer.
   void AddObserver(Observer* observer);
   // Removes an observer.
   void RemoveObserver(Observer* observer);
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) OVERRIDE;
   virtual void PropertyChangeComplete(bool success) OVERRIDE;
 
+  // CertLoader::Observer:
+  virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
+                                    bool initial_load) OVERRIDE;
+
  private:
   // Enqueues a new operation. Takes ownership of |operation| and starts it
   // right away if there is no active operation currently.
   void Enqueue(SessionManagerOperation* operation);
 
   // Enqueues a load operation.
   void EnqueueLoad(bool force_key_load);
 
   // Makes sure there's a reload operation so changes to the settings (and key,
   // in case force_key_load is set) are getting picked up.
@@ skipping 42 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_