[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/engine_impl/conflict_util.h

Index: components/sync/engine_impl/conflict_util.h
diff --git a/sync/engine/conflict_util.h b/components/sync/engine_impl/conflict_util.h
similarity index 81%
copy from sync/engine/conflict_util.h
copy to components/sync/engine_impl/conflict_util.h
index 0f3a58be45540b4c8debf3e7b52bc1a847530dd7..50cb16192dcd75400ff569defa1db08077800271 100644
--- a/sync/engine/conflict_util.h
+++ b/components/sync/engine_impl/conflict_util.h
@@ -4,8 +4,8 @@
 //
 // Utility functions that act on syncable::MutableEntry to resolve conflicts.
 
-#ifndef SYNC_ENGINE_CONFLICT_UTIL_H_
-#define SYNC_ENGINE_CONFLICT_UTIL_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_
 
 namespace syncer {
 
@@ -26,9 +26,9 @@ void OverwriteServerChanges(syncable::MutableEntry* entry);
 
 // The local and server versions are identical, so unset the bits that put them
 // into a conflicting state.
-void IgnoreConflict(syncable::MutableEntry *trans);
+void IgnoreConflict(syncable::MutableEntry* trans);
 
 }  // namespace conflict_util
 }  // namespace syncer
 
-#endif  // SYNC_ENGINE_CONFLICT_UTIL_H_
+#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_