Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7030)

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

Issue 270663002: Implemented profile-aware owner key loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 1da5a9b04a3ba55b6370ba4e7766e0f360f11c03..b84ce88fc4e0c91efed084ac5ea31481312192c9 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -139,7 +139,9 @@ TEST_F(DeviceSettingsProviderTest, SetPrefFailed) {
TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {
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();
base::FundamentalValue value(true);
@@ -167,7 +169,9 @@ TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {
TEST_F(DeviceSettingsProviderTest, SetPrefTwice) {
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();
EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());

Powered by Google App Engine
This is Rietveld 408576698