Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/api/conflict_resolution.cc

 // Copyright 2016 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/api/conflict_resolution.h"
 
-namespace syncer {
+namespace syncer_v2 {
 
 // static
 ConflictResolution ConflictResolution::UseLocal() {
   return ConflictResolution(USE_LOCAL, nullptr);
 }
 
 // static
 ConflictResolution ConflictResolution::UseRemote() {
   return ConflictResolution(USE_REMOTE, nullptr);
 }
@@ skipping 13 matching lines @@
 std::unique_ptr<EntityData> ConflictResolution::ExtractData() {
   // Has data if and only if type is USE_NEW.
   DCHECK((type_ == USE_NEW) == !!data_);
   return std::move(data_);
 };
 
 ConflictResolution::ConflictResolution(Type type,
                                        std::unique_ptr<EntityData> data)
     : type_(type), data_(std::move(data)) {}
 
-}  // namespace syncer
+}  // namespace syncer_v2