[Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/sync/profile_sync_service_mock.cc

Index: chrome/browser/sync/profile_sync_service_mock.cc
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc
index 209187aefa81f0b2c49f3907ce4ec088680d9602..f9bea1f70f1dcd484fa915a2af909dd3138d8c48 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -21,11 +21,7 @@
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncServiceMock(
-          make_scoped_ptr(
-              new browser_sync::ChromeSyncClient(
-                  profile,
-                  make_scoped_ptr(new SyncApiComponentFactoryMock())))
-              .Pass(),
+          make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),
           profile) {}
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(
@@ -64,6 +60,9 @@ TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {
 // static
 scoped_ptr<KeyedService> ProfileSyncServiceMock::BuildMockProfileSyncService(
     content::BrowserContext* profile) {
-  return make_scoped_ptr(
+  scoped_ptr<ProfileSyncServiceMock> sync_service(
       new ProfileSyncServiceMock(static_cast<Profile*>(profile)));
+  sync_service->GetSyncClient()->Initialize(

[blundell, 2015/11/13 09:33:56]

nit: Any reason not to put this in the constructor of ProfileSyncServiceMock?

[Nicolas Zea, 2015/11/14 00:52:26]

This has been removed.

+      make_scoped_ptr(new SyncApiComponentFactoryMock()), sync_service.get());
+  return sync_service.Pass();
 }