Index: sync/engine/conflict_resolver.cc |
diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc |
similarity index 98% |
rename from chrome/browser/sync/engine/conflict_resolver.cc |
rename to sync/engine/conflict_resolver.cc |
index b91e8d17740d004b11151bbed6545d6c9a014b6d..548613f5cfbc635297a90ef688c3718b9b280321 100644 |
--- a/chrome/browser/sync/engine/conflict_resolver.cc |
+++ b/sync/engine/conflict_resolver.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/sync/engine/conflict_resolver.h" |
+#include "sync/engine/conflict_resolver.h" |
#include <algorithm> |
#include <list> |
@@ -11,13 +11,13 @@ |
#include "base/location.h" |
#include "base/metrics/histogram.h" |
-#include "chrome/browser/sync/engine/syncer.h" |
-#include "chrome/browser/sync/engine/syncer_util.h" |
-#include "chrome/browser/sync/protocol/service_constants.h" |
-#include "chrome/browser/sync/sessions/status_controller.h" |
-#include "chrome/browser/sync/syncable/syncable.h" |
-#include "chrome/browser/sync/util/cryptographer.h" |
+#include "sync/engine/syncer.h" |
+#include "sync/engine/syncer_util.h" |
#include "sync/protocol/nigori_specifics.pb.h" |
+#include "sync/protocol/service_constants.h" |
+#include "sync/sessions/status_controller.h" |
+#include "sync/syncable/syncable.h" |
+#include "sync/util/cryptographer.h" |
using std::list; |
using std::map; |