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

Unified Diff: components/sync/driver/model_associator_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/model_associator.h ('k') | components/sync/driver/model_associator_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/model_associator_mock.h
diff --git a/components/sync/driver/model_associator_mock.h b/components/sync/driver/model_associator_mock.h
index 8edbf788f183c83f929505c3bbbf5ee4ea3b0cb4..0725d595bc7c6f163dc891357d792f639b4db892 100644
--- a/components/sync/driver/model_associator_mock.h
+++ b/components/sync/driver/model_associator_mock.h
@@ -10,7 +10,7 @@
#include "components/sync/driver/model_associator.h"
#include "testing/gmock/include/gmock/gmock.h"
-namespace sync_driver {
+namespace syncer {
ACTION_P(SetSyncError, type) {
arg0->Reset(FROM_HERE, "test", type);
@@ -21,15 +21,13 @@ class ModelAssociatorMock : public AssociatorInterface {
ModelAssociatorMock();
virtual ~ModelAssociatorMock();
- MOCK_METHOD2(AssociateModels,
- syncer::SyncError(syncer::SyncMergeResult*,
- syncer::SyncMergeResult*));
- MOCK_METHOD0(DisassociateModels, syncer::SyncError());
+ MOCK_METHOD2(AssociateModels, SyncError(SyncMergeResult*, SyncMergeResult*));
+ MOCK_METHOD0(DisassociateModels, SyncError());
MOCK_METHOD1(SyncModelHasUserCreatedNodes, bool(bool* has_nodes));
MOCK_METHOD0(AbortAssociation, void());
MOCK_METHOD0(CryptoReadyIfNecessary, bool());
};
-} // namespace sync_driver
+} // namespace syncer
#endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__
« no previous file with comments | « components/sync/driver/model_associator.h ('k') | components/sync/driver/model_associator_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698