summaryrefslogtreecommitdiffstats
path: root/components/sync_driver/model_associator_mock.h
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 23:26:47 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 23:26:47 +0000
commit49fef7948a95e3f3d81302d96f200b1dfbddd9e3 (patch)
tree12e20e3dc919ede7672fbcabe4844453bf056a49 /components/sync_driver/model_associator_mock.h
parent076acafe6160dc1365289838078403554e5be85d (diff)
downloadchromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.zip
chromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.tar.gz
chromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.tar.bz2
[Sync] Fix namespace for sync_driver component
browser_sync namespace was still in use while transitions were being made. We're far enough along now that it's worth moving to the sync_driver namespace. BUG=339728 TBR=bauerb@chromium.org Review URL: https://codereview.chromium.org/408003002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver/model_associator_mock.h')
-rw-r--r--components/sync_driver/model_associator_mock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/sync_driver/model_associator_mock.h b/components/sync_driver/model_associator_mock.h
index ba35d4b..4619c83 100644
--- a/components/sync_driver/model_associator_mock.h
+++ b/components/sync_driver/model_associator_mock.h
@@ -10,7 +10,7 @@
#include "sync/api/sync_error.h"
#include "testing/gmock/include/gmock/gmock.h"
-namespace browser_sync {
+namespace sync_driver {
ACTION_P(SetSyncError, type) {
arg0->Reset(FROM_HERE, "test", type);
@@ -30,6 +30,6 @@ class ModelAssociatorMock : public AssociatorInterface {
MOCK_METHOD0(CryptoReadyIfNecessary, bool());
};
-} // namespace browser_sync
+} // namespace sync_driver
#endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__