sync: final pieces to sync deferred initialization

chrome/browser/sync/profile_sync_service_startup_unittest.cc

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index 32cd2739b907ad78494af4cc9b17922498a4feaf..5e86998951214ebcbd40f5b718ee2794361803d0 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -99,7 +99,7 @@ class ProfileSyncServiceStartupTest : public testing::Test {
         new ManagedUserSigninManagerWrapper(
             SigninManagerFactory::GetForProfile(profile)),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-        ProfileSyncService::MANUAL_START);
+        browser_sync::MANUAL_START);
   }
 
   void CreateSyncService() {
@@ -167,7 +167,7 @@ class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
         profile,
         new ManagedUserSigninManagerWrapper(signin),
         oauth2_token_service,
-        ProfileSyncService::AUTO_START);
+        browser_sync::AUTO_START);
   }
 };
 
@@ -517,10 +517,10 @@ TEST_F(ProfileSyncServiceStartupTest, StartDownloadFailed) {
   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());
 }