Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/sync/profile_sync_service_startup_unittest.cc

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index c500634f1477a3f7996c4a1dc555a27260f5a49c..f657347ea9e82b99b8ef982c752f531e5e3b911b 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -220,10 +220,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 
   // Create some tokens in the token service.
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
 
   // Simulate the UI telling sync it has finished setting up.
   sync_->SetSetupInProgress(false);
@@ -351,10 +351,10 @@ TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "sync_token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "sync_token");
   sync_->Initialize();
   EXPECT_TRUE(sync_->ShouldPushChanges());
 }
@@ -373,10 +373,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartNormal) {
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "sync_token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "sync_token");
 
   sync_->Initialize();
 }
@@ -407,10 +407,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartRecoverDatatypePrefs) {
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "sync_token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "sync_token");
   sync_->Initialize();
 
   EXPECT_TRUE(profile_->GetPrefs()->GetBoolean(
@@ -436,10 +436,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartDontRecoverDatatypePrefs) {
       WillRepeatedly(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "sync_token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "sync_token");
   sync_->Initialize();
 
   EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(
@@ -474,10 +474,10 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   sync_->Initialize();
 
   // The service should stop when switching to managed mode.
@@ -525,10 +525,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::STOPPED));
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   sync_->Initialize();
   EXPECT_TRUE(sync_->HasUnrecoverableError());
 }
@@ -544,10 +544,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartDownloadFailed) {
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "token");
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())

[Andrew T Wilson (Slow), 2013/09/06 09:23:10]

BTW, might be nice if this were moved out into a helper function since it's
basically copy/pasted into every test function. Feel free not to do this since
it's pre-existing code, but just in case you're looking to do more cleanup :)

[fgorski, 2013/09/12 23:46:24]

Done. Extracted these 4 lines to a method IssueTestTokens, following other unit
test classes for profile sync service. Also, the value of the token is unified
(between "sync_token" and "token", as it is irrelevant).

+      ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+  TokenServiceFactory::GetForProfile(profile_.get())
+      ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   sync_->fail_initial_download();
 
   sync_->SetSetupInProgress(true);