Refactor AO2TS to make it easier to componentize.

chrome/browser/sync/startup_controller_unittest.cc

Index: chrome/browser/sync/startup_controller_unittest.cc
diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc
index 9c1d53768705e27b24043c9ec61f2e38ea7d33bf..b107aeb3b268086f71f136eb034b932e7514a0e6 100644
--- a/chrome/browser/sync/startup_controller_unittest.cc
+++ b/chrome/browser/sync/startup_controller_unittest.cc
@@ -113,7 +113,7 @@ TEST_F(StartupControllerTest, Basic) {
   signin()->set_account(kTestUser);
   controller()->TryStart();
   EXPECT_FALSE(started());
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   const bool deferred_start =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDisableDeferredStartup);
@@ -129,7 +129,7 @@ TEST_F(StartupControllerTest, Suppressed) {
   sync_prefs()->SetSyncSetupCompleted();
   sync_prefs()->SetStartSuppressed(true);
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   EXPECT_FALSE(started());
   EXPECT_EQ(kStateStringNotStarted,
@@ -141,7 +141,7 @@ TEST_F(StartupControllerTest, Managed) {
   sync_prefs()->SetSyncSetupCompleted();
   sync_prefs()->SetManagedForTest(true);
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   EXPECT_FALSE(started());
   EXPECT_EQ(kStateStringNotStarted,
@@ -153,7 +153,7 @@ TEST_F(StartupControllerTest, Managed) {
 TEST_F(StartupControllerTest, DataTypeTriggered) {
   sync_prefs()->SetSyncSetupCompleted();
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   EXPECT_FALSE(started());
   EXPECT_EQ(kStateStringDeferred,
@@ -175,7 +175,7 @@ TEST_F(StartupControllerTest, DataTypeTriggered) {
 TEST_F(StartupControllerTest, FallbackTimer) {
   sync_prefs()->SetSyncSetupCompleted();
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   EXPECT_FALSE(started());
   base::RunLoop().RunUntilIdle();
@@ -195,7 +195,7 @@ TEST_F(StartupControllerTest, NoDeferralWithoutSessionsSync) {
   controller()->Reset(syncer::UserTypes());
   sync_prefs()->SetSyncSetupCompleted();
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   EXPECT_TRUE(started());
 }
@@ -213,7 +213,7 @@ TEST_F(StartupControllerTest, FallbackTimerWaits) {
 // may be implicit due to the platform).
 TEST_F(StartupControllerTest, FirstSetup) {
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
 
   if (browser_defaults::kSyncAutoStarts) {
@@ -228,7 +228,7 @@ TEST_F(StartupControllerTest, FirstSetup) {
 TEST_F(StartupControllerTest, Reset) {
   sync_prefs()->SetSyncSetupCompleted();
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   const bool deferred_start =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -247,7 +247,7 @@ TEST_F(StartupControllerTest, Reset) {
 // Test that setup-in-progress tracking is persistent across a Reset.
 TEST_F(StartupControllerTest, ResetDuringSetup) {
   signin()->set_account(kTestUser);
-  token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
 
   // Simulate UI telling us setup is in progress.
   controller()->set_setup_in_progress(true);