[Sync] Move //sync to //components/sync.

components/sync/api/conflict_resolution.h

Index: components/sync/api/conflict_resolution.h
diff --git a/sync/api/conflict_resolution.h b/components/sync/api/conflict_resolution.h
similarity index 88%
rename from sync/api/conflict_resolution.h
rename to components/sync/api/conflict_resolution.h
index 3a9bb32cd81d72b809571b5f21e568ebf7756d7f..592fb5441d9ef33832473f94289fde85501edd9c 100644
--- a/sync/api/conflict_resolution.h
+++ b/components/sync/api/conflict_resolution.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_API_CONFLICT_RESOLUTION_H_
-#define SYNC_API_CONFLICT_RESOLUTION_H_
+#ifndef COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
+#define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
 
 #include <memory>
 
-#include "sync/api/entity_data.h"
+#include "components/sync/api/entity_data.h"
 
 namespace syncer_v2 {
 
@@ -54,4 +54,4 @@ class SYNC_EXPORT ConflictResolution {
 
 }  // namespace syncer_v2
 
-#endif  // SYNC_API_CONFLICT_RESOLUTION_H_
+#endif  // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_