[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 144 matching lines @@
 // Test that sync doesn't when managed even if all other conditons are met.
 TEST_F(StartupControllerTest, Managed) {
   sync_prefs()->SetFirstSetupComplete();
   sync_prefs()->SetManagedForTest(true);
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
   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) {
+// Test that a data type triggering startup starts sync immediately.
+TEST_F(StartupControllerTest, NoDeferralDataTypeTrigger) {
   sync_prefs()->SetFirstSetupComplete();
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
+  controller()->OnDataTypeRequestsSyncStartup(syncer::SESSIONS);
+  ExpectStarted();
+}
+
+// Test that a data type trigger interrupts the deferral timer and starts
+// sync immediately.
+TEST_F(StartupControllerTest, DataTypeTriggerInterruptsDeferral) {
+  sync_prefs()->SetFirstSetupComplete();
+  signin()->set_account_id(kTestUser);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
   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();
@@ skipping 34 matching lines @@
 
 // Sanity check that the fallback timer doesn't fire before startup
 // conditions are met.
 TEST_F(StartupControllerTest, FallbackTimerWaits) {
   controller()->TryStart();
   ExpectNotStarted();
   base::RunLoop().RunUntilIdle();
   ExpectNotStarted();
 }
 
-// Test that start isn't deferred when setup is in progress.
-TEST_F(StartupControllerTest, NoDeferralWithSetupInProgress) {
+// Test that sync starts immediately when setup in progress is true.
+TEST_F(StartupControllerTest, NoDeferralSetupInProgressTrigger) {
   sync_prefs()->SetFirstSetupComplete();
   signin()->set_account_id(kTestUser);
   token_service()->UpdateCredentials(kTestUser, kTestToken);
-  controller()->set_setup_in_progress(true);
-  controller()->TryStart();
+
+  controller()->SetSetupInProgress(true);
   ExpectStarted();
 }
 
+// Test that setup in progress being set to true interrupts the deferral timer
+// and starts sync immediately.
+TEST_F(StartupControllerTest, SetupInProgressTriggerInterruptsDeferral) {
+  sync_prefs()->SetFirstSetupComplete();
+  signin()->set_account_id(kTestUser);
+  token_service()->UpdateCredentials(kTestUser, kTestToken);
+  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