91 files changed, 418 insertions, 414 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 62be61d..14eb9cf 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -167,7 +167,6 @@
         '../chrome/chrome.gyp:interactive_ui_tests',
         '../chrome/chrome.gyp:safe_browsing_tests',
         '../chrome/chrome.gyp:sync_integration_tests',
-        '../chrome/chrome.gyp:sync_unit_tests',
         '../chrome/chrome.gyp:ui_tests',
         '../chrome/chrome.gyp:unit_tests',
         '../content/content.gyp:content_browsertests',
@@ -183,6 +182,7 @@
         '../printing/printing.gyp:printing_unittests',
         '../remoting/remoting.gyp:remoting_unittests',
         '../sql/sql.gyp:sql_unittests',
+        '../sync/sync.gyp:sync_unit_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
         'temp_gyp/googleurl.gyp:googleurl_unittests',
@@ -301,7 +301,6 @@
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
-            '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../content/content.gyp:content_browsertests',
@@ -315,6 +314,7 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../rlz/rlz.gyp:*',
             '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
@@ -330,7 +330,6 @@
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
-            '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../content/content.gyp:content_browsertests',
@@ -343,6 +342,7 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
@@ -377,13 +377,13 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../chrome/chrome.gyp:safe_browsing_tests',
-            '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../content/content.gyp:content_unittests',
             '../ui/ui.gyp:gfx_unittests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
