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

components/sync/api/conflict_resolution.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
 #define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
 
 #include <memory>
 
 #include "components/sync/api/entity_data.h"
 
-namespace syncer_v2 {
+namespace syncer {
 
 // A simple class to represent the resolution of a data conflict. We either:
 // 1) Use the local client data and update the server.
 // 2) Use the remote server data and update the client.
 // 3) Use newly created data and update both.
 class ConflictResolution {
  public:
   // This enum is used in histograms.xml and entries shouldn't be renumbered or
   // removed. New entries must be added at the end, before TYPE_SIZE.
   enum Type {
@@ skipping 22 matching lines @@
 
  private:
   ConflictResolution(Type type, std::unique_ptr<EntityData> data);
 
   const Type type_;
   std::unique_ptr<EntityData> data_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolution);
 };
 
-}  // namespace syncer_v2
+}  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_