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

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

Issue 398423002: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed wrong signin_scoped_device_id assert from LocalDeviceInfoProvider. Created 6 years, 5 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 2ed6f14e87518a7d13182d2ee96b4556ab091bc3..b3f576edfd69efe6e1ec6ef818039c62b5fd1c40 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
@@ -3,6 +3,8 @@
// 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"
@@ -13,13 +15,17 @@ using browser_sync::AssociatorInterface;
using browser_sync::ChangeProcessor;
using testing::_;
using testing::InvokeWithoutArgs;
+using testing::Return;
-ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock() {}
+ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock()
+ : local_device_(new browser_sync::LocalDeviceInfoProviderMock()) {
+}
ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock(
AssociatorInterface* model_associator, ChangeProcessor* change_processor)
: model_associator_(model_associator),
- change_processor_(change_processor) {
+ change_processor_(change_processor),
+ local_device_(new browser_sync::LocalDeviceInfoProviderMock()) {
ON_CALL(*this, CreateBookmarkSyncComponents(_, _)).
WillByDefault(
InvokeWithoutArgs(
@@ -41,3 +47,13 @@ ProfileSyncComponentsFactoryMock::MakeSyncComponents() {
return SyncComponents(model_associator_.release(),
change_processor_.release());
}
+
+scoped_ptr<browser_sync::LocalDeviceInfoProvider>
+ProfileSyncComponentsFactoryMock::CreateLocalDeviceInfoProvider() {
+ return local_device_.Pass();
+}
+
+void ProfileSyncComponentsFactoryMock::SetLocalDeviceInfoProvider(
+ scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device) {
+ local_device_ = local_device.Pass();
+}
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698