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

Unified Diff: components/sync/driver/data_type_controller_mock.h

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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
« no previous file with comments | « components/sync/driver/data_type_controller.cc ('k') | components/sync/driver/data_type_controller_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/data_type_controller_mock.h
diff --git a/components/sync/driver/data_type_controller_mock.h b/components/sync/driver/data_type_controller_mock.h
index 207702aab7008b35619dd035f22f0e49704387d7..8181b85ceec522fcee52e9a2ad01585ea0d850cd 100644
--- a/components/sync/driver/data_type_controller_mock.h
+++ b/components/sync/driver/data_type_controller_mock.h
@@ -10,7 +10,7 @@
#include "components/sync/driver/data_type_controller.h"
#include "testing/gmock/include/gmock/gmock.h"
-namespace sync_driver {
+namespace syncer {
class StartCallbackMock {
public:
@@ -19,8 +19,8 @@ class StartCallbackMock {
MOCK_METHOD3(Run,
void(DataTypeController::ConfigureResult result,
- const syncer::SyncMergeResult& local_merge_result,
- const syncer::SyncMergeResult& syncer_merge_result));
+ const SyncMergeResult& local_merge_result,
+ const SyncMergeResult& syncer_merge_result));
};
class ModelLoadCallbackMock {
@@ -28,9 +28,9 @@ class ModelLoadCallbackMock {
ModelLoadCallbackMock();
virtual ~ModelLoadCallbackMock();
- MOCK_METHOD2(Run, void(syncer::ModelType, const syncer::SyncError&));
+ MOCK_METHOD2(Run, void(ModelType, const SyncError&));
};
-} // namespace sync_driver
+} // namespace syncer
#endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_MOCK_H__
« no previous file with comments | « components/sync/driver/data_type_controller.cc ('k') | components/sync/driver/data_type_controller_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698