[Sync] Start up immediately when entering the sync setup UI.

components/sync_driver/startup_controller_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync_driver/startup_controller.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 150 matching lines @@
   controller()->TryStart();
   ExpectNotStarted();
 }
 
 // Test that sync doesn't start until all conditions are met and a
 // data type triggers sync startup.
 TEST_F(StartupControllerTest, DataTypeTriggered) {
   sync_prefs()->SetFirstSetupComplete();
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
-  controller()->TryStart();
-  ExpectStartDeferred();
 
+  // Test a cold start.
   controller()->OnDataTypeRequestsSyncStartup(syncer::SESSIONS);
   ExpectStarted();
 
+  clear_started();
+  controller()->Reset(syncer::UserTypes());
+  ExpectNotStarted();
+
+  // Test interrupting a deferred start.

[Nicolas Zea, 2016/03/14 22:42:01]

Maybe split this into two separate tests?

[maxbogue, 2016/03/15 17:41:01]

Done.

+  controller()->TryStart();
+  ExpectStartDeferred();
+  controller()->OnDataTypeRequestsSyncStartup(syncer::SESSIONS);
+  ExpectStarted();
+
   // The fallback timer shouldn't result in another invocation of the closure
   // we passed to the StartupController.
   clear_started();
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(started());
 }
 
 // Test that the fallback timer starts sync in the event all
 // conditions are met and no data type requests sync.
 TEST_F(StartupControllerTest, FallbackTimer) {
@@ skipping 33 matching lines @@
   ExpectNotStarted();
   base::RunLoop().RunUntilIdle();
   ExpectNotStarted();
 }
 
 // Test that start isn't deferred when setup is in progress.
 TEST_F(StartupControllerTest, NoDeferralWithSetupInProgress) {
   sync_prefs()->SetFirstSetupComplete();
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
-  controller()->set_setup_in_progress(true);
+
+  // Test a cold start.
+  controller()->SetSetupInProgress(true);
+  ExpectStarted();
+
+  clear_started();
+  controller()->Reset(syncer::UserTypes());
+  controller()->SetSetupInProgress(false);
+  ExpectNotStarted();
+
+  // Test interrupting a deferred start.

[Nicolas Zea, 2016/03/14 22:42:01]

This also seems like it could be two different tests.

[maxbogue, 2016/03/15 17:41:01]

Done.

   controller()->TryStart();
+  ExpectStartDeferred();
+  controller()->SetSetupInProgress(true);
   ExpectStarted();
 }
 
 // Test that start isn't deferred on the first start but is on restarts.
 TEST_F(StartupControllerTest, DeferralOnRestart) {
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
   controller()->TryStart();
   ExpectStarted();
 
   clear_started();
   controller()->Reset(syncer::UserTypes());
   ExpectNotStarted();
   controller()->TryStart();
   ExpectStartDeferred();
 }
 
 // Test that setup-in-progress tracking is persistent across a Reset.
 TEST_F(StartupControllerTest, ResetDuringSetup) {
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
 
   // Simulate UI telling us setup is in progress.
-  controller()->set_setup_in_progress(true);
+  controller()->SetSetupInProgress(true);
 
   // This could happen if the UI triggers a stop-syncing permanently call.
   controller()->Reset(syncer::UserTypes());
 
   // From the UI's point of view, setup is still in progress.
   EXPECT_TRUE(controller()->IsSetupInProgress());
 }
 
 }  // namespace browser_sync