sync: move internal_api components used by chrome/browser into intern…

…al_api/public

TBR=jhawkins@chromium.org

BUG=131130
TEST=


Review URL: https://chromiumcodereview.appspot.com/10534080

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

chrome/browser/sync/DEPS

@@ -1,9 +1,14 @@
 include_rules = [
   # For files not in a subdirectory (what a mess!).
-  "+sync/internal_api",
+  "+sync/internal_api/public",
   "+sync/js",
   "+sync/notifier/invalidation_state_tracker.h",
+
+  # TODO(tim): Remove everything below. Bug 131130.
+  "+sync/util/cryptographer.h",
+  #  Used by tests.
   "+sync/syncable/syncable.h",
-  "+sync/test",
-  "+sync/util",
+  # Used by autofill tests, which should use sync_api instead.
+  "+sync/test/engine/test_id_factory.h",
+
 ]

chrome/browser/sync/abstract_profile_sync_service_test.cc

@@ -8,7 +8,7 @@
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
-#include "sync/internal_api/write_transaction.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/test_id_factory.h"

chrome/browser/sync/abstract_profile_sync_service_test.h

@@ -15,7 +15,7 @@
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "content/public/test/test_browser_thread.h"
-#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/public/change_record.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/sync/backend_migrator.cc

@@ -11,8 +11,8 @@
 #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/internal_api/public/configure_reason.h"
+#include "sync/internal_api/public/read_transaction.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable.h" // TODO(tim): Bug 131130.
 

chrome/browser/sync/backend_migrator_unittest.cc

@@ -10,9 +10,10 @@
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "sync/internal_api/public/syncable/model_type_test_util.h"
-#include "sync/internal_api/test_user_share.h"
-#include "sync/internal_api/write_transaction.h"
+#include "sync/internal_api/public/test/test_user_share.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/sync.pb.h"
+#include "sync/syncable/syncable.h"  // TODO(tim): Remove. Bug 131130.
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/sync/backend_unrecoverable_error_handler.h

