sync: Move all the js_* files into a js/ subdirectory.

Note: This was a TODO for akalin.

BUG=None
TEST=None

R=akalin@chromium.org

Review URL: http://codereview.chromium.org/7497051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96169 0039d316-1c4b-4281-b951-d872f2087c98

33 files changed, 110 insertions, 112 deletions

diff --git a/chrome/browser/sync/README.js b/chrome/browser/sync/README.js
index 492c5c3..0fbfa66 100644
--- a/chrome/browser/sync/README.js
+++ b/chrome/browser/sync/README.js
@@ -16,8 +16,6 @@ An event has a name and a details object, which is represented by a
 JsEventDetails (js_event_details.h) object, which is basically a
 wrapper around an immutable DictionaryValue.
 
-TODO(akalin): Move all the js_* files into a js/ subdirectory.
-
 Message/event flow
 ------------------
 
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index e75a6b0..ff446fe 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"
diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc
index 2f05bab..0b1288f 100644
--- a/chrome/browser/sync/engine/syncapi_unittest.cc
+++ b/chrome/browser/sync/engine/syncapi_unittest.cc
@@ -25,11 +25,11 @@
 #include "chrome/browser/sync/engine/http_post_provider_interface.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_backend.h"
-#include "chrome/browser/sync/js_event_handler.h"
-#include "chrome/browser/sync/js_reply_handler.h"
-#include "chrome/browser/sync/js_test_util.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_handler.h"
+#include "chrome/browser/sync/js/js_reply_handler.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 #include "chrome/browser/sync/notifier/sync_notifier.h"
 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 732d1af..86f4478 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -26,9 +26,9 @@
 #include "chrome/browser/sync/glue/http_bridge.h"
 #include "chrome/browser/sync/glue/password_model_worker.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_event_handler.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
 #include "chrome/browser/sync/notifier/sync_notifier.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 // TODO(tim): Remove this! We should have a syncapi pass-thru instead.
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 55d25cf..1f7d8c1 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -19,12 +19,12 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
-#include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/engine/configure_reason.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
-#include "chrome/browser/sync/js_backend.h"
+#include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
+#include "chrome/browser/sync/js/js_backend.h"
 #include "chrome/browser/sync/notifier/sync_notifier_factory.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/weak_handle.h"
diff --git a/chrome/browser/sync/js_arg_list.cc b/chrome/browser/sync/js/js_arg_list.cc
index 73daea0..baded00 100644
--- a/chrome/browser/sync/js_arg_list.cc
+++ b/chrome/browser/sync/js/js_arg_list.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/js_arg_list.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
 
 #include "base/json/json_writer.h"
 
diff --git a/chrome/browser/sync/js_arg_list.h b/chrome/browser/sync/js/js_arg_list.h
index 3dafa71..2e5965b 100644
--- a/chrome/browser/sync/js_arg_list.h
+++ b/chrome/browser/sync/js/js_arg_list.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_ARG_LIST_H_
-#define CHROME_BROWSER_SYNC_JS_ARG_LIST_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_ARG_LIST_H_
+#define CHROME_BROWSER_SYNC_JS_JS_ARG_LIST_H_
 #pragma once
 
 // See README.js for design comments.
