chrome/browser/net/nss_context_chromeos_browsertest.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/net/nss_context_chromeos_browsertest.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/metrics/chromeos_metrics_provider_unittest.cc ('k') | chrome/browser/notifications/message_center_settings_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/nss_context_chromeos_browsertest.cc

diff --git a/chrome/browser/net/nss_context_chromeos_browsertest.cc b/chrome/browser/net/nss_context_chromeos_browsertest.cc

index 616549cc7522b5733f157b4614ba8caabc8cfd61..bcc869c800ca265b38f3509c129cb750061eed33 100644

--- a/chrome/browser/net/nss_context_chromeos_browsertest.cc

+++ b/chrome/browser/net/nss_context_chromeos_browsertest.cc

@@ -136,7 +136,7 @@

// Log in first user and get their DB.

LoginUser(kTestUser1);

Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(

- user_manager->FindUser(AccountId::FromUserEmail(kTestUser1)));

+ user_manager->FindUser(kTestUser1));

ASSERT_TRUE(profile1);

DBTester tester1(profile1);

@@ -148,7 +148,7 @@

AddUser(kTestUser2);

Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(

- user_manager->FindUser(AccountId::FromUserEmail(kTestUser2)));

+ user_manager->FindUser(kTestUser2));

ASSERT_TRUE(profile2);

DBTester tester2(profile2);