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

chrome/browser/sync/profile_sync_components_factory_mock.cc

Index: chrome/browser/sync/profile_sync_components_factory_mock.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc
index ef8fa608b133cb7aa5c05d61793f65e56bfc40e0..2ed6f14e87518a7d13182d2ee96b4556ab091bc3 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
-
-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/model_associator.h"
 #include "content/public/browser/browser_thread.h"
@@ -15,13 +13,8 @@
 using browser_sync::ChangeProcessor;
 using testing::_;
 using testing::InvokeWithoutArgs;
-using testing::Return;
 
-ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock() {
-  ON_CALL(*this, CreateLocalDeviceInfoProviderMock()).
-      WillByDefault(
-          Return(new browser_sync::LocalDeviceInfoProviderMock()));
-}
+ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock() {}
 
 ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock(
     AssociatorInterface* model_associator, ChangeProcessor* change_processor)
@@ -32,9 +25,6 @@
           InvokeWithoutArgs(
               this,
               &ProfileSyncComponentsFactoryMock::MakeSyncComponents));
-  ON_CALL(*this, CreateLocalDeviceInfoProviderMock()).
-      WillByDefault(
-          Return(new browser_sync::LocalDeviceInfoProviderMock()));
 }
 
 ProfileSyncComponentsFactoryMock::~ProfileSyncComponentsFactoryMock() {}
@@ -51,9 +41,3 @@
   return SyncComponents(model_associator_.release(),
                         change_processor_.release());
 }
-
-scoped_ptr<browser_sync::LocalDeviceInfoProvider>
-ProfileSyncComponentsFactoryMock::CreateLocalDeviceInfoProvider() {
-  return scoped_ptr<browser_sync::LocalDeviceInfoProvider>(
-      CreateLocalDeviceInfoProviderMock());
-}