Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4152)

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: Fix order of init 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
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_);
Nicolas Zea 2015/04/10 20:15:29 user id instead of username for first param? (here
Roger Tawa OOO till Jul 10th 2015/04/11 00:23:08 Done, and did some cleanup as well for some apis t
+ 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());

Powered by Google App Engine
This is Rietveld 408576698