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

Unified Diff: sync/engine/entity_tracker_unittest.cc

Issue 1285443002: move V2 classes in chrome/engine to syncer_v2 namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/engine/entity_tracker.cc ('k') | sync/engine/model_type_entity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/entity_tracker_unittest.cc
diff --git a/sync/engine/entity_tracker_unittest.cc b/sync/engine/entity_tracker_unittest.cc
index 873875b64b181f0bb7560c567d5382034d744244..b814d79e6132136a4626b37c85a8a5ac6a7f72b2 100644
--- a/sync/engine/entity_tracker_unittest.cc
+++ b/sync/engine/entity_tracker_unittest.cc
@@ -12,7 +12,7 @@
#include "sync/util/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace syncer {
+namespace syncer_v2 {
// Some simple tests for the EntityTracker.
//
@@ -27,7 +27,9 @@ class EntityTrackerTest : public ::testing::Test {
EntityTrackerTest()
: kServerId("ServerID"),
kClientTag("some.sample.tag"),
- kClientTagHash(syncable::GenerateSyncableHash(PREFERENCES, kClientTag)),
+ kClientTagHash(
+ syncer::syncable::GenerateSyncableHash(syncer::PREFERENCES,
+ kClientTag)),
kCtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(10)),
kMtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(20)) {
specifics.mutable_preference()->set_name(kClientTag);
@@ -75,8 +77,8 @@ TEST_F(EntityTrackerTest, FromCommitRequest) {
EXPECT_EQ(kServerId, pb_entity.id_string());
EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
EXPECT_EQ(33, pb_entity.version());
- EXPECT_EQ(kCtime, ProtoTimeToTime(pb_entity.ctime()));
- EXPECT_EQ(kMtime, ProtoTimeToTime(pb_entity.mtime()));
+ EXPECT_EQ(kCtime, syncer::ProtoTimeToTime(pb_entity.ctime()));
+ EXPECT_EQ(kMtime, syncer::ProtoTimeToTime(pb_entity.mtime()));
EXPECT_FALSE(pb_entity.deleted());
EXPECT_EQ(specifics.preference().name(),
pb_entity.specifics().preference().name());
« no previous file with comments | « sync/engine/entity_tracker.cc ('k') | sync/engine/model_type_entity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698