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

Unified Diff: components/sync/device_info/local_device_info_provider_unittest.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: 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
Index: components/sync/device_info/local_device_info_provider_unittest.cc
diff --git a/components/sync/device_info/local_device_info_provider_unittest.cc b/components/sync/device_info/local_device_info_provider_unittest.cc
index cc2c2c36e77ecf5c51f5c0d6bddbda0089179f3c..b7b09b2fd0b6931bfd1f2cf0bbb21c993b870b99 100644
--- a/components/sync/device_info/local_device_info_provider_unittest.cc
+++ b/components/sync/device_info/local_device_info_provider_unittest.cc
@@ -10,7 +10,10 @@
#include "components/version_info/version_info.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace syncer {
+using sync_driver::DeviceInfo;
+using sync_driver::LocalDeviceInfoProvider;
+
+namespace browser_sync {
const char kLocalDeviceGuid[] = "foo";
const char kSigninScopedDeviceId[] = "device_id";
@@ -87,7 +90,7 @@ TEST_F(LocalDeviceInfoProviderTest, GetLocalDeviceInfo) {
EXPECT_EQ(std::string(kLocalDeviceGuid), local_device_info->guid());
EXPECT_EQ(std::string(kSigninScopedDeviceId),
local_device_info->signin_scoped_device_id());
- EXPECT_EQ(GetSessionNameSynchronouslyForTesting(),
+ EXPECT_EQ(syncer::GetSessionNameSynchronouslyForTesting(),
local_device_info->client_name());
EXPECT_EQ(provider_->GetSyncUserAgent(),
@@ -140,4 +143,4 @@ TEST_F(LocalDeviceInfoProviderTest, InitClearInitRace) {
EXPECT_EQ(guid2, provider_->GetLocalSyncCacheGUID());
}
-} // namespace syncer
+} // namespace browser_sync
« no previous file with comments | « components/sync/device_info/local_device_info_provider_mock.cc ('k') | components/sync/driver/about_sync_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698