Index: chrome/browser/sync/engine/syncapi.cc |
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc |
index e75a6b088a631369533e6b5eadd1d901199c73c3..ff446fe17a09fa204a13948b4b0985b04fcdb931 100644 |
--- a/chrome/browser/sync/engine/syncapi.cc |
+++ b/chrome/browser/sync/engine/syncapi.cc |
@@ -34,20 +34,20 @@ |
#include "base/values.h" |
#include "chrome/browser/sync/engine/all_status.h" |
#include "chrome/browser/sync/engine/change_reorder_buffer.h" |
+#include "chrome/browser/sync/engine/http_post_provider_factory.h" |
#include "chrome/browser/sync/engine/model_safe_worker.h" |
-#include "chrome/browser/sync/engine/nudge_source.h" |
#include "chrome/browser/sync/engine/net/server_connection_manager.h" |
#include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h" |
+#include "chrome/browser/sync/engine/nudge_source.h" |
#include "chrome/browser/sync/engine/sync_scheduler.h" |
#include "chrome/browser/sync/engine/syncer.h" |
-#include "chrome/browser/sync/engine/http_post_provider_factory.h" |
-#include "chrome/browser/sync/js_arg_list.h" |
-#include "chrome/browser/sync/js_backend.h" |
-#include "chrome/browser/sync/js_event_details.h" |
-#include "chrome/browser/sync/js_event_handler.h" |
-#include "chrome/browser/sync/js_reply_handler.h" |
-#include "chrome/browser/sync/js_sync_manager_observer.h" |
-#include "chrome/browser/sync/js_transaction_observer.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_reply_handler.h" |
+#include "chrome/browser/sync/js/js_sync_manager_observer.h" |
+#include "chrome/browser/sync/js/js_transaction_observer.h" |
#include "chrome/browser/sync/notifier/sync_notifier.h" |
#include "chrome/browser/sync/notifier/sync_notifier_observer.h" |
#include "chrome/browser/sync/protocol/app_specifics.pb.h" |
@@ -66,8 +66,8 @@ |
#include "chrome/browser/sync/sessions/sync_session_context.h" |
#include "chrome/browser/sync/syncable/directory_change_delegate.h" |
#include "chrome/browser/sync/syncable/directory_manager.h" |
-#include "chrome/browser/sync/syncable/model_type_payload_map.h" |
#include "chrome/browser/sync/syncable/model_type.h" |
+#include "chrome/browser/sync/syncable/model_type_payload_map.h" |
#include "chrome/browser/sync/syncable/nigori_util.h" |
#include "chrome/browser/sync/syncable/syncable.h" |
#include "chrome/browser/sync/weak_handle.h" |