diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 23:26:47 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 23:26:47 +0000 |
| commit | 49fef7948a95e3f3d81302d96f200b1dfbddd9e3 (patch) | |
| tree | 12e20e3dc919ede7672fbcabe4844453bf056a49 /components/sync_driver/model_association_manager_unittest.cc | |
| parent | 076acafe6160dc1365289838078403554e5be85d (diff) | |
| download | chromium_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_association_manager_unittest.cc')
| -rw-r--r-- | components/sync_driver/model_association_manager_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/sync_driver/model_association_manager_unittest.cc b/components/sync_driver/model_association_manager_unittest.cc index 214b1b8..9282f3b 100644 --- a/components/sync_driver/model_association_manager_unittest.cc +++ b/components/sync_driver/model_association_manager_unittest.cc @@ -10,7 +10,9 @@ #include "testing/gtest/include/gtest/gtest.h" using ::testing::_; -namespace browser_sync { + +namespace sync_driver { + class MockModelAssociationManagerDelegate : public ModelAssociationManagerDelegate { public: @@ -388,4 +390,4 @@ TEST_F(SyncModelAssociationManagerTest, ModelLoadFailBeforeAssociationStart) { GetController(controllers_, syncer::BOOKMARKS)->state()); } -} // namespace browser_sync +} // namespace sync_driver |