chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc - Issue 1412813003: 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/ownership/owner_settings_service_chromeos_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: Fix Win GN build. Created 5 years, 1 month 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/ownership/owner_settings_service_chromeos.cc ('k') | chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

index aa4d68909d788b970ec2f9686fbda4d0d03de51f..1a36696cd89e86f51f5ab346828a37d51f2ea971 100644

--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

@@ -100,7 +100,8 @@ class OwnerSettingsServiceChromeOSTest : public DeviceSettingsTestBase {

provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged),

&device_settings_service_));

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

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

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

+ true);

FlushDeviceSettings();

service_ = OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(

@@ -342,7 +343,8 @@ TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, TakeOwnershipForceWhitelist) {

EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),

provider_->Get(kAccountsPrefUsers)));

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

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

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

+ true);

ReloadDeviceSettings();

ASSERT_TRUE(service_->IsOwner());