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

components/sync/engine_impl/conflict_resolver.h

Index: components/sync/engine_impl/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/components/sync/engine_impl/conflict_resolver.h
similarity index 58%
rename from sync/engine/conflict_resolver.h
rename to components/sync/engine_impl/conflict_resolver.h
index b4df5991278f1ed8c5ca157accbbd5fd67d89a7d..be36b65ba0c9768a928eb3b64782a4cc68c1d4ca 100644
--- a/sync/engine/conflict_resolver.h
+++ b/components/sync/engine_impl/conflict_resolver.h
@@ -5,14 +5,14 @@
 // A class that watches the syncer and attempts to resolve any conflicts that
 // occur.
 
-#ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_
-#define SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "sync/engine/syncer_types.h"
+#include "components/sync/engine_impl/syncer_types.h"
 
 namespace syncer {
 
@@ -32,14 +32,14 @@ class ConflictResolver {
  public:
   // Enumeration of different conflict resolutions. Used for histogramming.
   enum SimpleConflictResolutions {
-    OVERWRITE_LOCAL,           // Resolved by overwriting local changes.
-    OVERWRITE_SERVER,          // Resolved by overwriting server changes.
-    UNDELETE,                  // Resolved by undeleting local item.
-    IGNORE_ENCRYPTION,         // Resolved by ignoring an encryption-only server
-                               // change.
-    NIGORI_MERGE,              // Resolved by merging nigori nodes.
-    CHANGES_MATCH,             // Resolved by ignoring both local and server
-                               // changes because they matched.
+    OVERWRITE_LOCAL,    // Resolved by overwriting local changes.
+    OVERWRITE_SERVER,   // Resolved by overwriting server changes.
+    UNDELETE,           // Resolved by undeleting local item.
+    IGNORE_ENCRYPTION,  // Resolved by ignoring an encryption-only server
+                        // change.
+    NIGORI_MERGE,       // Resolved by merging nigori nodes.
+    CHANGES_MATCH,      // Resolved by ignoring both local and server
+                        // changes because they matched.
     CONFLICT_RESOLUTION_SIZE,
   };
 
@@ -58,16 +58,15 @@ class ConflictResolver {
   FRIEND_TEST_ALL_PREFIXES(SyncerTest,
                            ConflictResolverMergeOverwritesLocalEntry);
 
-  void ProcessSimpleConflict(
-      syncable::WriteTransaction* trans,
-      const syncable::Id& id,
-      const Cryptographer* cryptographer,
-      sessions::StatusController* status,
-      UpdateCounters* counters);
+  void ProcessSimpleConflict(syncable::WriteTransaction* trans,
+                             const syncable::Id& id,
+                             const Cryptographer* cryptographer,
+                             sessions::StatusController* status,
+                             UpdateCounters* counters);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_