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

components/sync/engine_impl/worker_entity_tracker.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 <algorithm>
 
 #include "base/logging.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/time.h"
 #include "components/sync/syncable/syncable_util.h"
 
-namespace syncer_v2 {
+namespace syncer {
 
 WorkerEntityTracker::WorkerEntityTracker(const std::string& client_tag_hash)
     : client_tag_hash_(client_tag_hash) {
   DCHECK(!client_tag_hash_.empty());
 }
 
 WorkerEntityTracker::~WorkerEntityTracker() {}
 
 bool WorkerEntityTracker::HasPendingCommit() const {
   return !!pending_commit_;
@@ skipping 13 matching lines @@
   commit_entity->set_client_defined_unique_tag(client_tag_hash_);
   commit_entity->set_version(base_version_);
   commit_entity->set_deleted(entity.is_deleted());
 
   // TODO(stanisc): This doesn't support bookmarks yet.
   DCHECK(entity.parent_id.empty());
   commit_entity->set_folder(false);
 
   commit_entity->set_name(entity.non_unique_name);
   if (!entity.is_deleted()) {
-    commit_entity->set_ctime(syncer::TimeToProtoTime(entity.creation_time));
-    commit_entity->set_mtime(syncer::TimeToProtoTime(entity.modification_time));
+    commit_entity->set_ctime(TimeToProtoTime(entity.creation_time));
+    commit_entity->set_mtime(TimeToProtoTime(entity.modification_time));
     commit_entity->mutable_specifics()->CopyFrom(entity.specifics);
   }
 }
 
 void WorkerEntityTracker::RequestCommit(const CommitRequestData& data) {
   DCHECK_GE(data.base_version, base_version_)
       << "Base version should never decrease";
   DCHECK_GE(data.sequence_number, sequence_number_)
       << "Sequence number should never decrease";
 
@@ skipping 132 matching lines @@
 
 bool WorkerEntityTracker::IsServerKnown() const {
   return base_version_ != kUncommittedVersion;
 }
 
 void WorkerEntityTracker::ClearPendingCommit() {
   pending_commit_.reset();
   pending_commit_specifics_hash_.clear();
 }
 
-}  // namespace syncer_v2
+}  // namespace syncer