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

components/sync/engine_impl/conflict_util.cc

 // 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.
 
-#include "sync/engine/conflict_util.h"
+#include "components/sync/engine_impl/conflict_util.h"
 
-#include "sync/syncable/mutable_entry.h"
+#include "components/sync/syncable/mutable_entry.h"
 
 namespace syncer {
 
 using syncable::MutableEntry;
 
 namespace conflict_util {
 
 // Allow the server's changes to take precedence.
 // This will take effect during the next ApplyUpdates step.
 void IgnoreLocalChanges(MutableEntry* entry) {
@@ skipping 22 matching lines @@
   // required (and hence there will be many encryption conflicts).
   DCHECK(entry->GetIsUnsynced());
   DCHECK(entry->GetIsUnappliedUpdate());
   entry->PutBaseVersion(entry->GetServerVersion());
   entry->PutIsUnappliedUpdate(false);
   entry->PutIsUnsynced(false);
 }
 
 }  // namespace conflict_util
 }  // namespace syncer