@@ -11,8 +11,8 @@
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 
-#include "sync/util/unrecoverable_error_handler.h"
-#include "sync/util/weak_handle.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/weak_handle.h"
 
 class ProfileSyncService;
 namespace browser_sync {

chrome/browser/sync/glue/backend_data_type_configurer.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/callback.h"
-#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 
 namespace browser_sync {

chrome/browser/sync/glue/bookmark_change_processor.cc

@@ -17,10 +17,10 @@
 #include "chrome/browser/profiles/profile.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/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/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"

chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -17,10 +17,10 @@
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.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/internal_api/public/read_node.h"
+#include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 using content::BrowserThread;

chrome/browser/sync/glue/bookmark_model_associator.h

@@ -16,7 +16,7 @@
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
-#include "sync/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 class BookmarkModel;
 class BookmarkNode;

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 "sync/internal_api/change_record.h"
+#include "sync/internal_api/public/change_record.h"
 
 class Profile;
 

chrome/browser/sync/glue/change_processor_mock.h

@@ -8,8 +8,8 @@
 
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/syncable/syncable.h"
-#include "sync/util/unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace browser_sync {

chrome/browser/sync/glue/data_type_controller.h

@@ -16,7 +16,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/syncable/model_type.h"
-#include "sync/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 class SyncError;
 

chrome/browser/sync/glue/data_type_error_handler.h

@@ -11,7 +11,7 @@
 
 #include "sync/api/sync_error.h"
 #include "sync/internal_api/public/syncable/model_type.h"
-#include "sync/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 namespace browser_sync {
 

chrome/browser/sync/glue/data_type_manager.h

@@ -12,7 +12,7 @@
 
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "sync/api/sync_error.h"
-#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 
 namespace browser_sync {

chrome/browser/sync/glue/data_type_manager_impl_unittest.cc

@@ -15,7 +15,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/mock_notification_observer.h"
 #include "content/public/test/test_browser_thread.h"
-#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/sync/glue/generic_change_processor.cc

@@ -11,14 +11,14 @@
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/syncable_service.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/internal_api/public/base_node.h"
+#include "sync/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/syncable/syncable.h"  // TODO(tim): Bug 123674.
-#include "sync/util/unrecoverable_error_handler.h"
 
 using content::BrowserThread;
 

chrome/browser/sync/glue/http_bridge.h

@@ -18,8 +18,8 @@
 #include "net/url_request/url_fetcher_delegate.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"
+#include "sync/internal_api/public/http_post_provider_factory.h"
+#include "sync/internal_api/public/http_post_provider_interface.h"
 
 class MessageLoop;
 class HttpBridgeTest;

chrome/browser/sync/glue/password_change_processor.cc

@@ -18,10 +18,10 @@
 #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/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "webkit/forms/password_form.h"
 

chrome/browser/sync/glue/password_model_associator.cc

@@ -13,10 +13,10 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "net/base/escape.h"
 #include "sync/api/sync_error.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/internal_api/public/read_node.h"
+#include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "webkit/forms/password_form.h"
 

chrome/browser/sync/glue/session_change_processor.cc

@@ -23,10 +23,10 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "sync/api/sync_error.h"
-#include "sync/internal_api/change_record.h"
+#include "sync/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/internal_api/public/syncable/model_type_payload_map.h"
-#include "sync/internal_api/read_node.h"
 #include "sync/protocol/session_specifics.pb.h"
 
 using content::BrowserThread;

chrome/browser/sync/glue/session_model_associator.cc

@@ -29,12 +29,12 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "sync/api/sync_error.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/read_transaction.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/internal_api/public/syncable/model_type_payload_map.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/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/util/get_session_name.h"

chrome/browser/sync/glue/shared_change_processor_mock.h

@@ -8,7 +8,7 @@
 
 #include "chrome/browser/sync/glue/shared_change_processor.h"
 #include "sync/api/sync_change.h"
-#include "sync/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace browser_sync {

chrome/browser/sync/glue/sync_backend_host.cc

@@ -41,13 +41,13 @@
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "sync/internal_api/base_transaction.h"
+#include "sync/internal_api/public/base_transaction.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
-#include "sync/internal_api/read_transaction.h"
+#include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/util/experiments.h"
 #include "sync/notifier/sync_notifier.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync.pb.h"
-#include "sync/util/experiments.h"
 #include "sync/util/nigori.h"
 
 static const int kSaveChangesIntervalSeconds = 10;

chrome/browser/sync/glue/sync_backend_host.h

@@ -20,17 +20,17 @@
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
-#include "sync/internal_api/configure_reason.h"
+#include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
+#include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/syncable/model_type.h"
-#include "sync/internal_api/sync_manager.h"
+#include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/sync_notifier_factory.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync_protocol_error.h"
-#include "sync/util/report_unrecoverable_error_function.h"
-#include "sync/util/unrecoverable_error_handler.h"
-#include "sync/util/weak_handle.h"
 
 class MessageLoop;
 class Profile;

chrome/browser/sync/glue/sync_backend_host_unittest.cc

@@ -16,9 +16,9 @@
 #include "googleurl/src/gurl.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/util/experiments.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync_protocol_error.h"
-#include "sync/util/experiments.h"
 #include "sync/util/test_unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/sync/glue/sync_backend_registrar.h

@@ -14,8 +14,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
+#include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/syncable/model_type.h"
-#include "sync/internal_api/sync_manager.h"
 
 class MessageLoop;
 class Profile;

chrome/browser/sync/glue/sync_backend_registrar_unittest.cc

@@ -9,7 +9,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sync/internal_api/public/syncable/model_type.h"
-#include "sync/internal_api/test_user_share.h"
+#include "sync/internal_api/public/test/test_user_share.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/sync/glue/theme_change_processor.cc

@@ -15,12 +15,12 @@
 #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/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/theme_specifics.pb.h"
-#include "sync/util/unrecoverable_error_handler.h"
 
 namespace browser_sync {
 

chrome/browser/sync/glue/theme_model_associator.cc

@@ -12,10 +12,10 @@
 #include "chrome/browser/sync/glue/theme_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "sync/api/sync_error.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/internal_api/public/read_node.h"
+#include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/theme_specifics.pb.h"
 
 namespace browser_sync {

chrome/browser/sync/glue/typed_url_change_processor.cc

@@ -15,10 +15,10 @@
 #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/internal_api/public/change_record.h"
+#include "sync/internal_api/public/read_node.h"
+#include "sync/internal_api/public/write_node.h"
+#include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 #include "sync/syncable/syncable.h"  // TODO(tim): Investigating bug 121587.