[Sync] Simplify sync startup behavior.

components/browser_sync/browser/profile_sync_service_startup_unittest.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 190 matching lines @@
 
   sync_service_->SetSetupInProgress(true);
 
   // Simulate successful signin as test_user.
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
   // Create some tokens in the token service.
   IssueTestTokens(account_id);
 
   // Simulate the UI telling sync it has finished setting up.
   sync_service_->SetSetupInProgress(false);
+  sync_service_->SetFirstSetupComplete();
   EXPECT_TRUE(sync_service_->IsSyncActive());
 }
 
 // TODO(pavely): Reenable test once android is switched to oauth2.
 TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartNoCredentials) {
   // We've never completed startup.
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
   CreateSyncService(browser_sync::MANUAL_START);
 
   // Should not actually start, rather just clean things up and wait
@@ skipping 195 matching lines @@
   sync_service_->Initialize();
 
   // The service should stop when switching to managed mode.
   Mock::VerifyAndClearExpectations(data_type_manager);
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   pref_service()->SetBoolean(sync_driver::prefs::kSyncManaged, true);
 
-  // When switching back to unmanaged, the state should change, but the service
-  // should not start up automatically (kSyncFirstSetupComplete will be
-  // false).
+  // When switching back to unmanaged, the state should change and sync should
+  // start but not become active because IsFirstSetupComplete() will be false.
   Mock::VerifyAndClearExpectations(data_type_manager);
   EXPECT_CALL(*component_factory_, CreateDataTypeManager(_, _, _, _, _))
       .Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
+  SetUpSyncBackendHost();

[Nicolas Zea, 2016/02/29 21:21:55]

Why is this needed now?

[Nicolas Zea, 2016/03/09 19:49:45]

Ping?

[maxbogue, 2016/03/10 18:48:15]

Whoops, I forgot to respond in the previous update but I was still working on
figuring out exactly why. I have now changed this test more extensively, which
should make it clearer. PTAL!

   pref_service()->ClearPref(sync_driver::prefs::kSyncManaged);
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
   CreateSyncService(browser_sync::MANUAL_START);
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
   sync_service_->SetFirstSetupComplete();
   SetUpSyncBackendHost();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED;
@@ skipping 26 matching lines @@
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_service_->Initialize();
 
   sync_service_->SetSetupInProgress(true);
   IssueTestTokens(account_id);
   sync_service_->SetSetupInProgress(false);
   EXPECT_FALSE(sync_service_->IsSyncActive());
 }