Index: components/sync/core/processor_entity_tracker_unittest.cc |
diff --git a/components/sync/core/processor_entity_tracker_unittest.cc b/components/sync/core/processor_entity_tracker_unittest.cc |
index d2b821f78e45411131387e49a8e7ea90bb822900..aa48d3774626485b139673441511f313f56c2c07 100644 |
--- a/components/sync/core/processor_entity_tracker_unittest.cc |
+++ b/components/sync/core/processor_entity_tracker_unittest.cc |
@@ -18,7 +18,7 @@ |
#include "components/sync/syncable/syncable_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-namespace syncer { |
+namespace syncer_v2 { |
namespace { |
@@ -135,7 +135,8 @@ TEST_F(ProcessorEntityTrackerTest, DefaultTracker) { |
EXPECT_EQ(0, entity->metadata().sequence_number()); |
EXPECT_EQ(0, entity->metadata().acked_sequence_number()); |
EXPECT_EQ(kUncommittedVersion, entity->metadata().server_version()); |
- EXPECT_EQ(TimeToProtoTime(ctime_), entity->metadata().creation_time()); |
+ EXPECT_EQ(syncer::TimeToProtoTime(ctime_), |
+ entity->metadata().creation_time()); |
EXPECT_EQ(0, entity->metadata().modification_time()); |
EXPECT_TRUE(entity->metadata().specifics_hash().empty()); |
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty()); |
@@ -190,9 +191,10 @@ TEST_F(ProcessorEntityTrackerTest, NewLocalItem) { |
EXPECT_EQ(kHash, data.client_tag_hash); |
EXPECT_EQ(kName, data.non_unique_name); |
EXPECT_EQ(kValue1, data.specifics.preference().value()); |
- EXPECT_EQ(TimeToProtoTime(ctime_), TimeToProtoTime(data.creation_time)); |
+ EXPECT_EQ(syncer::TimeToProtoTime(ctime_), |
+ syncer::TimeToProtoTime(data.creation_time)); |
EXPECT_EQ(entity->metadata().modification_time(), |
- TimeToProtoTime(data.modification_time)); |
+ syncer::TimeToProtoTime(data.modification_time)); |
EXPECT_FALSE(data.is_deleted()); |
EXPECT_EQ(1, request.sequence_number); |
EXPECT_EQ(kUncommittedVersion, request.base_version); |
@@ -233,7 +235,8 @@ TEST_F(ProcessorEntityTrackerTest, NewServerItem) { |
EXPECT_EQ(0, entity->metadata().sequence_number()); |
EXPECT_EQ(0, entity->metadata().acked_sequence_number()); |
EXPECT_EQ(10, entity->metadata().server_version()); |
- EXPECT_EQ(TimeToProtoTime(mtime), entity->metadata().modification_time()); |
+ EXPECT_EQ(syncer::TimeToProtoTime(mtime), |
+ entity->metadata().modification_time()); |
EXPECT_FALSE(entity->metadata().specifics_hash().empty()); |
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty()); |
@@ -260,7 +263,8 @@ TEST_F(ProcessorEntityTrackerTest, NewServerTombstone) { |
EXPECT_EQ(0, entity->metadata().sequence_number()); |
EXPECT_EQ(0, entity->metadata().acked_sequence_number()); |
EXPECT_EQ(1, entity->metadata().server_version()); |
- EXPECT_EQ(TimeToProtoTime(mtime), entity->metadata().modification_time()); |
+ EXPECT_EQ(syncer::TimeToProtoTime(mtime), |
+ entity->metadata().modification_time()); |
EXPECT_TRUE(entity->metadata().specifics_hash().empty()); |
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty()); |
@@ -286,7 +290,8 @@ TEST_F(ProcessorEntityTrackerTest, ServerTombstone) { |
EXPECT_EQ(0, entity->metadata().sequence_number()); |
EXPECT_EQ(0, entity->metadata().acked_sequence_number()); |
EXPECT_EQ(2, entity->metadata().server_version()); |
- EXPECT_EQ(TimeToProtoTime(mtime), entity->metadata().modification_time()); |
+ EXPECT_EQ(syncer::TimeToProtoTime(mtime), |
+ entity->metadata().modification_time()); |
EXPECT_TRUE(entity->metadata().specifics_hash().empty()); |
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty()); |
@@ -389,9 +394,10 @@ TEST_F(ProcessorEntityTrackerTest, LocalDeletion) { |
EXPECT_EQ(kId, data.id); |
EXPECT_EQ(kHash, data.client_tag_hash); |
EXPECT_EQ("", data.non_unique_name); |
- EXPECT_EQ(TimeToProtoTime(ctime_), TimeToProtoTime(data.creation_time)); |
+ EXPECT_EQ(syncer::TimeToProtoTime(ctime_), |
+ syncer::TimeToProtoTime(data.creation_time)); |
EXPECT_EQ(entity->metadata().modification_time(), |
- TimeToProtoTime(data.modification_time)); |
+ syncer::TimeToProtoTime(data.modification_time)); |
EXPECT_TRUE(data.is_deleted()); |
EXPECT_EQ(1, request.sequence_number); |
EXPECT_EQ(1, request.base_version); |
@@ -485,4 +491,4 @@ TEST_F(ProcessorEntityTrackerTest, LocalChangesInterleaved) { |
EXPECT_FALSE(entity->HasCommitData()); |
} |
-} // namespace syncer |
+} // namespace syncer_v2 |