[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/engine_impl/worker_entity_tracker_unittest.cc

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/engine_impl/worker_entity_tracker.h"
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/time/time.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/time.h"
 #include "components/sync/core/non_blocking_sync_common.h"
 #include "components/sync/syncable/syncable_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace syncer_v2 {
+namespace syncer {
 
 // Some simple tests for the WorkerEntityTracker.
 //
 // The WorkerEntityTracker is an implementation detail of the ModelTypeWorker.
 // As such, it doesn't make much sense to test it exhaustively, since it
 // already gets a lot of test coverage from the ModelTypeWorker unit tests.
 //
 // These tests are intended as a basic sanity check. Anything more complicated
 // would be redundant.
 class WorkerEntityTrackerTest : public ::testing::Test {
  public:
   WorkerEntityTrackerTest()
       : kServerId("ServerID"),
         kClientTag("some.sample.tag"),
-        kClientTagHash(
-            syncer::syncable::GenerateSyncableHash(syncer::PREFERENCES,
-                                                   kClientTag)),
+        kClientTagHash(syncable::GenerateSyncableHash(PREFERENCES, kClientTag)),
         kSpecificsHash("somehash"),
         kCtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(10)),
         kMtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(20)),
         entity_(new WorkerEntityTracker(kClientTagHash)) {
     specifics.mutable_preference()->set_name(kClientTag);
     specifics.mutable_preference()->set_value("pref.value");
   }
 
   ~WorkerEntityTrackerTest() override {}
 
@@ skipping 51 matching lines @@
   CommitRequestData data = MakeCommitRequestData(kSequenceNumber, kBaseVersion);
   entity_->RequestCommit(data);
   EXPECT_EQ("", entity_->id());
 
   ASSERT_TRUE(entity_->HasPendingCommit());
   sync_pb::SyncEntity pb_entity;
   entity_->PopulateCommitProto(&pb_entity);
   EXPECT_EQ("", pb_entity.id_string());
   EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
   EXPECT_EQ(kBaseVersion, pb_entity.version());
-  EXPECT_EQ(kCtime, syncer::ProtoTimeToTime(pb_entity.ctime()));
-  EXPECT_EQ(kMtime, syncer::ProtoTimeToTime(pb_entity.mtime()));
+  EXPECT_EQ(kCtime, ProtoTimeToTime(pb_entity.ctime()));
+  EXPECT_EQ(kMtime, ProtoTimeToTime(pb_entity.mtime()));
   EXPECT_FALSE(pb_entity.deleted());
   EXPECT_EQ(specifics.preference().name(),
             pb_entity.specifics().preference().name());
   EXPECT_EQ(specifics.preference().value(),
             pb_entity.specifics().preference().value());
 
   CommitResponseData ack;
   ack.response_version = kBaseVersion + 1;
   ack.id = kServerId;
   entity_->ReceiveCommitResponse(&ack);
@@ skipping 59 matching lines @@
   ack.response_version = kCommitResponseVersion;
   ack.id = kServerId;
   entity_->ReceiveCommitResponse(&ack);
 
   entity_->RequestCommit(MakeCommitRequestData(1, kLocalBaseVersion));
   sync_pb::SyncEntity pb_entity;
   entity_->PopulateCommitProto(&pb_entity);
   EXPECT_EQ(kCommitResponseVersion, pb_entity.version());
 }
 
-}  // namespace syncer_v2
+}  // namespace syncer