Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(548)

Unified Diff: chrome/browser/sync/profile_sync_components_factory_mock.cc

Issue 612103005: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ada00f996de606ec749c98a81f292979c95cc50a..f113d33101af091cff5da8ee7cbf281a1693c608 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
@@ -4,8 +4,8 @@
#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/local_device_info_provider_mock.h"
#include "components/sync_driver/model_associator.h"
#include "content/public/browser/browser_thread.h"
#include "sync/api/attachments/fake_attachment_store.h"
@@ -18,14 +18,14 @@ using testing::InvokeWithoutArgs;
using testing::Return;
ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock()
- : local_device_(new browser_sync::LocalDeviceInfoProviderMock()) {
+ : local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {
}
ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock(
AssociatorInterface* model_associator, ChangeProcessor* change_processor)
: model_associator_(model_associator),
change_processor_(change_processor),
- local_device_(new browser_sync::LocalDeviceInfoProviderMock()) {
+ local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {
ON_CALL(*this, CreateBookmarkSyncComponents(_, _)).
WillByDefault(
InvokeWithoutArgs(

Powered by Google App Engine
This is Rietveld 408576698