Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 8d3bd68a45611c419d502d14473752d354597086..5a651f746da12cd1cfb71c7184e332fc70c3c88b 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -35,6 +35,7 @@
 #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/signin_manager.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_observer.h"
@@ -105,12 +106,11 @@
 class TestChromeSyncClient : public ChromeSyncClient {
  public:
   TestChromeSyncClient(
+      Profile* profile,
       scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory,
-      Profile* profile,
       sync_driver::ClearBrowsingDataCallback callback)
-      : ChromeSyncClient(profile),
-        callback_(callback),
-        component_factory_(component_factory.Pass()) {}
+      : ChromeSyncClient(profile, component_factory.Pass()),
+        callback_(callback) {}
   ~TestChromeSyncClient() override {}
 
  private:
@@ -119,12 +119,8 @@
       override {
     return callback_;
   }
-  sync_driver::SyncApiComponentFactory* GetSyncApiComponentFactory() override {
-    return component_factory_.get();
-  }
 
   sync_driver::ClearBrowsingDataCallback callback_;
-  scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory_;
 };
 
 class TestSyncServiceObserver : public sync_driver::SyncServiceObserver {
@@ -259,9 +255,7 @@
  protected:
   ProfileSyncServiceTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-        profile_manager_(TestingBrowserProcess::GetGlobal()),
-        profile_(NULL),
-        components_factory_(NULL) {}
+        profile_manager_(TestingBrowserProcess::GetGlobal()) {}
   ~ProfileSyncServiceTest() override {}
 
   void SetUp() override {
@@ -310,7 +304,7 @@
         new SyncApiComponentFactoryMock());
     components_factory_ = components_factory.get();
     scoped_ptr<ChromeSyncClient> sync_client(new TestChromeSyncClient(
-        components_factory.Pass(), profile_,
+        profile_, components_factory.Pass(),
         base::Bind(&ProfileSyncServiceTest::ClearBrowsingDataCallback,
                    base::Unretained(this))));
     service_.reset(new ProfileSyncService(
@@ -397,14 +391,14 @@
   }
 
   void ExpectSyncBackendHostCreation(int times) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
         .Times(times)
         .WillRepeatedly(ReturnNewSyncBackendHostMock());
   }
 
   void ExpectSyncBackendHostCreationCollectDeleteDir(
       int times, std::vector<bool> *delete_dir_param) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
         .Times(times)
         .WillRepeatedly(
             ReturnNewMockHostCollectDeleteDirParam(delete_dir_param));
@@ -412,13 +406,13 @@
 
   void ExpectSyncBackendHostCreationCaptureClearServerData(
       syncer::SyncManager::ClearServerDataCallback* captured_callback) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
         .Times(1)
         .WillOnce(ReturnNewMockHostCaptureClearServerData(captured_callback));
   }
 
   void PrepareDelayedInitSyncBackendHost() {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
         .WillOnce(ReturnNewSyncBackendHostNoReturn());
   }