| Index: components/sync/engine_impl/worker_entity_tracker_unittest.cc
|
| diff --git a/components/sync/engine_impl/worker_entity_tracker_unittest.cc b/components/sync/engine_impl/worker_entity_tracker_unittest.cc
|
| index cbe91d3f35295de0c2cf542f37a49c20f7ea3db6..60cadd3017389aa45ca9427e7ff5f1dc7b1eb3b6 100644
|
| --- a/components/sync/engine_impl/worker_entity_tracker_unittest.cc
|
| +++ b/components/sync/engine_impl/worker_entity_tracker_unittest.cc
|
| @@ -16,7 +16,7 @@
|
| #include "components/sync/syncable/syncable_util.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace syncer {
|
| +namespace syncer_v2 {
|
|
|
| // Some simple tests for the WorkerEntityTracker.
|
| //
|
| @@ -31,7 +31,9 @@ class WorkerEntityTrackerTest : public ::testing::Test {
|
| WorkerEntityTrackerTest()
|
| : kServerId("ServerID"),
|
| kClientTag("some.sample.tag"),
|
| - kClientTagHash(syncable::GenerateSyncableHash(PREFERENCES, kClientTag)),
|
| + kClientTagHash(
|
| + syncer::syncable::GenerateSyncableHash(syncer::PREFERENCES,
|
| + kClientTag)),
|
| kSpecificsHash("somehash"),
|
| kCtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(10)),
|
| kMtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(20)),
|
| @@ -103,8 +105,8 @@ TEST_F(WorkerEntityTrackerTest, FromCommitRequest) {
|
| EXPECT_EQ("", pb_entity.id_string());
|
| EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
|
| EXPECT_EQ(kBaseVersion, 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());
|
| @@ -184,4 +186,4 @@ TEST_F(WorkerEntityTrackerTest, QuickCommits) {
|
| EXPECT_EQ(kCommitResponseVersion, pb_entity.version());
|
| }
|
|
|
| -} // namespace syncer
|
| +} // namespace syncer_v2
|
|
|