@@ -40,4 +40,4 @@ class JsArgList {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_ARG_LIST_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_ARG_LIST_H_
diff --git a/chrome/browser/sync/js_arg_list_unittest.cc b/chrome/browser/sync/js/js_arg_list_unittest.cc
index ed5c952..65469f0 100644
--- a/chrome/browser/sync/js_arg_list_unittest.cc
+++ b/chrome/browser/sync/js/js_arg_list_unittest.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/js_arg_list.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/js_backend.h b/chrome/browser/sync/js/js_backend.h
index bd5db52..a141972 100644
--- a/chrome/browser/sync/js_backend.h
+++ b/chrome/browser/sync/js/js_backend.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_BACKEND_H_
-#define CHROME_BROWSER_SYNC_JS_BACKEND_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_BACKEND_H_
+#define CHROME_BROWSER_SYNC_JS_JS_BACKEND_H_
 #pragma once
 
 // See README.js for design comments.
@@ -38,4 +38,4 @@ class JsBackend {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_BACKEND_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_BACKEND_H_
diff --git a/chrome/browser/sync/js_controller.h b/chrome/browser/sync/js/js_controller.h
index 65a43da..edacdd8 100644
--- a/chrome/browser/sync/js_controller.h
+++ b/chrome/browser/sync/js/js_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_CONTROLLER_H_
-#define CHROME_BROWSER_SYNC_JS_CONTROLLER_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_CONTROLLER_H_
+#define CHROME_BROWSER_SYNC_JS_JS_CONTROLLER_H_
 #pragma once
 
 // See README.js for design comments.
@@ -47,4 +47,4 @@ class JsController {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_CONTROLLER_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_CONTROLLER_H_
diff --git a/chrome/browser/sync/js_event_details.cc b/chrome/browser/sync/js/js_event_details.cc
index 371716d..7fd880e 100644
--- a/chrome/browser/sync/js_event_details.cc
+++ b/chrome/browser/sync/js/js_event_details.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/js_event_details.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 
 #include "base/json/json_writer.h"
 
diff --git a/chrome/browser/sync/js_event_details.h b/chrome/browser/sync/js/js_event_details.h
index 56129ca..066eda1 100644
--- a/chrome/browser/sync/js_event_details.h
+++ b/chrome/browser/sync/js/js_event_details.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_EVENT_DETAILS_H_
-#define CHROME_BROWSER_SYNC_JS_EVENT_DETAILS_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_EVENT_DETAILS_H_
+#define CHROME_BROWSER_SYNC_JS_JS_EVENT_DETAILS_H_
 #pragma once
 
 // See README.js for design comments.
@@ -40,4 +40,4 @@ class JsEventDetails {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_EVENT_DETAILS_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_EVENT_DETAILS_H_
diff --git a/chrome/browser/sync/js_event_details_unittest.cc b/chrome/browser/sync/js/js_event_details_unittest.cc
index 60ac2e4..111eb21 100644
--- a/chrome/browser/sync/js_event_details_unittest.cc
+++ b/chrome/browser/sync/js/js_event_details_unittest.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/js_event_details.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/js_event_handler.h b/chrome/browser/sync/js/js_event_handler.h
index 5c3f504..bf8ca32 100644
--- a/chrome/browser/sync/js_event_handler.h
+++ b/chrome/browser/sync/js/js_event_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_EVENT_HANDLER_H_
-#define CHROME_BROWSER_SYNC_JS_EVENT_HANDLER_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_EVENT_HANDLER_H_
+#define CHROME_BROWSER_SYNC_JS_JS_EVENT_HANDLER_H_
 #pragma once
 
 // See README.js for design comments.
@@ -27,4 +27,4 @@ class JsEventHandler {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_EVENT_HANDLER_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_EVENT_HANDLER_H_
diff --git a/chrome/browser/sync/js_reply_handler.h b/chrome/browser/sync/js/js_reply_handler.h
index 5d50fc8..4118cd9 100644
--- a/chrome/browser/sync/js_reply_handler.h
+++ b/chrome/browser/sync/js/js_reply_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_REPLY_HANDLER_H_
-#define CHROME_BROWSER_SYNC_JS_REPLY_HANDLER_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_REPLY_HANDLER_H_
+#define CHROME_BROWSER_SYNC_JS_JS_REPLY_HANDLER_H_
 #pragma once
 
 // See README.js for design comments.
@@ -27,4 +27,4 @@ class JsReplyHandler {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_REPLY_HANDLER_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_REPLY_HANDLER_H_
diff --git a/chrome/browser/sync/js_sync_manager_observer.cc b/chrome/browser/sync/js/js_sync_manager_observer.cc
index 4c2ff6a..e966ad3 100644
--- a/chrome/browser/sync/js_sync_manager_observer.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/js_sync_manager_observer.h"
+#include "chrome/browser/sync/js/js_sync_manager_observer.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "base/tracked.h"
 #include "base/values.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_event_handler.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
diff --git a/chrome/browser/sync/js_sync_manager_observer.h b/chrome/browser/sync/js/js_sync_manager_observer.h
index 29422e8..cc7c8c0 100644
--- a/chrome/browser/sync/js_sync_manager_observer.h
+++ b/chrome/browser/sync/js/js_sync_manager_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_SYNC_MANAGER_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_JS_SYNC_MANAGER_OBSERVER_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_SYNC_MANAGER_OBSERVER_H_
+#define CHROME_BROWSER_SYNC_JS_JS_SYNC_MANAGER_OBSERVER_H_
 #pragma once
 
 #include <string>
@@ -62,4 +62,4 @@ class JsSyncManagerObserver : public sync_api::SyncManager::Observer {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_SYNC_MANAGER_OBSERVER_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_SYNC_MANAGER_OBSERVER_H_
diff --git a/chrome/browser/sync/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
index 2057dc7..2949104 100644
--- a/chrome/browser/sync/js_sync_manager_observer_unittest.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.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/js_sync_manager_observer.h"
+#include "chrome/browser/sync/js/js_sync_manager_observer.h"
 
 #include <cstddef>
 
@@ -11,9 +11,9 @@
 #include "base/tracked.h"
 #include "base/values.h"
 #include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_test_util.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/weak_handle.h"
diff --git a/chrome/browser/sync/js_test_util.cc b/chrome/browser/sync/js/js_test_util.cc
index eea7576..94a02f5 100644
--- a/chrome/browser/sync/js_test_util.cc
+++ b/chrome/browser/sync/js/js_test_util.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/js_test_util.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/js_test_util.h b/chrome/browser/sync/js/js_test_util.h
index 6ac1a99..eae0704 100644
--- a/chrome/browser/sync/js_test_util.h
+++ b/chrome/browser/sync/js/js_test_util.h
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_TEST_UTIL_H_
-#define CHROME_BROWSER_SYNC_JS_TEST_UTIL_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_TEST_UTIL_H_
+#define CHROME_BROWSER_SYNC_JS_JS_TEST_UTIL_H_
 #pragma once
 
 #include <ostream>
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/sync/js_backend.h"
-#include "chrome/browser/sync/js_controller.h"
-#include "chrome/browser/sync/js_event_handler.h"
-#include "chrome/browser/sync/js_reply_handler.h"
+#include "chrome/browser/sync/js/js_backend.h"
+#include "chrome/browser/sync/js/js_controller.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
+#include "chrome/browser/sync/js/js_reply_handler.h"
 #include "chrome/browser/sync/weak_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -106,4 +106,4 @@ class MockJsReplyHandler
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_TEST_UTIL_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_TEST_UTIL_H_
diff --git a/chrome/browser/sync/js_transaction_observer.cc b/chrome/browser/sync/js/js_transaction_observer.cc
index e0700fc..1de2925 100644
--- a/chrome/browser/sync/js_transaction_observer.cc
+++ b/chrome/browser/sync/js/js_transaction_observer.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/js_transaction_observer.h"
+#include "chrome/browser/sync/js/js_transaction_observer.h"
 
 #include <sstream>
 #include <string>
@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/tracked.h"
 #include "base/values.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_event_handler.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/js_transaction_observer.h b/chrome/browser/sync/js/js_transaction_observer.h
index bf59a6d..aa618ce 100644
--- a/chrome/browser/sync/js_transaction_observer.h
+++ b/chrome/browser/sync/js/js_transaction_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_JS_TRANSACTION_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_JS_TRANSACTION_OBSERVER_H_
+#ifndef CHROME_BROWSER_SYNC_JS_JS_TRANSACTION_OBSERVER_H_
+#define CHROME_BROWSER_SYNC_JS_JS_TRANSACTION_OBSERVER_H_
 #pragma once
 
 #include <string>
@@ -58,4 +58,4 @@ class JsTransactionObserver : public syncable::TransactionObserver {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_JS_TRANSACTION_OBSERVER_H_
+#endif  // CHROME_BROWSER_SYNC_JS_JS_TRANSACTION_OBSERVER_H_
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index c77c510..0578300 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -32,8 +32,8 @@
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 971f96d..49587ad 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_test_util.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 #include "chrome/browser/sync/profile_sync_factory_mock.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
diff --git a/chrome/browser/sync/sync_js_controller.cc b/chrome/browser/sync/sync_js_controller.cc
index 166611c..da2c67b7 100644
--- a/chrome/browser/sync/sync_js_controller.cc
+++ b/chrome/browser/sync/sync_js_controller.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/sync/sync_js_controller.h"
 
-#include "chrome/browser/sync/js_backend.h"
-#include "chrome/browser/sync/js_event_details.h"
+#include "chrome/browser/sync/js/js_backend.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/sync_js_controller.h b/chrome/browser/sync/sync_js_controller.h
index 0b31f11..5221543 100644
--- a/chrome/browser/sync/sync_js_controller.h
+++ b/chrome/browser/sync/sync_js_controller.h
@@ -13,9 +13,9 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_controller.h"
-#include "chrome/browser/sync/js_event_handler.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_controller.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
 #include "chrome/browser/sync/weak_handle.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/sync_js_controller_unittest.cc b/chrome/browser/sync/sync_js_controller_unittest.cc
index 1dd5ca2..96bc6b3d 100644
--- a/chrome/browser/sync/sync_js_controller_unittest.cc
+++ b/chrome/browser/sync/sync_js_controller_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "base/message_loop.h"
 #include "base/values.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_test_util.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index cf4af6f..8173f01 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -8,10 +8,10 @@
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/js_reply_handler.h"
+#include "chrome/browser/sync/js/js_reply_handler.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
-#include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/sync/sessions/session_state.h"
+#include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc
index 25adb33..d9029e9 100644
--- a/chrome/browser/ui/webui/sync_internals_ui.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui.cc
@@ -12,9 +12,9 @@
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_controller.h"
-#include "chrome/browser/sync/js_event_details.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_controller.h"
+#include "chrome/browser/sync/js/js_event_details.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/weak_handle.h"
diff --git a/chrome/browser/ui/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h
index e114592..374e6c6 100644
--- a/chrome/browser/ui/webui/sync_internals_ui.h
+++ b/chrome/browser/ui/webui/sync_internals_ui.h
@@ -8,11 +8,11 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/sync/js_event_handler.h"
-#include "chrome/browser/sync/js_reply_handler.h"
+#include "chrome/browser/sync/js/js_event_handler.h"
+#include "chrome/browser/sync/js/js_reply_handler.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
 
 class ProfileSyncService;
diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
index 1728f33..eefe4fb 100644
--- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
@@ -10,9 +10,9 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/js_arg_list.h"
-#include "chrome/browser/sync/js_event_details.h"
-#include "chrome/browser/sync/js_test_util.h"
+#include "chrome/browser/sync/js/js_arg_list.h"
+#include "chrome/browser/sync/js/js_event_details.h"
+#include "chrome/browser/sync/js/js_test_util.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/test/base/profile_mock.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 684feba..6f244f6 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -641,18 +641,18 @@
         'browser/sync/engine/update_applicator.h',
         'browser/sync/engine/verify_updates_command.cc',
         'browser/sync/engine/verify_updates_command.h',
-        'browser/sync/js_arg_list.cc',
-        'browser/sync/js_arg_list.h',
-        'browser/sync/js_backend.h',
-        'browser/sync/js_controller.h',
-        'browser/sync/js_event_details.cc',
-        'browser/sync/js_event_details.h',
-        'browser/sync/js_event_handler.h',
-        'browser/sync/js_reply_handler.h',
-        'browser/sync/js_sync_manager_observer.cc',
-        'browser/sync/js_sync_manager_observer.h',
-        'browser/sync/js_transaction_observer.cc',
-        'browser/sync/js_transaction_observer.h',
+        'browser/sync/js/js_arg_list.cc',
+        'browser/sync/js/js_arg_list.h',
+        'browser/sync/js/js_backend.h',
+        'browser/sync/js/js_controller.h',
+        'browser/sync/js/js_event_details.cc',
+        'browser/sync/js/js_event_details.h',
+        'browser/sync/js/js_event_handler.h',
+        'browser/sync/js/js_reply_handler.h',
+        'browser/sync/js/js_sync_manager_observer.cc',
+        'browser/sync/js/js_sync_manager_observer.h',
+        'browser/sync/js/js_transaction_observer.cc',
+        'browser/sync/js/js_transaction_observer.h',
         'browser/sync/protocol/proto_enum_conversions.cc',
         'browser/sync/protocol/proto_enum_conversions.h',
         'browser/sync/protocol/proto_value_conversions.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f3c2c68..8673879 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -315,8 +315,8 @@
         '..',
       ],
       'sources': [
-        'browser/sync/js_test_util.cc',
-        'browser/sync/js_test_util.h',
+        'browser/sync/js/js_test_util.cc',
+        'browser/sync/js/js_test_util.h',
         'test/sync/null_directory_change_delegate.cc',
         'test/sync/null_directory_change_delegate.h',
         'test/sync/engine/test_directory_setter_upper.cc',
@@ -3113,9 +3113,9 @@
         'browser/sync/engine/syncproto_unittest.cc',
         'browser/sync/engine/syncapi_mock.h',
         'browser/sync/engine/verify_updates_command_unittest.cc',
-        'browser/sync/js_arg_list_unittest.cc',
-        'browser/sync/js_event_details_unittest.cc',
-        'browser/sync/js_sync_manager_observer_unittest.cc',
+        'browser/sync/js/js_arg_list_unittest.cc',
+        'browser/sync/js/js_event_details_unittest.cc',
+        'browser/sync/js/js_sync_manager_observer_unittest.cc',
         'browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc',
         'browser/sync/notifier/chrome_invalidation_client_unittest.cc',
         'browser/sync/notifier/chrome_system_resources_unittest.cc',