diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:54:17 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:54:17 +0000 |
| commit | 9cfc7c708bd30750fd62a7072c22361e3e2a1189 (patch) | |
| tree | 23b4c6a6b3be3ce1646b789985539c015b4d39b0 /sync/internal_api/http_bridge_unittest.cc | |
| parent | 73c2b16350cb33918a86bd035f033f34d4eb5504 (diff) | |
| download | chromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.zip chromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.tar.gz chromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.tar.bz2 | |
[Sync] Move sync/{internal_api,syncable} into syncer namespace
Add temporary aliases from syncable::* to syncer::syncable::* for
ModelType and related classes until those are ported to syncer proper.
Disambiguate names in MockConnectionManager.
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10699044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/http_bridge_unittest.cc')
| -rw-r--r-- | sync/internal_api/http_bridge_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc index a4a4ceb..bd2e0f8 100644 --- a/sync/internal_api/http_bridge_unittest.cc +++ b/sync/internal_api/http_bridge_unittest.cc @@ -12,7 +12,7 @@ #include "sync/internal_api/public/http_bridge.h" #include "testing/gtest/include/gtest/gtest.h" -using browser_sync::HttpBridge; +namespace syncer { namespace { // TODO(timsteele): Should use PathService here. See Chromium Issue 3113. @@ -402,3 +402,5 @@ TEST_F(SyncHttpBridgeTest, AbortAndReleaseBeforeFetchComplete) { sync_thread.Stop(); io_thread()->Stop(); } + +} // namespace syncer |