chrome/browser/chromeos/settings/device_settings_service_unittest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. Created 5 years, 2 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

« chrome/browser/chromeos/login/users/user_manager_unittest.cc ('K') | « chrome/browser/chromeos/settings/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_service_unittest.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

index 78cd3f9057ac104f252ae8abafb4e07e51d21902..a2e7b56120c32f6d764f5f11550f9cc45dcc1f7b 100644

--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

@@ -170,7 +170,8 @@ TEST_F(DeviceSettingsServiceTest, StoreSuccess) {

device_settings_service_.status());

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

- InitOwner(device_policy_.policy_data().username(), true);

+ InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),

+ true);

device_settings_service_.Store(

device_policy_.GetCopy(),

base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,

@@ -243,7 +244,8 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {

EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);

owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());

- InitOwner(device_policy_.policy_data().username(), true);

+ InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),

+ true);

device_settings_service_.GetOwnershipStatusAsync(

base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,

base::Unretained(this)));

@@ -267,7 +269,7 @@ TEST_F(DeviceSettingsServiceTest, OnTPMTokenReadyForNonOwner) {

device_settings_service_.GetOwnershipStatus());

const std::string& user_id = device_policy_.policy_data().username();

- InitOwner(user_id, false);

+ InitOwner(AccountId::FromUserEmail(user_id), false);

OwnerSettingsServiceChromeOS* service =

OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());

ASSERT_TRUE(service);

@@ -312,7 +314,7 @@ TEST_F(DeviceSettingsServiceTest, OwnerPrivateKeyInTPMToken) {

const std::string& user_id = device_policy_.policy_data().username();

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

- InitOwner(user_id, false);

+ InitOwner(AccountId::FromUserEmail(user_id), false);

OwnerSettingsServiceChromeOS* service =

OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());

ASSERT_TRUE(service);

@@ -348,7 +350,7 @@ TEST_F(DeviceSettingsServiceTest, OnTPMTokenReadyForOwner) {

const std::string& user_id = device_policy_.policy_data().username();

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

- InitOwner(user_id, false);

+ InitOwner(AccountId::FromUserEmail(user_id), false);

OwnerSettingsServiceChromeOS* service =

OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());

ASSERT_TRUE(service);

@@ -392,7 +394,8 @@ TEST_F(DeviceSettingsServiceTest, IsCurrentUserOwnerAsyncWithLoadedCerts) {

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());

- InitOwner(device_policy_.policy_data().username(), true);

+ InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),

+ true);

ReloadDeviceSettings();

FlushDeviceSettings();

@@ -438,7 +441,8 @@ TEST_F(DeviceSettingsServiceTest, Observer) {

EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1);

EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

- InitOwner(device_policy_.policy_data().username(), true);

+ InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),

+ true);

ReloadDeviceSettings();

Mock::VerifyAndClearExpectations(&observer_);