diff options
Diffstat (limited to 'chrome/browser')
47 files changed, 127 insertions, 120 deletions
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS index c906c06..0c72dea 100644 --- a/chrome/browser/sync/DEPS +++ b/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", + ] diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 1b83424..782506e 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/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" diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h index 0e9098a..60e63a4 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.h +++ b/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" diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc index 258d774..c9d755e 100644 --- a/chrome/browser/sync/backend_migrator.cc +++ b/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. diff --git a/chrome/browser/sync/backend_migrator_unittest.cc b/chrome/browser/sync/backend_migrator_unittest.cc index 05b8dc5..f161b3d 100644 --- a/chrome/browser/sync/backend_migrator_unittest.cc +++ b/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" diff --git a/chrome/browser/sync/backend_unrecoverable_error_handler.h b/chrome/browser/sync/backend_unrecoverable_error_handler.h index b9f8d18..e63c2e5 100644 --- a/chrome/browser/sync/backend_unrecoverable_error_handler.h +++ b/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 { diff --git a/chrome/browser/sync/glue/backend_data_type_configurer.h b/chrome/browser/sync/glue/backend_data_type_configurer.h index f15986b..e7bf098 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 "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 { diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index a60425d..83b4702 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/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" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index 86cac94..2ff53b8 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/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; diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h index 31ade9e..dd5d1f5 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.h +++ b/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; diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h index 8dd4349..c543a7c 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 "sync/internal_api/change_record.h" +#include "sync/internal_api/public/change_record.h" class Profile; diff --git a/chrome/browser/sync/glue/change_processor_mock.h b/chrome/browser/sync/glue/change_processor_mock.h index dcb6e07..5f11cb6 100644 --- a/chrome/browser/sync/glue/change_processor_mock.h +++ b/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 { diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index ee289b8d..52247bd 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/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; diff --git a/chrome/browser/sync/glue/data_type_error_handler.h b/chrome/browser/sync/glue/data_type_error_handler.h index b9c47ad..11aef84 100644 --- a/chrome/browser/sync/glue/data_type_error_handler.h +++ b/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 { diff --git a/chrome/browser/sync/glue/data_type_manager.h b/chrome/browser/sync/glue/data_type_manager.h index 0e8b967..a500914 100644 --- a/chrome/browser/sync/glue/data_type_manager.h +++ b/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 { 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 cc0db2b..440ce24 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc +++ b/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" diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index 2c86839..45615e0 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/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; diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h index 4e749c1..ff85c29 100644 --- a/chrome/browser/sync/glue/http_bridge.h +++ b/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; diff --git a/chrome/browser/sync/glue/password_change_processor.cc b/chrome/browser/sync/glue/password_change_processor.cc index b6d2822..26ce523 100644 --- a/chrome/browser/sync/glue/password_change_processor.cc +++ b/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" diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc index 8836f67..5dc1333 100644 --- a/chrome/browser/sync/glue/password_model_associator.cc +++ b/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" diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc index 66c8248..ca51227 100644 --- a/chrome/browser/sync/glue/session_change_processor.cc +++ b/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; diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index f668bd1..8754c11 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/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" diff --git a/chrome/browser/sync/glue/shared_change_processor_mock.h b/chrome/browser/sync/glue/shared_change_processor_mock.h index 60219c0..accf46a 100644 --- a/chrome/browser/sync/glue/shared_change_processor_mock.h +++ b/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 { diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index a4f09e7..58e7a37 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/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; diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index 00aa77e..5cde824 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/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; diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc index a445212..8b53b5c 100644 --- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc +++ b/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" diff --git a/chrome/browser/sync/glue/sync_backend_registrar.h b/chrome/browser/sync/glue/sync_backend_registrar.h index 4488331..b9c82c9 100644 --- a/chrome/browser/sync/glue/sync_backend_registrar.h +++ b/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; diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc index 14dc9af..8c699f1 100644 --- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc +++ b/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" diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc index fb58a97..a2164c3 100644 --- a/chrome/browser/sync/glue/theme_change_processor.cc +++ b/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 { diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc index 1d9682e..07493aa 100644 --- a/chrome/browser/sync/glue/theme_model_associator.cc +++ b/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 { diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc index 2a32ec3..a235bb5 100644 --- a/chrome/browser/sync/glue/typed_url_change_processor.cc +++ b/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. diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc index 45e9b79..99e2090 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator.cc @@ -14,10 +14,10 @@ #include "chrome/browser/history/history_backend.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/typed_url_specifics.pb.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/ui_model_worker.h b/chrome/browser/sync/glue/ui_model_worker.h index 5ff351a..5a8f898 100644 --- a/chrome/browser/sync/glue/ui_model_worker.h +++ b/chrome/browser/sync/glue/ui_model_worker.h @@ -11,7 +11,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "sync/internal_api/public/engine/model_safe_worker.h" -#include "sync/util/unrecoverable_error_info.h" +#include "sync/internal_api/public/util/unrecoverable_error_info.h" class MessageLoop; diff --git a/chrome/browser/sync/profile_sync_components_factory.h b/chrome/browser/sync/profile_sync_components_factory.h index 4646e73..1fa27b1 100644 --- a/chrome/browser/sync/profile_sync_components_factory.h +++ b/chrome/browser/sync/profile_sync_components_factory.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" -#include "sync/util/unrecoverable_error_handler.h" +#include "sync/internal_api/public/util/unrecoverable_error_handler.h" class PasswordStore; class ProfileSyncService; diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 05c684f..68658c9 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -57,11 +57,11 @@ #include "grit/generated_resources.h" #include "net/cookies/cookie_monster.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/util/experiments.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_event_details.h" #include "sync/util/cryptographer.h" -#include "sync/util/experiments.h" #include "ui/base/l10n/l10n_util.h" using browser_sync::ChangeProcessor; diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index ca623ec..91fdc76 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -35,9 +35,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/internal_api/public/util/unrecoverable_error_handler.h" #include "sync/js/sync_js_controller.h" -#include "sync/util/experiments.h" -#include "sync/util/unrecoverable_error_handler.h" class Profile; class ProfileSyncComponentsFactory; diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index 299aca0..23740cb 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -48,11 +48,11 @@ #include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.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/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/autofill_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_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index ec2ae9a..58d4ba0 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -30,12 +30,13 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "sync/api/sync_error.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/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/test/test_user_share.h" +#include "sync/internal_api/public/write_node.h" +#include "sync/internal_api/public/write_transaction.h" +#include "sync/syncable/syncable.h" // TODO(tim): Remove. Bug 131130. #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 211194a..adbefde 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -35,10 +35,10 @@ #include "content/public/browser/notification_source.h" #include "content/public/test/mock_notification_observer.h" #include "content/public/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/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 "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 6b9784c..62552c0 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -29,12 +29,12 @@ #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "sync/api/sync_data.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/read_transaction.h" #include "sync/internal_api/public/syncable/model_type.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/preference_specifics.pb.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 6bb4b0c..84d495a 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -37,12 +37,12 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.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/read_transaction.h" #include "sync/internal_api/public/syncable/model_type.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/protocol/sync.pb.h" #include "sync/syncable/syncable.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 a51c24f..1aa7064 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -38,10 +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/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/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 eae250c..cc118ce 100644 --- a/chrome/browser/sync/test/integration/enable_disable_test.cc +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc @@ -5,9 +5,9 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/profile_sync_service_harness.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/read_node.h" -#include "sync/internal_api/read_transaction.h" // This file contains tests that exercise enabling and disabling data // types. diff --git a/chrome/browser/sync/test/test_http_bridge_factory.h b/chrome/browser/sync/test/test_http_bridge_factory.h index 302528b..1f99641 100644 --- a/chrome/browser/sync/test/test_http_bridge_factory.h +++ b/chrome/browser/sync/test/test_http_bridge_factory.h @@ -7,8 +7,8 @@ #pragma once #include "base/compiler_specific.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" namespace browser_sync { diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc index 4a89b8c..9c0f3cf 100644 --- a/chrome/browser/sync/test_profile_sync_service.cc +++ b/chrome/browser/sync/test_profile_sync_service.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/test/test_http_bridge_factory.h" #include "chrome/common/chrome_notification_types.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" -#include "sync/internal_api/user_share.h" +#include "sync/internal_api/public/user_share.h" #include "sync/js/js_reply_handler.h" #include "sync/protocol/encryption.pb.h" #include "sync/syncable/syncable.h" diff --git a/chrome/browser/ui/webui/DEPS b/chrome/browser/ui/webui/DEPS index 7a768fd..7471d83 100644 --- a/chrome/browser/ui/webui/DEPS +++ b/chrome/browser/ui/webui/DEPS @@ -3,7 +3,7 @@ include_rules = [ "+js2webui/chrome/test/data", "+sync/js", - "+sync/util/weak_handle.h", + "+sync/internal_api/public/util/weak_handle.h", # Other libraries. "+third_party/angle", # For ANGLE version. diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc index 3470c1f..95717c9 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_internals_ui.cc @@ -23,10 +23,10 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "grit/sync_internals_resources.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_controller.h" #include "sync/js/js_event_details.h" -#include "sync/util/weak_handle.h" #include "ui/base/resource/resource_bundle.h" using browser_sync::JsArgList; |