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

Unified Diff: sync/syncable/directory_backing_store_unittest.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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 | « sync/syncable/directory_backing_store.cc ('k') | sync/syncable/entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/directory_backing_store_unittest.cc
diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc
index 1728da0a0a3bf4c9ac5985a4ae4eeeb4198182b6..25aca638a8453b5da43fa7591f240581aa093ded 100644
--- a/sync/syncable/directory_backing_store_unittest.cc
+++ b/sync/syncable/directory_backing_store_unittest.cc
@@ -287,8 +287,7 @@ std::map<int64, base::Time> GetExpectedMetaTimes() {
for (std::map<int64, int64>::const_iterator it =
expected_meta_proto_times.begin();
it != expected_meta_proto_times.end(); ++it) {
- expected_meta_times[it->first] =
- syncer::ProtoTimeToTime(it->second);
+ expected_meta_times[it->first] = ProtoTimeToTime(it->second);
}
return expected_meta_times;
}
@@ -328,8 +327,8 @@ std::map<int64, int64> GetMetaProtoTimes(sql::Connection *db) {
<< t1_expr << " and " << t2_expr
<< " (internal values: " << t1.ToInternalValue()
<< " and " << t2.ToInternalValue()
- << ") (proto time: " << syncer::TimeToProtoTime(t1)
- << " and " << syncer::TimeToProtoTime(t2)
+ << ") (proto time: " << TimeToProtoTime(t1)
+ << " and " << TimeToProtoTime(t2)
<< ") do not match";
}
@@ -1952,25 +1951,25 @@ TEST_P(MigrationTest, ToCurrentVersion) {
// Check download_progress state (v75 migration)
ASSERT_EQ(694,
- dir_info.kernel_info.download_progress[syncer::BOOKMARKS]
+ dir_info.kernel_info.download_progress[BOOKMARKS]
.timestamp_token_for_migration());
ASSERT_FALSE(
- dir_info.kernel_info.download_progress[syncer::BOOKMARKS]
+ dir_info.kernel_info.download_progress[BOOKMARKS]
.has_token());
ASSERT_EQ(32904,
- dir_info.kernel_info.download_progress[syncer::BOOKMARKS]
+ dir_info.kernel_info.download_progress[BOOKMARKS]
.data_type_id());
ASSERT_FALSE(
- dir_info.kernel_info.download_progress[syncer::THEMES]
+ dir_info.kernel_info.download_progress[THEMES]
.has_timestamp_token_for_migration());
ASSERT_TRUE(
- dir_info.kernel_info.download_progress[syncer::THEMES]
+ dir_info.kernel_info.download_progress[THEMES]
.has_token());
ASSERT_TRUE(
- dir_info.kernel_info.download_progress[syncer::THEMES]
+ dir_info.kernel_info.download_progress[THEMES]
.token().empty());
ASSERT_EQ(41210,
- dir_info.kernel_info.download_progress[syncer::THEMES]
+ dir_info.kernel_info.download_progress[THEMES]
.data_type_id());
// Check metas
« no previous file with comments | « sync/syncable/directory_backing_store.cc ('k') | sync/syncable/entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698