sync: final pieces to sync deferred initialization

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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
@@ skipping 81 matching lines @@
 
   static BrowserContextKeyedService* BuildService(
       content::BrowserContext* browser_context) {
     Profile* profile = static_cast<Profile*>(browser_context);
     return new ProfileSyncService(
         new ProfileSyncComponentsFactoryMock(),
         profile,
         new ManagedUserSigninManagerWrapper(
             SigninManagerFactory::GetForProfile(profile)),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-        ProfileSyncService::MANUAL_START);
+        browser_sync::MANUAL_START);
   }
 
   void CreateSyncService() {
     sync_ = static_cast<ProfileSyncService*>(
         ProfileSyncServiceFactory::GetForProfile(profile_.get()));
     sync_->AddObserver(&observer_);
   }
 
   void IssueTestTokens() {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
@@ skipping 47 matching lines @@
                                    "test_user@gmail.com");
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     signin->Initialize(profile, NULL);
     EXPECT_FALSE(signin->GetAuthenticatedUsername().empty());
     return new ProfileSyncService(
         new ProfileSyncComponentsFactoryMock(),
         profile,
         new ManagedUserSigninManagerWrapper(signin),
         oauth2_token_service,
-        ProfileSyncService::AUTO_START);
+        browser_sync::AUTO_START);
   }
 };
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   SigninManagerFactory::GetForProfile(
       profile_.get())->Initialize(profile_.get(), NULL);
   CreateSyncService();
   SetUpSyncBackendHost();
@@ skipping 329 matching lines @@
                                   "test_user@gmail.com");
   SigninManagerFactory::GetForProfile(profile_.get())->Initialize(
       profile_.get(), NULL);
   CreateSyncService();
   SyncBackendHostMock* mock_sbh = SetUpSyncBackendHost();
   mock_sbh->set_fail_initial_download(true);
 
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  IssueTestTokens();
+  sync_->Initialize();
 
   sync_->SetSetupInProgress(true);
-  sync_->Initialize();
+  IssueTestTokens();
   sync_->SetSetupInProgress(false);
   EXPECT_FALSE(sync_->sync_initialized());
 }