chrome/browser/chromeos/settings/device_settings_provider_unittest.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1425093004: Revert of 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: 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

« no previous file with comments | « chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 754e8ff4ed1d821fdb973aa4b0e8cde927066e85..e02000cb55667939bea3334d9a10f28f836f6258 100644

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

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

@@ -262,8 +262,7 @@

TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {

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

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

- true);

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

FlushDeviceSettings();

base::FundamentalValue value(true);

@@ -291,8 +290,7 @@

TEST_F(DeviceSettingsProviderTest, SetPrefTwice) {

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

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

- true);

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

FlushDeviceSettings();

EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());

@@ -412,8 +410,7 @@

TEST_F(DeviceSettingsProviderTest, OwnerIsStillSetWhenDeviceIsConsumerManaged) {

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

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

- true);

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

device_policy_.policy_data().set_management_mode(

em::PolicyData::CONSUMER_MANAGED);

device_policy_.policy_data().set_request_token("test request token");