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

components/sync/engine_impl/conflict_util.h

 // Copyright (c) 2012 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.
 //
 // 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 {
 
 namespace syncable {
 class MutableEntry;
 }
 
 namespace conflict_util {
 
 // Marks the item as no longer requiring sync, allowing the server's version
 // to 'win' during the next update application step.
 void IgnoreLocalChanges(syncable::MutableEntry* entry);
 
 // Marks the item as no longer requiring update from server data.  This will
 // cause the item to be committed to the server, overwriting the server's
 // version.
 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_