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

components/browser_sync/browser/profile_sync_service_startup_unittest.cc

Index: components/browser_sync/browser/profile_sync_service_startup_unittest.cc
diff --git a/components/browser_sync/browser/profile_sync_service_startup_unittest.cc b/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
index be3c641e428bce08f97703e6082713ad71b92c4b..1dfea81e331e39f7c499832cf68988f1ed85659f 100644
--- a/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
+++ b/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
@@ -429,14 +429,13 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
   EXPECT_FALSE(sync_service_->IsBackendInitialized());
   // Note that PSS no longer references |data_type_manager| after stopping.
 
-  // When switching back to unmanaged, the state should change and sync should
-  // start but not become active because IsFirstSetupComplete() will be false.
-  SetUpSyncBackendHost();
+  // When switching back to unmanaged, the state should change but sync should
+  // not start automatically because IsFirstSetupComplete() will be false.
   // A new DataTypeManager should not be created.
+  Mock::VerifyAndClearExpectations(data_type_manager);
   EXPECT_CALL(*component_factory_, CreateDataTypeManager(_, _, _, _, _))
       .Times(0);
   pref_service()->ClearPref(sync_driver::prefs::kSyncManaged);
-  EXPECT_TRUE(sync_service_->IsBackendInitialized());

[maxbogue, 2016/07/15 21:44:48]

Leave as EXPECT_FALSE?

[Nicolas Zea, 2016/07/15 22:42:21]

Done.

   EXPECT_FALSE(sync_service_->IsSyncActive());
 }