[Sync] Replace ProfileSyncComponentsFactory with SyncClient

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 90 matching lines @@
 
   // Asserts that if you disable types via the command line, all other types
   // are enabled.
   void TestSwitchDisablesType(syncer::ModelTypeSet types) {
     command_line_->AppendSwitchASCII(switches::kDisableSyncTypes,
                                      syncer::ModelTypeSetToString(types));
     GURL sync_service_url = GetSyncServiceURL(*command_line_);
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
-        scoped_ptr<ProfileSyncComponentsFactory>(
+        scoped_ptr<sync_driver::SyncApiComponentFactory>(
             new ProfileSyncComponentsFactoryImpl(
                 profile_.get(),
                 command_line_.get(),
                 GetSyncServiceURL(*command_line_),
                 token_service,
                 profile_->GetRequestContext())),
         profile_.get(),
         make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
         token_service,
         browser_sync::MANUAL_START));
-    pss->factory()->RegisterDataTypes(pss.get());
+    pss->factory()->Initialize(pss.get());
+    pss->factory()->RegisterDataTypes();
     DataTypeController::StateMap controller_states;
     pss->GetDataTypeControllerStates(&controller_states);
     EXPECT_EQ(DefaultDatatypesCount() - types.Size(), controller_states.size());
     CheckDefaultDatatypesInMapExcept(&controller_states, types);
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<Profile> profile_;
   scoped_ptr<base::CommandLine> command_line_;
   OAuth2TokenService::ScopeSet scope_set_;
 };
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
-      scoped_ptr<ProfileSyncComponentsFactory>(
+      scoped_ptr<sync_driver::SyncApiComponentFactory>(
           new ProfileSyncComponentsFactoryImpl(
               profile_.get(),
               command_line_.get(),
               GetSyncServiceURL(*command_line_),
               token_service,
               profile_->GetRequestContext())),
       profile_.get(),
       make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
       token_service,
       browser_sync::MANUAL_START));
-  pss->factory()->RegisterDataTypes(pss.get());
+  pss->factory()->Initialize(pss.get());
+  pss->factory()->RegisterDataTypes();
   DataTypeController::StateMap controller_states;
   pss->GetDataTypeControllerStates(&controller_states);
   EXPECT_EQ(DefaultDatatypesCount(), controller_states.size());
   CheckDefaultDatatypesInMapExcept(&controller_states, syncer::ModelTypeSet());
 }
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) {
   TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL));
 }
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) {
   TestSwitchDisablesType(
       syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS));
 }