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

components/sync/api/conflict_resolution.h

Index: components/sync/api/conflict_resolution.h
diff --git a/components/sync/api/conflict_resolution.h b/components/sync/api/conflict_resolution.h
index 1f6c77b5279ea90ba317540a92dd387842dcbc47..542910f5ab0d1f31e214947c97169047d25c9e58 100644
--- a/components/sync/api/conflict_resolution.h
+++ b/components/sync/api/conflict_resolution.h
@@ -9,7 +9,7 @@
 
 #include "components/sync/api/entity_data.h"
 
-namespace syncer {
+namespace syncer_v2 {
 
 // A simple class to represent the resolution of a data conflict. We either:
 // 1) Use the local client data and update the server.
@@ -52,6 +52,6 @@ class ConflictResolution {
   DISALLOW_COPY_AND_ASSIGN(ConflictResolution);
 };
 
-}  // namespace syncer
+}  // namespace syncer_v2
 
 #endif  // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_