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

chrome/browser/chromeos/settings/device_settings_service_unittest.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/settings/device_settings_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 498 matching lines @@
   EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
   ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
   std::vector<uint8> key;
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_FALSE(is_owner_set_);
 
-  service->OnTPMTokenReady();
+  service->OnTPMTokenReady(true /* is ready */);
   FlushDeviceSettings();
 
   EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
   ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
   EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
@@ skipping 23 matching lines @@
   ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
   ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
   std::vector<uint8> key;
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_FALSE(is_owner_set_);
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  service->OnTPMTokenReady();
+  service->OnTPMTokenReady(true /* is ready */);
   FlushDeviceSettings();
 
   EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
   ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_TRUE(is_owner_set_);
@@ skipping 70 matching lines @@
   EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
   EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
   device_settings_service_.PropertyChangeComplete(true);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&observer_);
 
   device_settings_service_.RemoveObserver(&observer_);
 }
 
 }  // namespace chromeos