[sync] Make SetSetupInProgress kick sync engine when needed

chrome/browser/sync/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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ skipping 134 matching lines @@
   // Then start things up.
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::CONFIGURED)).
       WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   // Create some tokens in the token service; the service will startup when
   // it is notified that tokens are available.
-  service_->set_setup_in_progress(true);
+  service_->SetSetupInProgress(true);
   service_->signin()->StartSignIn("test_user", "", "", "");
   TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
       GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  service_->set_setup_in_progress(false);
-  service_->OnUserChoseDatatypes(
-      false, syncable::ModelTypeSet(syncable::BOOKMARKS));
+  service_->SetSetupInProgress(false);
   EXPECT_TRUE(service_->ShouldPushChanges());
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartNoCredentials) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);
 
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   // Make sure SigninManager doesn't think we're signed in (undoes the call to
@@ skipping 12 matching lines @@
   Mock::VerifyAndClearExpectations(data_type_manager);
 
   // Then start things up.
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::CONFIGURED)).
       WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
-  service_->set_setup_in_progress(true);
+  service_->SetSetupInProgress(true);
   service_->signin()->StartSignIn("test_user", "", "", "");
   // NOTE: Unlike StartFirstTime, this test does not issue any auth tokens.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOKEN_LOADING_FINISHED,
       content::Source<TokenService>(
           TokenServiceFactory::GetForProfile(profile_.get())),
       content::NotificationService::NoDetails());
-  service_->set_setup_in_progress(false);
-  service_->OnUserChoseDatatypes(
-      false, syncable::ModelTypeSet(syncable::BOOKMARKS));
+  service_->SetSetupInProgress(false);
   // Backend should initialize using a bogus GAIA token for credentials.
   EXPECT_TRUE(service_->ShouldPushChanges());
 }
 
 TEST_F(ProfileSyncServiceStartupCrosTest, StartCrosNoCredentials) {
   EXPECT_CALL(*factory_mock(), CreateDataTypeManager(_, _)).Times(0);
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   service_->Initialize();
   // Sync should not start because there are no tokens yet.
   EXPECT_FALSE(service_->ShouldPushChanges());
   EXPECT_FALSE(service_->GetBackendForTest());
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOKEN_LOADING_FINISHED,
       content::Source<TokenService>(
           TokenServiceFactory::GetForProfile(profile_.get())),
       content::NotificationService::NoDetails());
-  service_->set_setup_in_progress(false);
+  service_->SetSetupInProgress(false);
   // Sync should not start because there are still no tokens.
   EXPECT_FALSE(service_->ShouldPushChanges());
   EXPECT_FALSE(service_->GetBackendForTest());
 }
 
 TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   EXPECT_CALL(*data_type_manager, state()).
@@ skipping 167 matching lines @@
 
   // Preload the tokens.
   TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   service_->fail_initial_download();
 
   service_->Initialize();
   EXPECT_FALSE(service_->sync_initialized());
   EXPECT_FALSE(service_->GetBackendForTest());
 }