chrome/browser/sync/test/integration/profile_sync_service_harness.cc - Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

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/sync/test/integration/profile_sync_service_harness.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv

Patch Set: rebased Created 5 years, 8 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/signin/signin_ui_util.cc ('K') | « chrome/browser/sync/sync_ui_util_unittest.cc ('k') | chrome/browser/ui/app_list/speech_auth_helper_unittest.cc » ('j') | chrome/browser/ui/webui/signin/inline_login_handler_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

index 2f4450be96bf91ee381c37b78d160fe66be7cc11..7a7d1f953c3ee1d6d0379b6ff884b0d8551d9dca 100644

--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -155,6 +155,10 @@ bool ProfileSyncServiceHarness::SetupSync(

// until we've finished configuration.

service()->SetSetupInProgress(true);

+ // Authenticate sync client using GAIA credentials.

+ service()->signin()->SetAuthenticatedAccountInfo(username_, username_);

+ service()->GoogleSigninSucceeded(username_, username_, password_);

DCHECK(!username_.empty());

if (signin_type_ == SigninType::UI_SIGNIN) {

Browser* browser =

@@ -166,7 +170,7 @@ bool ProfileSyncServiceHarness::SetupSync(

}

} else if (signin_type_ == SigninType::FAKE_SIGNIN) {

// Authenticate sync client using GAIA credentials.

- service()->signin()->SetAuthenticatedUsername(username_);

+ service()->signin()->SetAuthenticatedAccountInfo(username_, username_);

service()->GoogleSigninSucceeded(username_, username_, password_);

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->

UpdateCredentials(username_, GenerateFakeOAuth2RefreshTokenString());