Implemented profile-aware owner key loading.

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 146 matching lines @@
             device_settings_service_.status());
   CheckPolicy();
 }
 
 TEST_F(DeviceSettingsServiceTest, SignAndStoreFailure) {
   ReloadDeviceSettings();
   EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
             device_settings_service_.status());
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   FlushDeviceSettings();
 
   scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings(
       new em::ChromeDeviceSettingsProto(device_policy_.payload()));
   new_device_settings->mutable_device_policy_refresh_rate()->
       set_device_policy_refresh_rate(300);
   device_settings_test_helper_.set_store_result(false);
   device_settings_service_.SignAndStore(
       new_device_settings.Pass(),
       base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
                  base::Unretained(this)));
   FlushDeviceSettings();
   EXPECT_TRUE(operation_completed_);
   EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED,
             device_settings_service_.status());
   CheckPolicy();
 }
 
 TEST_F(DeviceSettingsServiceTest, SignAndStoreSuccess) {
   const base::Time before(base::Time::Now());
   ReloadDeviceSettings();
   EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
             device_settings_service_.status());
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   FlushDeviceSettings();
 
   device_policy_.payload().mutable_device_policy_refresh_rate()->
       set_device_policy_refresh_rate(300);
   device_policy_.Build();
   device_settings_service_.SignAndStore(
       scoped_ptr<em::ChromeDeviceSettingsProto>(
           new em::ChromeDeviceSettingsProto(device_policy_.payload())),
       base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
                  base::Unretained(this)));
@@ skipping 18 matching lines @@
   EXPECT_EQ(device_settings_service_.GetUsername(),
             policy_data->username());
 }
 
 TEST_F(DeviceSettingsServiceTest, SetManagementSettingsModeTransition) {
   ReloadDeviceSettings();
   EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
             device_settings_service_.status());
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   FlushDeviceSettings();
 
   // The initial management mode should be NOT_MANAGED.
   EXPECT_EQ(em::PolicyData::NOT_MANAGED,
             device_settings_service_.policy_data()->management_mode());
 
   // NOT_MANAGED -> CONSUMER_MANAGED: Okay.
   device_settings_service_.SetManagementSettings(
       em::PolicyData::CONSUMER_MANAGED,
       "fake_request_token",
@@ skipping 93 matching lines @@
             device_settings_service_.policy_data()->management_mode());
 
 }
 
 TEST_F(DeviceSettingsServiceTest, SetManagementSettingsSuccess) {
   ReloadDeviceSettings();
   EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
             device_settings_service_.status());
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   FlushDeviceSettings();
 
   device_settings_service_.SetManagementSettings(
       em::PolicyData::CONSUMER_MANAGED,
       "fake_request_token",
       "fake_device_id",
       base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
                  base::Unretained(this)));
   FlushDeviceSettings();
 
@@ skipping 106 matching lines @@
   ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
   std::vector<uint8> key;
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
   EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   device_settings_service_.GetOwnershipStatusAsync(
       base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
                  base::Unretained(this)));
   FlushDeviceSettings();
   EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
   EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key());
@@ skipping 63 matching lines @@
   ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
   std::vector<uint8> key;
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
   EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_FALSE(is_owner_set_);
 
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   device_settings_service_.OnTPMTokenReady();
   FlushDeviceSettings();
 
   EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
   EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
   EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
             device_settings_service_.GetOwnershipStatus());
   EXPECT_TRUE(is_owner_set_);
   EXPECT_TRUE(is_owner_);
 }
 
 TEST_F(DeviceSettingsServiceTest, IsCurrentUserOwnerAsyncWithLoadedCerts) {
   owner_key_util_->Clear();
 
   EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
   EXPECT_FALSE(device_settings_service_.GetOwnerKey().get());
   EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
             device_settings_service_.GetOwnershipStatus());
 
   owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  crypto::ScopedPK11Slot slot;
+  device_settings_service_.InitOwner(device_policy_.policy_data().username(),
+                                     slot.Pass());
   ReloadDeviceSettings();
 
   device_settings_service_.OnTPMTokenReady();
   FlushDeviceSettings();
 
   EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());
   ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
   std::vector<uint8> key;
   ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
@@ skipping 46 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