Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/sync/profile_sync_service_mock.h

Index: chrome/browser/sync/profile_sync_service_mock.h
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
index 6f451dab27fa7f4b68f2e55dccadec7be1ba043d..8b418f633de7affb51ce361ba1ee0f4ae9347354 100644
--- a/chrome/browser/sync/profile_sync_service_mock.h
+++ b/chrome/browser/sync/profile_sync_service_mock.h
@@ -25,6 +25,8 @@ using ::testing::Invoke;
 class ProfileSyncServiceMock : public ProfileSyncService {
  public:
   explicit ProfileSyncServiceMock(Profile* profile);
+  ProfileSyncServiceMock(
+      ProfileSyncComponentsFactory* factory, Profile* profile);
   virtual ~ProfileSyncServiceMock();
 
   // A utility used by sync tests to create a TestingProfile with a Google
@@ -37,9 +39,10 @@ class ProfileSyncServiceMock : public ProfileSyncService {
       content::BrowserContext* profile);
 
   MOCK_METHOD0(DisableForUser, void());
-  MOCK_METHOD3(OnBackendInitialized,
+  MOCK_METHOD4(OnBackendInitialized,
       void(const syncer::WeakHandle<syncer::JsBackend>&,
            const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
+           const std::string&,
            bool));
   MOCK_METHOD0(OnSyncCycleCompleted, void());
   MOCK_METHOD0(OnAuthError, void());
@@ -94,18 +97,15 @@ class ProfileSyncServiceMock : public ProfileSyncService {
   MOCK_METHOD1(SetSetupInProgress, void(bool));
   MOCK_CONST_METHOD0(IsSessionsDataTypeControllerRunning, bool());
 
+  MOCK_CONST_METHOD0(GetLocalDeviceInfoProvider,
+                     browser_sync::LocalDeviceInfoProvider*());
+
   MOCK_CONST_METHOD0(GetAllSignedInDevicesMock,
                      std::vector<browser_sync::DeviceInfo*>* ());
   // This is to get around the fact that GMOCK does not handle Scoped*.
   virtual ScopedVector<browser_sync::DeviceInfo>
       GetAllSignedInDevices() const OVERRIDE;
 
-  virtual scoped_ptr<browser_sync::DeviceInfo> GetLocalDeviceInfo()
-      const OVERRIDE;
-  MOCK_CONST_METHOD0(GetLocalDeviceInfoMock,
-                     browser_sync::DeviceInfo*());
-  MOCK_CONST_METHOD0(GetLocalSyncCacheGUID, std::string());
-
   // DataTypeManagerObserver mocks.
   MOCK_METHOD0(OnConfigureBlocked, void());
   MOCK_METHOD1(OnConfigureDone,