@@ -408,7 +408,6 @@
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:safe_browsing_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
-            '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../content/content.gyp:content_browsertests',
@@ -431,6 +430,7 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
@@ -585,10 +585,10 @@
               # Tests that currently only work on Linux.
               'dependencies': [
                 '../base/base.gyp:base_unittests',
-                '../chrome/chrome.gyp:sync_unit_tests',
                 '../content/content.gyp:content_unittests',
                 '../ipc/ipc.gyp:ipc_tests',
                 '../sql/sql.gyp:sql_unittests',
+                '../sync/sync.gyp:sync_unit_tests',
                 '../ui/ui.gyp:gfx_unittests',
               ],
             }],
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS
index 847cc5b..f3fa22a 100644
--- a/chrome/browser/sync/DEPS
+++ b/chrome/browser/sync/DEPS
@@ -1,9 +1,10 @@
 include_rules = [
   # For files not in a subdirectory (what a mess!).
-  "+sync/js",
   "+sync/engine/model_changing_syncer_command.h",
   "+sync/engine/model_safe_worker.h",
   "+sync/engine/polling_constants.h",
+  "+sync/internal_api",
+  "+sync/js",
   "+sync/notifier/invalidation_version_tracker.h",
   "+sync/sessions/session_state.h",
   "+sync/syncable/model_type.h",
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc
index 992e07f..1b83424 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.cc
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/test_id_factory.h"
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h
index 066e88a..4f96945 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.h
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.h
@@ -13,9 +13,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/signin/token_service.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "content/test/test_browser_thread.h"
+#include "sync/internal_api/change_record.h"
 #include "sync/syncable/model_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/sync/api/DEPS b/chrome/browser/sync/api/DEPS
index c7a8609..4a424713 100644
--- a/chrome/browser/sync/api/DEPS
+++ b/chrome/browser/sync/api/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "-chrome",
 
   "+chrome/browser/sync/api",
-  "+chrome/browser/sync/internal_api/base_node.h",
+  "+sync/internal_api/base_node.h",
   "+sync/protocol",
   "+sync/syncable/model_type.h",
   "+sync/util/immutable.h",
diff --git a/chrome/browser/sync/api/sync_data.cc b/chrome/browser/sync/api/sync_data.cc
index 02ca7008..e3e3dcd 100644
--- a/chrome/browser/sync/api/sync_data.cc
+++ b/chrome/browser/sync/api/sync_data.cc
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/base_node.h"
+#include "sync/internal_api/base_node.h"
 #include "sync/protocol/proto_value_conversions.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/model_type.h"
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc
index f17ee99..26e0b2a 100644
--- a/chrome/browser/sync/backend_migrator.cc
+++ b/chrome/browser/sync/backend_migrator.cc
@@ -7,12 +7,12 @@
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/tracked_objects.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/read_transaction.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/session_state.h"
 
diff --git a/chrome/browser/sync/backend_migrator_unittest.cc b/chrome/browser/sync/backend_migrator_unittest.cc
index 3dd8cbf..a9cfd34 100644
--- a/chrome/browser/sync/backend_migrator_unittest.cc
+++ b/chrome/browser/sync/backend_migrator_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/message_loop.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/sync/glue/data_type_manager_mock.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "chrome/browser/sync/test/engine/test_user_share.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "sync/internal_api/test_user_share.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/session_state.h"
 #include "sync/syncable/model_type_test_util.h"
diff --git a/chrome/browser/sync/glue/DEPS b/chrome/browser/sync/glue/DEPS
index 0ad6258..260f38a 100644
--- a/chrome/browser/sync/glue/DEPS
+++ b/chrome/browser/sync/glue/DEPS
@@ -3,10 +3,9 @@ include_rules = [
   "-sync/sessions",
   "-sync/syncable",
 
+  "+sync/internal_api",
   "+sync/util",
 
-  "+chrome/browser/sync/internal_api",
-
   "+jingle/notifier/base",
 
   # Should these live in their own "includes" (e.g) directory(ies)?
@@ -23,7 +22,6 @@ include_rules = [
 
   # Mocks/tests.
   "+sync/engine/syncapi_mock.h",
-  "+chrome/browser/sync/notifier/mock_sync_notifier_observer.h",
   "+sync/syncable/model_type_test_util.h",
   "+sync/syncable/syncable_mock.h",
 
diff --git a/chrome/browser/sync/glue/backend_data_type_configurer.h b/chrome/browser/sync/glue/backend_data_type_configurer.h
index 2b77a3b..88dc4d7 100644
--- a/chrome/browser/sync/glue/backend_data_type_configurer.h
+++ b/chrome/browser/sync/glue/backend_data_type_configurer.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/callback.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
+#include "sync/internal_api/configure_reason.h"
 #include "sync/syncable/model_type.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index ebf6c8d..8bf4d83 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -15,12 +15,12 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/syncable/syncable.h"  // TODO(tim): Investigating bug 121587.
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 795eb58..a626265 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "content/public/browser/browser_thread.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h
index 22e1cd1..8dd4349 100644
--- a/chrome/browser/sync/glue/change_processor.h
+++ b/chrome/browser/sync/glue/change_processor.h
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
+#include "sync/internal_api/change_record.h"
 
 class Profile;
 
diff --git a/chrome/browser/sync/glue/data_type_manager.h b/chrome/browser/sync/glue/data_type_manager.h
index f491900..5034b7e 100644
--- a/chrome/browser/sync/glue/data_type_manager.h
+++ b/chrome/browser/sync/glue/data_type_manager.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
+#include "sync/internal_api/configure_reason.h"
 #include "sync/syncable/model_type.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
index 6459664..1c22526 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
@@ -8,13 +8,13 @@
 #include "base/message_loop.h"
 #include "chrome/browser/sync/glue/backend_data_type_configurer.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/test/notification_observer_mock.h"
 #include "content/test/test_browser_thread.h"
+#include "sync/internal_api/configure_reason.h"
 #include "sync/syncable/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index 017b1ed..89837ce 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -10,13 +10,13 @@
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/api/syncable_service.h"
-#include "chrome/browser/sync/internal_api/base_node.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "content/public/browser/browser_thread.h"
+#include "sync/internal_api/base_node.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/util/unrecoverable_error_handler.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 0eddab6..3e7e98e 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -14,12 +14,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
-#include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_interface.h"
 
 class MessageLoop;
 class HttpBridgeTest;
diff --git a/chrome/browser/sync/glue/password_change_processor.cc b/chrome/browser/sync/glue/password_change_processor.cc
index b453105..ad3572c 100644
--- a/chrome/browser/sync/glue/password_change_processor.cc
+++ b/chrome/browser/sync/glue/password_change_processor.cc
@@ -13,15 +13,15 @@
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/password_model_associator.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "webkit/forms/password_form.h"
 
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index 74c79be..75820eb 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -11,12 +11,12 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/sync/api/sync_error.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "net/base/escape.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "webkit/forms/password_form.h"
 
diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc
index b4dd8bf..cf146c8 100644
--- a/chrome/browser/sync/glue/session_change_processor.cc
+++ b/chrome/browser/sync/glue/session_change_processor.cc
@@ -13,8 +13,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -25,6 +23,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/model_type_payload_map.h"
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index bf5db1b..ed3b664 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -21,10 +21,6 @@
 #include "chrome/browser/sync/glue/synced_session.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ -33,10 +29,14 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/session_specifics.pb.h"
-#include "sync/syncable/syncable.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/model_type_payload_map.h"
+#include "sync/syncable/syncable.h"
 #include "sync/util/get_session_name.h"
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 97aaa31..0d59793 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -27,8 +27,6 @@
 #include "chrome/browser/sync/glue/chrome_encryptor.h"
 #include "chrome/browser/sync/glue/http_bridge.h"
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
 #include "chrome/browser/sync/sync_prefs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ -42,6 +40,8 @@
 #include "net/base/host_port_pair.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/engine/model_safe_worker.h"
+#include "sync/internal_api/base_transaction.h"
+#include "sync/internal_api/read_transaction.h"
 #include "sync/notifier/sync_notifier.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync.pb.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index d809230..3073d6d 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -18,11 +18,11 @@
 #include "chrome/browser/sync/glue/backend_data_type_configurer.h"
 #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h"
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
 #include "sync/engine/model_safe_worker.h"
+#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/notifier/sync_notifier_factory.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync_protocol_error.h"
diff --git a/chrome/browser/sync/glue/sync_backend_registrar.h b/chrome/browser/sync/glue/sync_backend_registrar.h
index 9e636af..20b4308 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar.h
+++ b/chrome/browser/sync/glue/sync_backend_registrar.h
@@ -13,8 +13,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "sync/engine/model_safe_worker.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/syncable/model_type.h"
 
 class MessageLoop;
diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
index e5ec7d4..4f84e81 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "chrome/browser/sync/glue/change_processor_mock.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
-#include "chrome/browser/sync/test/engine/test_user_share.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
+#include "sync/internal_api/test_user_share.h"
 #include "sync/syncable/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc
index af77b5b..fb58a97 100644
--- a/chrome/browser/sync/glue/theme_change_processor.cc
+++ b/chrome/browser/sync/glue/theme_change_processor.cc
@@ -9,16 +9,16 @@
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/theme_util.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "sync/util/unrecoverable_error_handler.h"
 
diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc
index f48a829..99e0970 100644
--- a/chrome/browser/sync/glue/theme_model_associator.cc
+++ b/chrome/browser/sync/glue/theme_model_associator.cc
@@ -11,11 +11,11 @@
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/theme_util.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/theme_specifics.pb.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc
index 05cd86c..69933e0 100644
--- a/chrome/browser/sync/glue/typed_url_change_processor.cc
+++ b/chrome/browser/sync/glue/typed_url_change_processor.cc
@@ -11,13 +11,13 @@
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc
index 80031c3..1dd8279 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -12,11 +12,11 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/sync/api/sync_error.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/sync/internal_api/DEPS b/chrome/browser/sync/internal_api/DEPS
deleted file mode 100644
index 5f69c7a..0000000
--- a/chrome/browser/sync/internal_api/DEPS
+++ /dev/null
@@ -1,11 +0,0 @@
-include_rules = [
-  "-chrome",
-  "-content",
-  "+chrome/test/base",
-
-  "+chrome/browser/sync",
-  "-chrome/browser/sync/api",
-  "-chrome/browser/sync/glue",
-
-  "+sync",
-]
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 27e3e56..3cc619b 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -39,8 +39,6 @@
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/sync_global_error.h"
 #include "chrome/browser/sync/user_selectable_sync_type.h"
@@ -61,6 +59,7 @@
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "net/cookies/cookie_monster.h"
+#include "sync/internal_api/configure_reason.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_event_details.h"
 #include "sync/util/cryptographer.h"
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 3b37103..bfbeb92 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -25,7 +25,6 @@
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/sync_prefs.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index b3301fe..25bb06b 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -32,10 +32,6 @@
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/glue/shared_change_processor.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
@@ -51,6 +47,10 @@
 #include "content/public/browser/notification_source.h"
 #include "content/test/test_browser_thread.h"
 #include "sync/engine/model_changing_syncer_command.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/syncable.h"
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 7353037..856e85f 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -27,15 +27,15 @@
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
-#include "chrome/browser/sync/test/engine/test_user_share.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/test_user_share.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/test/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 5577184..7185ea9 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -23,10 +23,6 @@
 #include "chrome/browser/sync/glue/password_change_processor.h"
 #include "chrome/browser/sync/glue/password_data_type_controller.h"
 #include "chrome/browser/sync/glue/password_model_associator.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -39,6 +35,10 @@
 #include "content/public/browser/notification_source.h"
 #include "content/test/notification_observer_mock.h"
 #include "content/test/test_browser_thread.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/test_id_factory.h"
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 4ddd687..efd63db 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -23,17 +23,17 @@
 #include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/ui_data_type_controller.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/syncable/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 2a32d8d..2991b0d 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -23,11 +23,6 @@
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
@@ -42,6 +37,11 @@
 #include "content/public/browser/notification_service.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/model_type.h"
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index c4862ea..953592b 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -27,10 +27,6 @@
 #include "chrome/browser/sync/glue/typed_url_change_processor.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -42,6 +38,10 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/test_id_factory.h"
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 29b6275..3fd4769 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
 #include "sync/syncable/model_type.h"
 
 // This file contains tests that exercise enabling and disabling data
diff --git a/chrome/browser/sync/test/test_http_bridge_factory.h b/chrome/browser/sync/test/test_http_bridge_factory.h
index d39f72c..302528b 100644
--- a/chrome/browser/sync/test/test_http_bridge_factory.h
+++ b/chrome/browser/sync/test/test_http_bridge_factory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_interface.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 40977f8a..83e04c5 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/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/internal_api/user_share.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "sync/internal_api/user_share.h"
 #include "sync/js/js_reply_handler.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/sessions/session_state.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5d7f017..dac2e3a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -26,12 +26,12 @@
       'debugger',
       'plugin',
       'renderer',
-      'syncapi_core',
       'utility',
       '../content/content.gyp:content_app',
       '../content/content.gyp:content_gpu',
       '../content/content.gyp:content_ppapi_plugin',
       '../content/content.gyp:content_worker',
+      '../sync/sync.gyp:syncapi_core',
       '../printing/printing.gyp:printing',
       '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources',
     ],
@@ -264,72 +264,6 @@
       ],
     },
     {
-      # Provides a syncapi dynamic library target from checked-in binaries,
-      # or from compiling a stub implementation.
-      'target_name': 'syncapi_core',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'sources': [
-        'browser/sync/internal_api/all_status.cc',
-        'browser/sync/internal_api/all_status.h',
-        'browser/sync/internal_api/syncapi_internal.cc',
-        'browser/sync/internal_api/syncapi_internal.h',
-        'browser/sync/internal_api/base_node.cc',
-        'browser/sync/internal_api/base_node.h',
-        'browser/sync/internal_api/base_transaction.cc',
-        'browser/sync/internal_api/base_transaction.h',
-        'browser/sync/internal_api/change_record.cc',
-        'browser/sync/internal_api/change_record.h',
-        'browser/sync/internal_api/change_reorder_buffer.cc',
-        'browser/sync/internal_api/change_reorder_buffer.h',
-        'browser/sync/internal_api/configure_reason.h',
-        'browser/sync/internal_api/debug_info_event_listener.cc',
-        'browser/sync/internal_api/debug_info_event_listener.h',
-        'browser/sync/internal_api/http_post_provider_factory.h',
-        'browser/sync/internal_api/http_post_provider_interface.h',
-        'browser/sync/internal_api/read_node.cc',
-        'browser/sync/internal_api/read_node.h',
-        'browser/sync/internal_api/read_transaction.cc',
-        'browser/sync/internal_api/read_transaction.h',
-        'browser/sync/internal_api/syncapi_server_connection_manager.cc',
-        'browser/sync/internal_api/syncapi_server_connection_manager.h',
-        'browser/sync/internal_api/sync_manager.cc',
-        'browser/sync/internal_api/sync_manager.h',
-        'browser/sync/internal_api/user_share.cc',
-        'browser/sync/internal_api/user_share.h',
-        'browser/sync/internal_api/write_node.cc',
-        'browser/sync/internal_api/write_node.h',
-        'browser/sync/internal_api/write_transaction.cc',
-        'browser/sync/internal_api/write_transaction.h',
-        'browser/sync/internal_api/js_mutation_event_observer.cc',
-        'browser/sync/internal_api/js_mutation_event_observer.h',
-        'browser/sync/internal_api/js_sync_manager_observer.cc',
-        'browser/sync/internal_api/js_sync_manager_observer.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'defines' : [
-        '_CRT_SECURE_NO_WARNINGS',
-        '_USE_32BIT_TIME_T',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../net/net.gyp:net',
-        '../third_party/sqlite/sqlite.gyp:sqlite',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
-        '../sync/sync.gyp:sync_notifier',
-        '../sync/sync.gyp:sync',
-      ],
-      'export_dependent_settings': [
-        '../sync/protocol/sync_proto.gyp:sync_proto',
-        '../sync/sync.gyp:sync',
-      ],
-      # This target exports a hard dependency because syncapi.h includes
-      # generated proto header files from sync_proto.
-      'hard_dependency': 1,
-    },
-    {
       # Provides the API that Chrome services use to talk to sync.
       'target_name': 'syncapi_service',
       'type': 'static_library',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3517cc4..4437b77 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -27,8 +27,6 @@
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
-        # TODO(sync): Make browser not depend on syncapi_core directly.
-        'syncapi_core',
         'syncapi_service',
         'feedback_proto',
         'gdata_proto',
@@ -40,6 +38,7 @@
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:syncapi_core',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/expat/expat.gyp:expat',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0c94b6f..9a5474c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -354,27 +354,6 @@
       ],
     },
     {
-      'target_name': 'test_support_syncapi',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        'syncapi_core',
-        '../sync/sync.gyp:test_support_sync',
-      ],
-      'export_dependent_settings': [
-        '../base/base.gyp:base',
-        'syncapi_core',
-        '../sync/sync.gyp:test_support_sync',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'browser/sync/test/engine/test_user_share.cc',
-        'browser/sync/test/engine/test_user_share.h',
-      ],
-    },
-    {
       'target_name': 'test_support_syncapi_service',
       'type': 'static_library',
       'dependencies': [
@@ -481,11 +460,11 @@
       'type': 'executable',
       'dependencies': [
         '../sync/protocol/sync_proto.gyp:sync_proto',
+        '../sync/sync.gyp:syncapi_core',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'debugger',
-        'syncapi_core',
         'test_support_common',
         'test_support_ui',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -854,12 +833,12 @@
         'chrome_resources.gyp:chrome_strings',
         'chromedriver_support',
         'common',
-        'syncapi_core',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:syncapi_core',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ -1099,7 +1078,7 @@
         'test_support_common',
         '../sync/sync.gyp:test_support_sync',
         '../sync/sync.gyp:test_support_sync_notifier',
-        'test_support_syncapi',
+        '../sync/sync.gyp:test_support_syncapi_core',
         'test_support_syncapi_service',
         'test_support_unit',
         # 3) anything tests directly depend on
@@ -1645,6 +1624,8 @@
         'browser/status_icons/status_tray_unittest.cc',
         'browser/sync/abstract_profile_sync_service_test.cc',
         'browser/sync/abstract_profile_sync_service_test.h',
+        'browser/sync/api/sync_change_unittest.cc',
+        'browser/sync/api/sync_error_unittest.cc',
         'browser/sync/backend_migrator_unittest.cc',
         'browser/sync/glue/app_notification_data_type_controller_unittest.cc',
         'browser/sync/glue/autofill_data_type_controller_unittest.cc',
@@ -3810,47 +3791,6 @@
       ],
     },
     {
-      'target_name': 'sync_unit_tests',
-      'type': 'executable',
-      'sources': [
-        'browser/sync/api/sync_change_unittest.cc',
-        'browser/sync/api/sync_error_unittest.cc',
-        'browser/sync/internal_api/change_record_unittest.cc',
-        'browser/sync/internal_api/debug_info_event_listener_unittest.cc',
-        'browser/sync/internal_api/syncapi_server_connection_manager_unittest.cc',
-        'browser/sync/internal_api/syncapi_unittest.cc',
-        'browser/sync/internal_api/js_mutation_event_observer_unittest.cc',
-        'browser/sync/internal_api/js_sync_manager_observer_unittest.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../net/net.gyp:net',
-        '../net/net.gyp:net_test_support',
-        '../sync/sync.gyp:sync_notifier_tests',
-        '../sync/sync.gyp:sync_tests',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'syncapi_core',
-        'test_support_syncapi',
-        'test_support_syncapi_service',
-      ],
-
-      # TODO(akalin): This is needed because histogram.cc uses
-      # leak_annotations.h, which pulls this in.  Make 'base'
-      # propagate this dependency.
-      'conditions': [
-        ['OS=="linux" and linux_use_tcmalloc==1', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
@@ -4351,10 +4291,10 @@
             'test_support_common',
             'browser',
             'renderer',
-            'syncapi_core',
             '../base/base.gyp:base',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:syncapi_core',
           ],
           'include_dirs': [
             '..',
@@ -4416,9 +4356,9 @@
             'chrome_resources.gyp:chrome_strings',
             'chrome_resources.gyp:theme_resources',
             'debugger',
-            'syncapi_core',
             'test_support_common',
             '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:syncapi_core',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index a8f4f1d..7cc47e1 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -384,7 +384,6 @@
         '../chrome/chrome.gyp:browser',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
-        '../chrome/chrome.gyp:syncapi_core',
         '../chrome/chrome.gyp:test_support_common',
         '../chrome/chrome_resources.gyp:chrome_resources',
         '../content/content.gyp:content_app',
@@ -393,6 +392,7 @@
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:syncapi_core',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ -774,11 +774,11 @@
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
-            # Make the archive build happy.
-            '../chrome/chrome.gyp:syncapi_core',
             # Installer
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
+            # Make the archive build happy.
+            '../sync/sync.gyp:syncapi_core',
             # Crash Reporting
             'crash_reporting/crash_reporting.gyp:crash_report',
           ],
@@ -893,11 +893,11 @@
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler_dll',
             '../chrome/chrome.gyp:automation',
-            # Make the archive build happy.
-            '../chrome/chrome.gyp:syncapi_core',
             # Installer
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
+            # Make the archive build happy.
+            '../sync/sync.gyp:syncapi_core',
             # Crash Reporting
             'crash_reporting/crash_reporting.gyp:crash_report',
           ],
diff --git a/sync/internal_api/DEPS b/sync/internal_api/DEPS
new file mode 100644
index 0000000..955b31e
--- /dev/null
+++ b/sync/internal_api/DEPS
@@ -0,0 +1,14 @@
+include_rules = [
+  "+googleurl",
+  "+net/base/net_errors.h",
+  "+net/base/network_change_notifier.h",
+  "+net/http/http_status_code.h",
+  "+sync/engine",
+  "+sync/js",
+  "+sync/notifier",
+  "+sync/protocol",
+  "+sync/sessions",
+  "+sync/syncable",
+  "+sync/test",
+  "+sync/util",
+]
diff --git a/chrome/browser/sync/internal_api/README b/sync/internal_api/README
index 32987bb..32987bb 100644
--- a/chrome/browser/sync/internal_api/README
+++ b/sync/internal_api/README
diff --git a/chrome/browser/sync/internal_api/all_status.cc b/sync/internal_api/all_status.cc
index c47dac4..89fe414 100644
--- a/chrome/browser/sync/internal_api/all_status.cc
+++ b/sync/internal_api/all_status.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/internal_api/all_status.h"
+#include "sync/internal_api/all_status.h"
 
 #include <algorithm>
 
diff --git a/chrome/browser/sync/internal_api/all_status.h b/sync/internal_api/all_status.h
index 7cea022..d108727 100644
--- a/chrome/browser/sync/internal_api/all_status.h
+++ b/sync/internal_api/all_status.h
@@ -5,8 +5,8 @@
 // The AllStatus object watches various sync engine components and aggregates
 // the status of all of them into one place.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_ALL_STATUS_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_ALL_STATUS_H_
+#ifndef SYNC_INTERNAL_API_ALL_STATUS_H_
+#define SYNC_INTERNAL_API_ALL_STATUS_H_
 #pragma once
 
 #include <map>
@@ -14,8 +14,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "sync/engine/syncer_types.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/syncable/model_type.h"
 
 namespace browser_sync {
@@ -78,4 +78,4 @@ class ScopedStatusLock {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_ALL_STATUS_H_
+#endif  // SYNC_INTERNAL_API_ALL_STATUS_H_
diff --git a/chrome/browser/sync/internal_api/base_node.cc b/sync/internal_api/base_node.cc
index bd766be..552ee71 100644
--- a/chrome/browser/sync/internal_api/base_node.cc
+++ b/sync/internal_api/base_node.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/internal_api/base_node.h"
+#include "sync/internal_api/base_node.h"
 
 #include "base/base64.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
+#include "sync/internal_api/base_transaction.h"
+#include "sync/internal_api/syncapi_internal.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
diff --git a/chrome/browser/sync/internal_api/base_node.h b/sync/internal_api/base_node.h
index dbf720a..42c3b80 100644
--- a/chrome/browser/sync/internal_api/base_node.h
+++ b/sync/internal_api/base_node.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_INTERNAL_API_BASE_NODE_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_BASE_NODE_H_
+#ifndef SYNC_INTERNAL_API_BASE_NODE_H_
+#define SYNC_INTERNAL_API_BASE_NODE_H_
 #pragma once
 
 #include <string>
@@ -252,4 +252,4 @@ class BaseNode {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_BASE_NODE_H_
+#endif  // SYNC_INTERNAL_API_BASE_NODE_H_
diff --git a/chrome/browser/sync/internal_api/base_transaction.cc b/sync/internal_api/base_transaction.cc
index d14384e..879e4e3 100644
--- a/chrome/browser/sync/internal_api/base_transaction.cc
+++ b/sync/internal_api/base_transaction.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/internal_api/base_transaction.h"
+#include "sync/internal_api/base_transaction.h"
 
 #include "sync/syncable/syncable.h"
 #include "sync/util/cryptographer.h"
diff --git a/chrome/browser/sync/internal_api/base_transaction.h b/sync/internal_api/base_transaction.h
index bf3fa9c..f39bca6 100644
--- a/chrome/browser/sync/internal_api/base_transaction.h
+++ b/sync/internal_api/base_transaction.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_BASE_TRANSACTION_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_BASE_TRANSACTION_H_
+#ifndef SYNC_INTERNAL_API_BASE_TRANSACTION_H_
+#define SYNC_INTERNAL_API_BASE_TRANSACTION_H_
 #pragma once
 
-#include "chrome/browser/sync/internal_api/user_share.h"
+#include "sync/internal_api/user_share.h"
 
 #include "sync/util/cryptographer.h"
 
@@ -51,4 +51,4 @@ syncable::ModelTypeSet GetEncryptedTypes(
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_BASE_TRANSACTION_H_
+#endif  // SYNC_INTERNAL_API_BASE_TRANSACTION_H_
diff --git a/chrome/browser/sync/internal_api/change_record.cc b/sync/internal_api/change_record.cc
index f130203..3eefb74 100644
--- a/chrome/browser/sync/internal_api/change_record.cc
+++ b/sync/internal_api/change_record.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/internal_api/change_record.h"
+#include "sync/internal_api/change_record.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/base_node.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
+#include "sync/internal_api/base_node.h"
+#include "sync/internal_api/read_node.h"
 #include "sync/protocol/proto_value_conversions.h"
 
 namespace sync_api {
diff --git a/chrome/browser/sync/internal_api/change_record.h b/sync/internal_api/change_record.h
index 4d0b527..3d2f4ee 100644
--- a/chrome/browser/sync/internal_api/change_record.h
+++ b/sync/internal_api/change_record.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_INTERNAL_API_CHANGE_RECORD_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_CHANGE_RECORD_H_
+#ifndef SYNC_INTERNAL_API_CHANGE_RECORD_H_
+#define SYNC_INTERNAL_API_CHANGE_RECORD_H_
 
 #include <vector>
 
@@ -64,4 +64,4 @@ typedef browser_sync::Immutable<ChangeRecordList> ImmutableChangeRecordList;
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_CHANGE_RECORD_H_
+#endif  // SYNC_INTERNAL_API_CHANGE_RECORD_H_
diff --git a/chrome/browser/sync/internal_api/change_record_unittest.cc b/sync/internal_api/change_record_unittest.cc
index ac99510..9a1d1d3 100644
--- a/chrome/browser/sync/internal_api/change_record_unittest.cc
+++ b/sync/internal_api/change_record_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/internal_api/change_record.h"
+#include "sync/internal_api/change_record.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
diff --git a/chrome/browser/sync/internal_api/change_reorder_buffer.cc b/sync/internal_api/change_reorder_buffer.cc
index f262ff6..7fbada4 100644
--- a/chrome/browser/sync/internal_api/change_reorder_buffer.cc
+++ b/sync/internal_api/change_reorder_buffer.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/internal_api/change_reorder_buffer.h"
+#include "sync/internal_api/change_reorder_buffer.h"
 
 #include <limits>
 #include <queue>
@@ -10,7 +10,7 @@
 #include <utility>  // for pair<>
 #include <vector>
 
-#include "chrome/browser/sync/internal_api/read_node.h"
+#include "sync/internal_api/read_node.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/syncable.h"
 
diff --git a/chrome/browser/sync/internal_api/change_reorder_buffer.h b/sync/internal_api/change_reorder_buffer.h
index f474dd5..edb59f3 100644
--- a/chrome/browser/sync/internal_api/change_reorder_buffer.h
+++ b/sync/internal_api/change_reorder_buffer.h
@@ -6,8 +6,8 @@
 // actions to achieve the ordering constraint required by the SyncObserver
 // interface of the SyncAPI.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
+#ifndef SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
+#define SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
 #pragma once
 
 #include <map>
@@ -15,8 +15,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
+#include "sync/internal_api/base_transaction.h"
+#include "sync/internal_api/change_record.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace sync_api {
@@ -121,4 +121,4 @@ class ChangeReorderBuffer {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
+#endif  // SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
diff --git a/chrome/browser/sync/internal_api/configure_reason.h b/sync/internal_api/configure_reason.h
index cf56e3b7..6008f5f 100644
--- a/chrome/browser/sync/internal_api/configure_reason.h
+++ b/sync/internal_api/configure_reason.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_CONFIGURE_REASON_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_CONFIGURE_REASON_H_
+#ifndef SYNC_INTERNAL_API_CONFIGURE_REASON_H_
+#define SYNC_INTERNAL_API_CONFIGURE_REASON_H_
 #pragma once
 
 namespace sync_api {
@@ -33,4 +33,4 @@ enum ConfigureReason {
 
 } // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_CONFIGURE_REASON_H_
+#endif  // SYNC_INTERNAL_API_CONFIGURE_REASON_H_
diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc
index 0108f8e..53fc9b1 100644
--- a/chrome/browser/sync/internal_api/debug_info_event_listener.cc
+++ b/sync/internal_api/debug_info_event_listener.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/internal_api/debug_info_event_listener.h"
+#include "sync/internal_api/debug_info_event_listener.h"
 
 using browser_sync::sessions::SyncSessionSnapshot;
 namespace sync_api {
diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h
index 5bdc9e1..0169043 100644
--- a/chrome/browser/sync/internal_api/debug_info_event_listener.h
+++ b/sync/internal_api/debug_info_event_listener.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
+#ifndef SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
+#define SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
 
 #include <queue>
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/js/js_backend.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/debug_info_getter.h"
@@ -88,4 +88,4 @@ class DebugInfoEventListener : public sync_api::SyncManager::Observer,
 };
 
 }  // namespace sync_api
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
+#endif  // SYNC_INTERNAL_API_DEBUG_INFO_EVENT_LISTENER_H_
diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener_unittest.cc b/sync/internal_api/debug_info_event_listener_unittest.cc
index 79b99ba..801dafd 100644
--- a/chrome/browser/sync/internal_api/debug_info_event_listener_unittest.cc
+++ b/sync/internal_api/debug_info_event_listener_unittest.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 
-#include "chrome/browser/sync/internal_api/debug_info_event_listener.h"
+#include "sync/internal_api/debug_info_event_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef testing::Test DebugInfoEventListenerTest;
diff --git a/chrome/browser/sync/internal_api/http_post_provider_factory.h b/sync/internal_api/http_post_provider_factory.h
index 214d064..445fd6a 100644
--- a/chrome/browser/sync/internal_api/http_post_provider_factory.h
+++ b/sync/internal_api/http_post_provider_factory.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
+#ifndef SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
+#define SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
 #pragma once
 
 namespace sync_api {
@@ -31,4 +31,4 @@ class HttpPostProviderFactory {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
+#endif  // SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_
diff --git a/chrome/browser/sync/internal_api/http_post_provider_interface.h b/sync/internal_api/http_post_provider_interface.h
index ffc087e..10b02b5 100644
--- a/chrome/browser/sync/internal_api/http_post_provider_interface.h
+++ b/sync/internal_api/http_post_provider_interface.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
+#ifndef SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
+#define SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
 #pragma once
 
 #include <string>
@@ -63,4 +63,4 @@ class HttpPostProviderInterface {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
+#endif  // SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_
diff --git a/chrome/browser/sync/internal_api/js_mutation_event_observer.cc b/sync/internal_api/js_mutation_event_observer.cc
index 2a630800..9833b09 100644
--- a/chrome/browser/sync/internal_api/js_mutation_event_observer.cc
+++ b/sync/internal_api/js_mutation_event_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/internal_api/js_mutation_event_observer.h"
+#include "sync/internal_api/js_mutation_event_observer.h"
 
 #include <string>
 
diff --git a/chrome/browser/sync/internal_api/js_mutation_event_observer.h b/sync/internal_api/js_mutation_event_observer.h
index 850fe75..60a33a2 100644
--- a/chrome/browser/sync/internal_api/js_mutation_event_observer.h
+++ b/sync/internal_api/js_mutation_event_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_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
+#ifndef SYNC_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
+#define SYNC_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
 #pragma once
 
 #include <string>
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/syncable/transaction_observer.h"
 #include "sync/util/weak_handle.h"
 
@@ -67,4 +67,4 @@ class JsMutationEventObserver
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
+#endif  // SYNC_INTERNAL_API_JS_MUTATION_EVENT_OBSERVER_H_
diff --git a/chrome/browser/sync/internal_api/js_mutation_event_observer_unittest.cc b/sync/internal_api/js_mutation_event_observer_unittest.cc
index 89ef5cb..4092b82 100644
--- a/chrome/browser/sync/internal_api/js_mutation_event_observer_unittest.cc
+++ b/sync/internal_api/js_mutation_event_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/internal_api/js_mutation_event_observer.h"
+#include "sync/internal_api/js_mutation_event_observer.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc
index 6aa236c..b9cf9f3 100644
--- a/chrome/browser/sync/internal_api/js_sync_manager_observer.cc
+++ b/sync/internal_api/js_sync_manager_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/internal_api/js_sync_manager_observer.h"
+#include "sync/internal_api/js_sync_manager_observer.h"
 
 #include <cstddef>
 
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
+#include "sync/internal_api/change_record.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_event_handler.h"
diff --git a/chrome/browser/sync/internal_api/js_sync_manager_observer.h b/sync/internal_api/js_sync_manager_observer.h
index de7ec6b..025cfa1 100644
--- a/chrome/browser/sync/internal_api/js_sync_manager_observer.h
+++ b/sync/internal_api/js_sync_manager_observer.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
+#ifndef SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
+#define SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
+#include "sync/internal_api/sync_manager.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "sync/util/weak_handle.h"
 
@@ -66,4 +66,4 @@ class JsSyncManagerObserver : public sync_api::SyncManager::Observer {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
+#endif  // SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
diff --git a/chrome/browser/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc
index ac65e57..e2f63ab 100644
--- a/chrome/browser/sync/internal_api/js_sync_manager_observer_unittest.cc
+++ b/sync/internal_api/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/internal_api/js_sync_manager_observer.h"
+#include "sync/internal_api/js_sync_manager_observer.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
diff --git a/chrome/browser/sync/internal_api/read_node.cc b/sync/internal_api/read_node.cc
index 417fff8..00ee6bc 100644
--- a/chrome/browser/sync/internal_api/read_node.cc
+++ b/sync/internal_api/read_node.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/internal_api/read_node.h"
+#include "sync/internal_api/read_node.h"
 
 #include "base/logging.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
+#include "sync/internal_api/base_transaction.h"
 #include "sync/syncable/syncable.h"
 
 namespace sync_api {
diff --git a/chrome/browser/sync/internal_api/read_node.h b/sync/internal_api/read_node.h
index 74bcd32..ea48660 100644
--- a/chrome/browser/sync/internal_api/read_node.h
+++ b/sync/internal_api/read_node.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_READ_NODE_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_READ_NODE_H_
+#ifndef SYNC_INTERNAL_API_READ_NODE_H_
+#define SYNC_INTERNAL_API_READ_NODE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/base_node.h"
+#include "sync/internal_api/base_node.h"
 #include "sync/syncable/model_type.h"
 
 namespace sync_api {
@@ -63,4 +63,4 @@ class ReadNode : public BaseNode {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_READ_NODE_H_
+#endif  // SYNC_INTERNAL_API_READ_NODE_H_
diff --git a/chrome/browser/sync/internal_api/read_transaction.cc b/sync/internal_api/read_transaction.cc
index a3991ba..5c38f6c 100644
--- a/chrome/browser/sync/internal_api/read_transaction.cc
+++ b/sync/internal_api/read_transaction.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/internal_api/read_transaction.h"
+#include "sync/internal_api/read_transaction.h"
 
 #include "sync/syncable/syncable.h"
 
diff --git a/chrome/browser/sync/internal_api/read_transaction.h b/sync/internal_api/read_transaction.h
index 62d279be..e45acc6 100644
--- a/chrome/browser/sync/internal_api/read_transaction.h
+++ b/sync/internal_api/read_transaction.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_READ_TRANSACTION_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_READ_TRANSACTION_H_
+#ifndef SYNC_INTERNAL_API_READ_TRANSACTION_H_
+#define SYNC_INTERNAL_API_READ_TRANSACTION_H_
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
+#include "sync/internal_api/base_transaction.h"
 
 namespace tracked_objects {
 class Location;
@@ -43,4 +43,4 @@ class ReadTransaction : public BaseTransaction {
 
 } // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_READ_TRANSACTION_H_
+#endif  // SYNC_INTERNAL_API_READ_TRANSACTION_H_
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc
index 6e6f176..ebe870e 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/sync/internal_api/sync_manager.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/internal_api/sync_manager.h"
+#include "sync/internal_api/sync_manager.h"
 
 #include <string>
 
@@ -17,26 +17,26 @@
 #include "base/observer_list.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/all_status.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"
-#include "chrome/browser/sync/internal_api/debug_info_event_listener.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/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
-#include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h"
-#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 "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/internal_api/all_status.h"
+#include "sync/internal_api/base_node.h"
+#include "sync/internal_api/change_reorder_buffer.h"
+#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/debug_info_event_listener.h"
+#include "sync/internal_api/js_mutation_event_observer.h"
+#include "sync/internal_api/js_sync_manager_observer.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/syncapi_internal.h"
+#include "sync/internal_api/syncapi_server_connection_manager.h"
+#include "sync/internal_api/user_share.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_backend.h"
 #include "sync/js/js_event_details.h"
diff --git a/chrome/browser/sync/internal_api/sync_manager.h b/sync/internal_api/sync_manager.h
index 488c727..d5f08a7 100644
--- a/chrome/browser/sync/internal_api/sync_manager.h
+++ b/sync/internal_api/sync_manager.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_INTERNAL_API_SYNC_MANAGER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_
+#ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
+#define SYNC_INTERNAL_API_SYNC_MANAGER_H_
 
 #include <string>
 #include <vector>
@@ -15,8 +15,8 @@
 #include "base/task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "base/time.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/configure_reason.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/configure_reason.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "sync/syncable/model_type.h"
 #include "sync/util/report_unrecoverable_error_function.h"
@@ -641,4 +641,4 @@ const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason);
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_
+#endif  // SYNC_INTERNAL_API_SYNC_MANAGER_H_
diff --git a/chrome/browser/sync/internal_api/syncapi_internal.cc b/sync/internal_api/syncapi_internal.cc
index 57279f8..0f7a27a 100644
--- a/chrome/browser/sync/internal_api/syncapi_internal.cc
+++ b/sync/internal_api/syncapi_internal.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/internal_api/syncapi_internal.h"
+#include "sync/internal_api/syncapi_internal.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "sync/protocol/password_specifics.pb.h"
diff --git a/chrome/browser/sync/internal_api/syncapi_internal.h b/sync/internal_api/syncapi_internal.h
index ffd2d4e..162d26f 100644
--- a/chrome/browser/sync/internal_api/syncapi_internal.h
+++ b/sync/internal_api/syncapi_internal.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_INTERNAL_API_SYNCAPI_INTERNAL_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
+#ifndef SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
+#define SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
 
 // The functions defined are shared among some of the classes that implement
 // the internal sync_api.  They are not to be used by clients of the API.
@@ -34,4 +34,4 @@ bool AreSpecificsEqual(const browser_sync::Cryptographer* cryptographer,
                        const sync_pb::EntitySpecifics& right);
 }
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
+#endif  // SYNC_INTERNAL_API_SYNCAPI_INTERNAL_H_
diff --git a/chrome/browser/sync/internal_api/syncapi_server_connection_manager.cc b/sync/internal_api/syncapi_server_connection_manager.cc
index 2de56a4..ce62d86 100644
--- a/chrome/browser/sync/internal_api/syncapi_server_connection_manager.cc
+++ b/sync/internal_api/syncapi_server_connection_manager.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/internal_api/syncapi_server_connection_manager.h"
+#include "sync/internal_api/syncapi_server_connection_manager.h"
 
-#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
+#include "sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_interface.h"
 
 using browser_sync::HttpResponse;
 
diff --git a/chrome/browser/sync/internal_api/syncapi_server_connection_manager.h b/sync/internal_api/syncapi_server_connection_manager.h
index 181b0b2..fafde1e 100644
--- a/chrome/browser/sync/internal_api/syncapi_server_connection_manager.h
+++ b/sync/internal_api/syncapi_server_connection_manager.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_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
+#ifndef SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
+#define SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
 #pragma once
 
 #include <string>
@@ -75,4 +75,4 @@ class SyncAPIServerConnectionManager
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
+#endif  // SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
diff --git a/chrome/browser/sync/internal_api/syncapi_server_connection_manager_unittest.cc b/sync/internal_api/syncapi_server_connection_manager_unittest.cc
index 720b574..a2f5280 100644
--- a/chrome/browser/sync/internal_api/syncapi_server_connection_manager_unittest.cc
+++ b/sync/internal_api/syncapi_server_connection_manager_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/internal_api/syncapi_server_connection_manager.h"
+#include "sync/internal_api/syncapi_server_connection_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -11,9 +11,9 @@
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
 #include "net/base/net_errors.h"
+#include "sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_interface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
index 2464dcb..a9e74ce 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/sync/internal_api/syncapi_unittest.cc
@@ -23,19 +23,19 @@
 #include "base/test/values_test_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/change_record.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
-#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
-#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
-#include "chrome/browser/sync/internal_api/write_node.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
-#include "chrome/browser/sync/test/engine/test_user_share.h"
 #include "sync/engine/model_safe_worker.h"
 #include "sync/engine/nigori_util.h"
 #include "sync/engine/polling_constants.h"
+#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/http_post_provider_factory.h"
+#include "sync/internal_api/http_post_provider_interface.h"
+#include "sync/internal_api/read_node.h"
+#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/sync_manager.h"
+#include "sync/internal_api/syncapi_internal.h"
+#include "sync/internal_api/test_user_share.h"
+#include "sync/internal_api/write_node.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_backend.h"
 #include "sync/js/js_event_handler.h"
diff --git a/chrome/browser/sync/test/engine/test_user_share.cc b/sync/internal_api/test_user_share.cc
index 630c6c7..743f3d0 100644
--- a/chrome/browser/sync/test/engine/test_user_share.cc
+++ b/sync/internal_api/test_user_share.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/test/engine/test_user_share.h"
+#include "sync/internal_api/test_user_share.h"
 
 #include "base/compiler_specific.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/test/engine/test_user_share.h b/sync/internal_api/test_user_share.h
index dc16c2b..b212e3c 100644
--- a/chrome/browser/sync/test/engine/test_user_share.h
+++ b/sync/internal_api/test_user_share.h
@@ -27,12 +27,12 @@
 //   }
 //
 
-#ifndef CHROME_BROWSER_SYNC_TEST_ENGINE_TEST_USER_SHARE_H_
-#define CHROME_BROWSER_SYNC_TEST_ENGINE_TEST_USER_SHARE_H_
+#ifndef SYNC_INTERNAL_API_TEST_USER_SHARE_H_
+#define SYNC_INTERNAL_API_TEST_USER_SHARE_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/sync/internal_api/user_share.h"
+#include "sync/internal_api/user_share.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 
 namespace browser_sync {
@@ -64,4 +64,4 @@ class TestUserShare {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_TEST_ENGINE_TEST_USER_SHARE_H_
+#endif  // SYNC_INTERNAL_API_TEST_USER_SHARE_H_
diff --git a/chrome/browser/sync/internal_api/user_share.cc b/sync/internal_api/user_share.cc
index 4bdacc1..a0a77ba 100644
--- a/chrome/browser/sync/internal_api/user_share.cc
+++ b/sync/internal_api/user_share.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/internal_api/user_share.h"
+#include "sync/internal_api/user_share.h"
 
 #include "sync/syncable/syncable.h"
 
diff --git a/chrome/browser/sync/internal_api/user_share.h b/sync/internal_api/user_share.h
index 472aa07..275fa42 100644
--- a/chrome/browser/sync/internal_api/user_share.h
+++ b/sync/internal_api/user_share.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_INTERNAL_API_USER_SHARE_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_USER_SHARE_H_
+#ifndef SYNC_INTERNAL_API_USER_SHARE_H_
+#define SYNC_INTERNAL_API_USER_SHARE_H_
 #pragma once
 
 #include <string>
@@ -33,4 +33,4 @@ struct UserShare {
 
 }
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_USER_SHARE_H_
+#endif  // SYNC_INTERNAL_API_USER_SHARE_H_
diff --git a/chrome/browser/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc
index ef47f9d..ce20e31 100644
--- a/chrome/browser/sync/internal_api/write_node.cc
+++ b/sync/internal_api/write_node.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/internal_api/write_node.h"
+#include "sync/internal_api/write_node.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
-#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "sync/engine/nigori_util.h"
+#include "sync/internal_api/base_transaction.h"
+#include "sync/internal_api/syncapi_internal.h"
+#include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
diff --git a/chrome/browser/sync/internal_api/write_node.h b/sync/internal_api/write_node.h
index 7c55ddd..a070a5c 100644
--- a/chrome/browser/sync/internal_api/write_node.h
+++ b/sync/internal_api/write_node.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_INTERNAL_API_WRITE_NODE_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_WRITE_NODE_H_
+#ifndef SYNC_INTERNAL_API_WRITE_NODE_H_
+#define SYNC_INTERNAL_API_WRITE_NODE_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/base_node.h"
+#include "sync/internal_api/base_node.h"
 #include "sync/syncable/model_type.h"
 
 namespace browser_sync {
@@ -187,4 +187,4 @@ class WriteNode : public BaseNode {
 
 }  // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_WRITE_NODE_H_
+#endif  // SYNC_INTERNAL_API_WRITE_NODE_H_
diff --git a/chrome/browser/sync/internal_api/write_transaction.cc b/sync/internal_api/write_transaction.cc
index 6ce4cbb..b141b8c 100644
--- a/chrome/browser/sync/internal_api/write_transaction.cc
+++ b/sync/internal_api/write_transaction.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/internal_api/write_transaction.h"
+#include "sync/internal_api/write_transaction.h"
 
 #include "sync/syncable/syncable.h"
 
diff --git a/chrome/browser/sync/internal_api/write_transaction.h b/sync/internal_api/write_transaction.h
index 0c2a1ad..4364cdd1 100644
--- a/chrome/browser/sync/internal_api/write_transaction.h
+++ b/sync/internal_api/write_transaction.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
-#define CHROME_BROWSER_SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
+#ifndef SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
+#define SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/internal_api/base_transaction.h"
+#include "sync/internal_api/base_transaction.h"
 
 namespace syncable {
 class BaseTransaction;
@@ -54,4 +54,4 @@ class WriteTransaction : public BaseTransaction {
 
 } // namespace sync_api
 
-#endif  // CHROME_BROWSER_SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
+#endif  // SYNC_INTERNAL_API_WRITE_TRANSACTION_H_
diff --git a/sync/sync.gyp b/sync/sync.gyp
index cc4d83d..29f8173 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -235,6 +235,68 @@
       ],
     },
 
+    # The sync internal API library.
+    {
+      'target_name': 'syncapi_core',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../net/net.gyp:net',
+        'protocol/sync_proto.gyp:sync_proto',
+        'sync_notifier',
+        'sync',
+      ],
+      'export_dependent_settings': [
+        # Propagate sync_proto since our headers include its generated
+        # files.
+        'protocol/sync_proto.gyp:sync_proto',
+        'sync_notifier',
+        'sync',
+      ],
+      'sources': [
+        'internal_api/all_status.cc',
+        'internal_api/all_status.h',
+        'internal_api/base_node.cc',
+        'internal_api/base_node.h',
+        'internal_api/base_transaction.cc',
+        'internal_api/base_transaction.h',
+        'internal_api/change_record.cc',
+        'internal_api/change_record.h',
+        'internal_api/change_reorder_buffer.cc',
+        'internal_api/change_reorder_buffer.h',
+        'internal_api/configure_reason.h',
+        'internal_api/debug_info_event_listener.cc',
+        'internal_api/debug_info_event_listener.h',
+        'internal_api/http_post_provider_factory.h',
+        'internal_api/http_post_provider_interface.h',
+        'internal_api/js_mutation_event_observer.cc',
+        'internal_api/js_mutation_event_observer.h',
+        'internal_api/js_sync_manager_observer.cc',
+        'internal_api/js_sync_manager_observer.h',
+        'internal_api/read_node.cc',
+        'internal_api/read_node.h',
+        'internal_api/read_transaction.cc',
+        'internal_api/read_transaction.h',
+        'internal_api/syncapi_internal.cc',
+        'internal_api/syncapi_internal.h',
+        'internal_api/syncapi_server_connection_manager.cc',
+        'internal_api/syncapi_server_connection_manager.h',
+        'internal_api/sync_manager.cc',
+        'internal_api/sync_manager.h',
+        'internal_api/user_share.cc',
+        'internal_api/user_share.h',
+        'internal_api/write_node.cc',
+        'internal_api/write_node.h',
+        'internal_api/write_transaction.cc',
+        'internal_api/write_transaction.h',
+      ],
+    },
+
     # Test support files for the 'sync' target.
     {
       'target_name': 'test_support_sync',
@@ -316,6 +378,31 @@
       ],
     },
 
+    # Test support files for the 'syncapi_core' target.
+    {
+      'target_name': 'test_support_syncapi_core',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+        'syncapi_core',
+        'test_support_sync',
+      ],
+      'export_dependent_settings': [
+        '../testing/gtest.gyp:gtest',
+        'syncapi_core',
+        'test_support_sync',
+      ],
+      'sources': [
+        'internal_api/test_user_share.cc',
+        'internal_api/test_user_share.h',
+      ],
+    },
+
     # Unit tests for the 'sync' target.  This cannot be a static
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
@@ -455,21 +542,64 @@
       },
     },
 
-    # The unit test executable for sync tests.  Currently this isn't
-    # automatically run, as there is already a sync_unit_tests
-    # executable in chrome.gyp; this is just to make sure that all the
-    # link-time dependencies for the files in the targets above
-    # resolve.
-    #
-    # TODO(akalin): Rename this to sync_unit_tests once we've moved
-    # everything from chrome.gyp.
+    # Unit tests for the 'syncapi_core' target.  This cannot be a static
+    # library because the unit test files have to be compiled directly
+    # into the executable, so we push the target files to the
+    # depending executable target via direct_dependent_settings.
+    {
+      'target_name': 'syncapi_core_tests',
+      'type': 'none',
+      # We only want unit test executables to include this target.
+      'suppress_wildcard': 1,
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'protocol/sync_proto.gyp:sync_proto',
+        'sync',
+        'sync_notifier',
+        'syncapi_core',
+        'test_support_syncapi_core',
+      ],
+      # Propagate all dependencies since the actual compilation
+      # happens in the dependents.
+      'export_dependent_settings': [
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'protocol/sync_proto.gyp:sync_proto',
+        'sync',
+        'sync_notifier',
+        'syncapi_core',
+        'test_support_syncapi_core',
+      ],
+      'direct_dependent_settings': {
+        'variables': { 'enable_wexit_time_destructors': 1, },
+        'include_dirs': [
+          '..',
+        ],
+        'sources': [
+          'internal_api/change_record_unittest.cc',
+          'internal_api/debug_info_event_listener_unittest.cc',
+          'internal_api/js_mutation_event_observer_unittest.cc',
+          'internal_api/js_sync_manager_observer_unittest.cc',
+          'internal_api/syncapi_server_connection_manager_unittest.cc',
+          'internal_api/syncapi_unittest.cc',
+        ],
+      },
+    },
+
+    # The unit test executable for sync tests.
     {
-      'target_name': 'sync_unit_tests_canary',
+      'target_name': 'sync_unit_tests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
         'sync_tests',
         'sync_notifier_tests',
+        'syncapi_core_tests',
       ],
       # TODO(akalin): This is needed because histogram.cc uses
       # leak_annotations.h, which pulls this in.  Make 'base'