[Sync] Move 'sync' target to sync/

sync/engine/conflict_resolver.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.
 //
 // A class that watches the syncer and attempts to resolve any conflicts that
 // occur.
 
-#ifndef CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
-#define CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#define SYNC_ENGINE_CONFLICT_RESOLVER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/sync/engine/syncer_types.h"
+#include "sync/engine/syncer_types.h"
 
 namespace syncable {
 class BaseTransaction;
 class Id;
 class MutableEntry;
 class WriteTransaction;
 }  // namespace syncable
 
 namespace browser_sync {
 
@@ skipping 50 matching lines @@
   bool ResolveSimpleConflicts(syncable::WriteTransaction* trans,
                               const Cryptographer* cryptographer,
                               const sessions::ConflictProgress& progress,
                               sessions::StatusController* status);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#endif  // SYNC_ENGINE_CONFLICT_RESOLVER_H_