TPMTokenLoader: Report both the disabled and enabled state of the TPM.

chrome/browser/chromeos/ownership/owner_settings_service.h

 // Copyright 2014 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_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chromeos/dbus/session_manager_client.h"
-#include "chromeos/tpm_token_loader.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ownership/owner_key_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 
 namespace chromeos {
 
 class SessionManagerOperation;
 
 // This class reloads owner key from profile NSS slots.
 //
 // TODO (ygorshenin@): move write path for device settings here
 // (crbug.com/230018).
 class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
                              public KeyedService,
                              public content::NotificationObserver,
-                             public TPMTokenLoader::Observer,
                              public SessionManagerClient::Observer {
  public:
   virtual ~OwnerSettingsService();
 
   base::WeakPtr<OwnerSettingsService> as_weak_ptr() {
     return weak_factory_.GetWeakPtr();
   }
 
+  void OnTPMTokenReady(bool tpm_token_enabled);
+
   // DeviceSettingsService::PrivateKeyDelegate implementation:
   virtual bool IsOwner() OVERRIDE;
   virtual void IsOwnerAsync(const IsOwnerCallback& callback) OVERRIDE;
   virtual bool AssembleAndSignPolicyAsync(
       scoped_ptr<enterprise_management::PolicyData> policy,
       const AssembleAndSignPolicyCallback& callback) OVERRIDE;
   virtual void SignAndStoreAsync(
       scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> settings,
       const base::Closure& callback) OVERRIDE;
   virtual void SetManagementSettingsAsync(
       enterprise_management::PolicyData::ManagementMode management_mode,
       const std::string& request_token,
       const std::string& device_id,
       const base::Closure& callback) OVERRIDE;
 
   // NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // TPMTokenLoader::Observer:
-  virtual void OnTPMTokenReady() OVERRIDE;
-
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) OVERRIDE;
 
   // Checks if the user is the device owner, without the user profile having to
   // been initialized. Should be used only if login state is in safe mode.
   static void IsOwnerForSafeModeAsync(
       const std::string& user_hash,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util,
       const IsOwnerCallback& callback);
 
@@ skipping 69 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<OwnerSettingsService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_