Index: chrome/browser/sync/internal_api/sync_manager.cc |
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc |
index 466025e4aa81f3fafd28968bc1af489f8f5532bf..d2265f0ed3689ed9f99b481e3c59efc1ce9aaa3c 100644 |
--- a/chrome/browser/sync/internal_api/sync_manager.cc |
+++ b/chrome/browser/sync/internal_api/sync_manager.cc |
@@ -16,13 +16,8 @@ |
#include "base/observer_list.h" |
#include "base/string_number_conversions.h" |
#include "base/values.h" |
-#include "chrome/browser/sync/engine/all_status.h" |
-#include "chrome/browser/sync/engine/net/server_connection_manager.h" |
-#include "chrome/browser/sync/engine/nigori_util.h" |
-#include "chrome/browser/sync/engine/polling_constants.h" |
-#include "chrome/browser/sync/engine/sync_scheduler.h" |
-#include "chrome/browser/sync/engine/syncapi_internal.h" |
-#include "chrome/browser/sync/engine/syncer_types.h" |
+#include "chrome/browser/sync/internal_api/all_status.h" |
+#include "chrome/browser/sync/internal_api/syncapi_internal.h" |
#include "chrome/browser/sync/internal_api/base_node.h" |
#include "chrome/browser/sync/internal_api/change_reorder_buffer.h" |
#include "chrome/browser/sync/internal_api/configure_reason.h" |
@@ -33,26 +28,31 @@ |
#include "chrome/browser/sync/internal_api/user_share.h" |
#include "chrome/browser/sync/internal_api/write_node.h" |
#include "chrome/browser/sync/internal_api/write_transaction.h" |
-#include "chrome/browser/sync/js/js_arg_list.h" |
-#include "chrome/browser/sync/js/js_backend.h" |
-#include "chrome/browser/sync/js/js_event_details.h" |
-#include "chrome/browser/sync/js/js_event_handler.h" |
-#include "chrome/browser/sync/js/js_mutation_event_observer.h" |
-#include "chrome/browser/sync/js/js_reply_handler.h" |
-#include "chrome/browser/sync/js/js_sync_manager_observer.h" |
+#include "chrome/browser/sync/internal_api/js_mutation_event_observer.h" |
+#include "chrome/browser/sync/internal_api/js_sync_manager_observer.h" |
#include "chrome/browser/sync/notifier/sync_notifier.h" |
#include "chrome/browser/sync/notifier/sync_notifier_observer.h" |
-#include "chrome/browser/sync/protocol/proto_value_conversions.h" |
-#include "chrome/browser/sync/syncable/directory_change_delegate.h" |
-#include "chrome/browser/sync/syncable/model_type.h" |
-#include "chrome/browser/sync/syncable/model_type_payload_map.h" |
-#include "chrome/browser/sync/syncable/syncable.h" |
-#include "chrome/browser/sync/util/cryptographer.h" |
-#include "chrome/browser/sync/util/get_session_name.h" |
-#include "chrome/browser/sync/util/time.h" |
#include "net/base/network_change_notifier.h" |
+#include "sync/engine/net/server_connection_manager.h" |
+#include "sync/engine/nigori_util.h" |
+#include "sync/engine/polling_constants.h" |
+#include "sync/engine/sync_scheduler.h" |
+#include "sync/engine/syncer_types.h" |
+#include "sync/js/js_arg_list.h" |
+#include "sync/js/js_backend.h" |
+#include "sync/js/js_event_details.h" |
+#include "sync/js/js_event_handler.h" |
+#include "sync/js/js_reply_handler.h" |
#include "sync/protocol/encryption.pb.h" |
+#include "sync/protocol/proto_value_conversions.h" |
#include "sync/protocol/sync.pb.h" |
+#include "sync/syncable/directory_change_delegate.h" |
+#include "sync/syncable/model_type.h" |
+#include "sync/syncable/model_type_payload_map.h" |
+#include "sync/syncable/syncable.h" |
+#include "sync/util/cryptographer.h" |
+#include "sync/util/get_session_name.h" |
+#include "sync/util/time.h" |
using base::TimeDelta; |
using browser_sync::AllStatus; |