Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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 7364111b441477154e823497983100f2104d1c32..3ab3903c8b65a8a3008dd1e736adaf415fe1f0db 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -8,7 +8,6 @@
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -18,20 +17,7 @@
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncService(
-          scoped_ptr<ProfileSyncComponentsFactory>(
-              new ProfileSyncComponentsFactoryMock()),
-          profile,
-          make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
-              profile,
-              SigninManagerFactory::GetForProfile(profile))),
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-          browser_sync::MANUAL_START) {
-}
-
-ProfileSyncServiceMock::ProfileSyncServiceMock(
-    scoped_ptr<ProfileSyncComponentsFactory> factory, Profile* profile)
-    : ProfileSyncService(
-          factory.Pass(),
+          NULL,
           profile,
           make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
               profile,
@@ -64,3 +50,8 @@
   devices.get() = *device_vector;
   return devices.Pass();
 }
+
+scoped_ptr<browser_sync::DeviceInfo>
+    ProfileSyncServiceMock::GetLocalDeviceInfo() const {
+  return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass();
+}