[Sync] Replace ProfileSyncComponentsFactory with SyncClient

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/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/glue/sync_backend_host_mock.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
+#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ skipping 42 matching lines @@
   DataTypeManager::ConfigureResult configure_result =
       static_cast<DataTypeManager::ConfigureResult>(result);
   if (result.status == sync_driver::DataTypeManager::ABORTED)
     error_callback.Run(&configure_result);
   service->OnConfigureDone(configure_result);
 }
 
 class TestProfileSyncServiceNoBackup : public ProfileSyncService {
  public:
   TestProfileSyncServiceNoBackup(
-      scoped_ptr<ProfileSyncComponentsFactory> factory,
+      scoped_ptr<sync_driver::SyncApiComponentFactory> factory,
       Profile* profile,
       scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
       ProfileOAuth2TokenService* oauth2_token_service,
       browser_sync::ProfileSyncServiceStartBehavior start_behavior)
      : ProfileSyncService(factory.Pass(), profile, signin_wrapper.Pass(),
                           oauth2_token_service, start_behavior) {}
 
  protected:
   bool NeedBackup() const override { return false; }
 };
@@ skipping 27 matching lines @@
         base::UTF8ToUTF16("sync-startup-test"), 0, std::string(),
         testing_facotries);
   }
 
   void TearDown() override { sync_->RemoveObserver(&observer_); }
 
   static scoped_ptr<KeyedService> BuildService(
       content::BrowserContext* browser_context) {
     Profile* profile = static_cast<Profile*>(browser_context);
     return make_scoped_ptr(new TestProfileSyncServiceNoBackup(
-        scoped_ptr<ProfileSyncComponentsFactory>(
+        scoped_ptr<sync_driver::SyncApiComponentFactory>(
             new ProfileSyncComponentsFactoryMock()),
         profile, make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
                      profile, SigninManagerFactory::GetForProfile(profile))),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
         browser_sync::MANUAL_START));
   }
 
   void CreateSyncService() {
     sync_ = static_cast<ProfileSyncService*>(
         ProfileSyncServiceFactory::GetForProfile(profile_));
@@ skipping 48 matching lines @@
     EXPECT_CALL(*components_factory_mock(),
                 CreateDataTypeManager(_, _, _, _, _)).
         WillOnce(Return(data_type_manager));
     return data_type_manager;
   }
 
   browser_sync::SyncBackendHostMock* SetUpSyncBackendHost() {
     browser_sync::SyncBackendHostMock* sync_backend_host =
         new browser_sync::SyncBackendHostMock();
     EXPECT_CALL(*components_factory_mock(),
-                CreateSyncBackendHost(_, _, _, _, _)).
+                CreateSyncBackendHost(_, _, _, _)).
         WillOnce(Return(sync_backend_host));
     return sync_backend_host;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfileManager profile_manager_;
   TestingProfile* profile_;
   ProfileSyncService* sync_;
   SyncServiceObserverMock observer_;
   sync_driver::DataTypeStatusTable data_type_status_table_;
@@ skipping 13 matching lines @@
       content::BrowserContext* context) {
     Profile* profile = static_cast<Profile*>(context);
     FakeSigninManagerForTesting* signin =
         static_cast<FakeSigninManagerForTesting*>(
         SigninManagerFactory::GetForProfile(profile));
     SimulateTestUserSignin(profile, signin, nullptr);
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     EXPECT_TRUE(signin->IsAuthenticated());
     return make_scoped_ptr(new TestProfileSyncServiceNoBackup(
-        scoped_ptr<ProfileSyncComponentsFactory>(
+        scoped_ptr<sync_driver::SyncApiComponentFactory>(
             new ProfileSyncComponentsFactoryMock()),
         profile, make_scoped_ptr(
                      new SupervisedUserSigninManagerWrapper(profile, signin)),
         oauth2_token_service, browser_sync::AUTO_START));
   }
 };
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
@@ skipping 114 matching lines @@
 #if defined(OS_WIN)
 // http://crbug.com/396402
 #define MAYBE_StartCrosNoCredentials DISABLED_StartCrosNoCredentials
 #else
 #define MAYBE_StartCrosNoCredentials StartCrosNoCredentials
 #endif
 TEST_F(ProfileSyncServiceStartupCrosTest, MAYBE_StartCrosNoCredentials) {
   EXPECT_CALL(*components_factory_mock(),
               CreateDataTypeManager(_, _, _, _, _)).Times(0);
   EXPECT_CALL(*components_factory_mock(),
-              CreateSyncBackendHost(_, _, _, _, _)).Times(0);
+              CreateSyncBackendHost(_, _, _, _)).Times(0);
   profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   sync_->Initialize();
   // Sync should not start because there are no tokens yet.
   EXPECT_FALSE(sync_->IsSyncActive());
   sync_->SetSetupInProgress(false);
 
   // Sync should not start because there are still no tokens.
   EXPECT_FALSE(sync_->IsSyncActive());
@@ skipping 195 matching lines @@
   profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_->Initialize();
 
   sync_->SetSetupInProgress(true);
   IssueTestTokens(account_id);
   sync_->SetSetupInProgress(false);
   EXPECT_FALSE(sync_->IsSyncActive());
 }