[Sync] Don't start up sync when FirstSetupCompleted is false and no setup in progress

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 68 matching lines @@
 
  private:
   bool can_start_;
   bool started_;
   base::MessageLoop message_loop_;
   syncable_prefs::TestingPrefServiceSyncable pref_service_;
   std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
   std::unique_ptr<StartupController> controller_;
 };
 
-// Test that sync doesn't start until all conditions are met.
-TEST_F(StartupControllerTest, Basic) {
+// Test that sync doesn't start if setup is not in progress or complete.
+TEST_F(StartupControllerTest, NoSetupComplete) {
   controller()->TryStart();
   ExpectNotStarted();
 
   SetCanStart(true);
   controller()->TryStart();
-  ExpectStarted();
+  ExpectNotStarted();
 }
 
 // Test that sync defers if first setup is complete.
 TEST_F(StartupControllerTest, DefersAfterFirstSetupComplete) {
   sync_prefs()->SetFirstSetupComplete();
   SetCanStart(true);
   controller()->TryStart();
   ExpectStartDeferred();
 }
 
@@ skipping 75 matching lines @@
 TEST_F(StartupControllerTest, SetupInProgressTriggerInterruptsDeferral) {
   sync_prefs()->SetFirstSetupComplete();
   SetCanStart(true);
   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) {
+// Test that immediate startup can be forced.
+TEST_F(StartupControllerTest, ForceImmediateStartup) {
   SetCanStart(true);
-  controller()->TryStart();
+  controller()->TryStartImmediately();
   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) {
   SetCanStart(true);
 
   // Simulate UI telling us setup is in progress.
   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