sync: final pieces to sync deferred initialization

chrome/browser/sync/profile_sync_components_factory_impl_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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 81 matching lines @@
   void TestSwitchDisablesType(const char* cmd_switch,
                               syncer::ModelType type) {
     command_line_->AppendSwitch(cmd_switch);
     scoped_ptr<ProfileSyncService> pss(
         new ProfileSyncService(
             new ProfileSyncComponentsFactoryImpl(profile_.get(),
                                                  command_line_.get()),
             profile_.get(),
             NULL,
             ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()),
-            ProfileSyncService::MANUAL_START));
+            browser_sync::MANUAL_START));
     pss->factory()->RegisterDataTypes(pss.get());
     DataTypeController::StateMap controller_states;
     pss->GetDataTypeControllerStates(&controller_states);
     EXPECT_EQ(DefaultDatatypesCount() - 1, controller_states.size());
     CheckDefaultDatatypesInMapExcept(&controller_states, type);
   }
 
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   scoped_ptr<Profile> profile_;
   scoped_ptr<CommandLine> command_line_;
 };
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {
   scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile_.get(), command_line_.get()),
       profile_.get(),
       NULL,
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()),
-      ProfileSyncService::MANUAL_START));
+      browser_sync::MANUAL_START));
   pss->factory()->RegisterDataTypes(pss.get());
   DataTypeController::StateMap controller_states;
   pss->GetDataTypeControllerStates(&controller_states);
   EXPECT_EQ(DefaultDatatypesCount(), controller_states.size());
   CheckDefaultDatatypesInMapExcept(&controller_states, syncer::UNSPECIFIED);
 }
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofill) {
   TestSwitchDisablesType(switches::kDisableSyncAutofill,
                          syncer::AUTOFILL);
@@ skipping 26 matching lines @@
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) {
   TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
                          syncer::AUTOFILL_PROFILE);
 }
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) {
   TestSwitchDisablesType(switches::kDisableSyncPasswords,
                          syncer::PASSWORDS);
 }