diff options
105 files changed, 277 insertions, 244 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index fdd22ec..a203210 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -21,6 +21,7 @@ include_rules = [ "+sandbox/src", # The path doesn't say it, but this is the Windows sandbox. "+skia/ext", "+skia/include", + "+sync/api", # Sync API files. "+sync/protocol", # Sync protobuf files. "+third_party/cros", "+third_party/cros_system_api", diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 6feed0a..97672b3 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -13,10 +13,10 @@ #include "base/stl_util.h" #include "base/time.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" +#include "sync/api/sync_error_factory.h" #include "sync/protocol/app_notification_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/app_notification_manager.h b/chrome/browser/extensions/app_notification_manager.h index 90b9253..21d0ff3 100644 --- a/chrome/browser/extensions/app_notification_manager.h +++ b/chrome/browser/extensions/app_notification_manager.h @@ -16,12 +16,12 @@ #include "base/synchronization/waitable_event.h" #include "chrome/browser/extensions/app_notification.h" #include "chrome/browser/extensions/app_notification_storage.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "sync/api/sync_change.h" +#include "sync/api/syncable_service.h" class PerfTimer; class Profile; diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index d311360c..8c52367 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -8,10 +8,10 @@ #include "base/string_number_conversions.h" #include "chrome/browser/extensions/app_notification.h" #include "chrome/browser/extensions/app_notification_manager.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "chrome/test/base/testing_profile.h" #include "content/test/test_browser_thread.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/app_notification_specifics.pb.h" #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc index 29f508b..0c1bdeb 100644 --- a/chrome/browser/extensions/app_sync_bundle.cc +++ b/chrome/browser/extensions/app_sync_bundle.cc @@ -7,10 +7,10 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sorting.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error_factory.h" namespace extensions { diff --git a/chrome/browser/extensions/app_sync_bundle.h b/chrome/browser/extensions/app_sync_bundle.h index 5d840c7..fd84b57 100644 --- a/chrome/browser/extensions/app_sync_bundle.h +++ b/chrome/browser/extensions/app_sync_bundle.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/app_sync_data.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" class SyncChangeProcessor; class Extension; diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc index 8145b0a..87b37c0 100644 --- a/chrome/browser/extensions/app_sync_data.cc +++ b/chrome/browser/extensions/app_sync_data.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/app_sync_data.h" -#include "chrome/browser/sync/api/sync_data.h" #include "chrome/common/extensions/extension.h" +#include "sync/api/sync_data.h" #include "sync/protocol/app_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/app_sync_data.h b/chrome/browser/extensions/app_sync_data.h index a77ef39..3bdd335 100644 --- a/chrome/browser/extensions/app_sync_data.h +++ b/chrome/browser/extensions/app_sync_data.h @@ -7,8 +7,8 @@ #pragma once #include "chrome/browser/extensions/extension_sync_data.h" -#include "chrome/browser/sync/api/sync_change.h" #include "chrome/common/string_ordinal.h" +#include "sync/api/sync_change.h" class Extension; class SyncData; diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 9b61cec..5a66ea9 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -32,14 +32,13 @@ #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/browser/download/download_extension_api.h" #include "chrome/browser/extensions/api/api_resource_controller.h" +#include "chrome/browser/extensions/api/declarative/rules_registry_service.h" +#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/apps_promo.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/crx_installer.h" -#include "chrome/browser/extensions/api/declarative/rules_registry_service.h" -#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" -#include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/default_apps_trial.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_cookies_api.h" @@ -74,8 +73,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" @@ -90,9 +87,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" @@ -107,6 +104,8 @@ #include "content/public/common/pepper_plugin_info.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_error_factory.h" #include "webkit/database/database_tracker.h" #include "webkit/database/database_util.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index f8b2148..4cc7725 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -38,14 +38,14 @@ #include "chrome/browser/extensions/process_map.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "sync/api/sync_change.h" +#include "sync/api/syncable_service.h" class AppNotificationManager; class BookmarkExtensionEventRouter; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index de10381..3963400 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -52,8 +52,6 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" @@ -80,6 +78,8 @@ #include "net/cookies/cookie_options.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/app_specifics.pb.h" #include "sync/protocol/extension_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc index 017915e..681af45 100644 --- a/chrome/browser/extensions/extension_sync_bundle.cc +++ b/chrome/browser/extensions/extension_sync_bundle.cc @@ -7,10 +7,10 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sorting.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error_factory.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h index 1ee248d..2945442 100644 --- a/chrome/browser/extensions/extension_sync_bundle.h +++ b/chrome/browser/extensions/extension_sync_bundle.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_sync_data.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" class SyncChangeProcessor; class Extension; diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc index 8d33e5c..2119bb8 100644 --- a/chrome/browser/extensions/extension_sync_data.cc +++ b/chrome/browser/extensions/extension_sync_data.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/sync/api/sync_data.h" #include "chrome/common/extensions/extension.h" +#include "sync/api/sync_data.h" #include "sync/protocol/extension_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h index cdd56ed..9dd1514 100644 --- a/chrome/browser/extensions/extension_sync_data.h +++ b/chrome/browser/extensions/extension_sync_data.h @@ -9,9 +9,9 @@ #include <string> #include "base/version.h" -#include "chrome/browser/sync/api/sync_change.h" #include "chrome/common/string_ordinal.h" #include "googleurl/src/gurl.h" +#include "sync/api/sync_change.h" class Extension; class SyncData; diff --git a/chrome/browser/extensions/settings/setting_sync_data.cc b/chrome/browser/extensions/settings/setting_sync_data.cc index 4f54052..e5329c1 100644 --- a/chrome/browser/extensions/settings/setting_sync_data.cc +++ b/chrome/browser/extensions/settings/setting_sync_data.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "chrome/browser/sync/api/sync_data.h" +#include "sync/api/sync_data.h" #include "sync/protocol/app_setting_specifics.pb.h" #include "sync/protocol/extension_setting_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/settings/setting_sync_data.h b/chrome/browser/extensions/settings/setting_sync_data.h index f1678e7..c72f386 100644 --- a/chrome/browser/extensions/settings/setting_sync_data.h +++ b/chrome/browser/extensions/settings/setting_sync_data.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/browser/sync/api/sync_change.h" +#include "sync/api/sync_change.h" class SyncData; namespace sync_pb { diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc index 1db2c80..aab4de9 100644 --- a/chrome/browser/extensions/settings/settings_apitest.cc +++ b/chrome/browser/extensions/settings/settings_apitest.cc @@ -7,18 +7,18 @@ #include "base/json/json_writer.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/settings/settings_frontend.h" #include "chrome/browser/extensions/settings/settings_namespace.h" #include "chrome/browser/extensions/settings/settings_sync_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" namespace extensions { diff --git a/chrome/browser/extensions/settings/settings_backend.cc b/chrome/browser/extensions/settings/settings_backend.cc index a20a842..fc4f982 100644 --- a/chrome/browser/extensions/settings/settings_backend.cc +++ b/chrome/browser/extensions/settings/settings_backend.cc @@ -16,9 +16,9 @@ #include "chrome/browser/extensions/settings/settings_storage_quota_enforcer.h" #include "chrome/browser/extensions/settings/settings_sync_processor.h" #include "chrome/browser/extensions/settings/settings_sync_util.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error_factory.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/settings/settings_backend.h b/chrome/browser/extensions/settings/settings_backend.h index 0c5015f..fb2c217 100644 --- a/chrome/browser/extensions/settings/settings_backend.h +++ b/chrome/browser/extensions/settings/settings_backend.h @@ -15,7 +15,7 @@ #include "chrome/browser/extensions/settings/settings_observer.h" #include "chrome/browser/extensions/settings/settings_storage_quota_enforcer.h" #include "chrome/browser/extensions/settings/syncable_settings_storage.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" class SyncErrorFactory; diff --git a/chrome/browser/extensions/settings/settings_frontend.h b/chrome/browser/extensions/settings/settings_frontend.h index bb181e4..ace81dd 100644 --- a/chrome/browser/extensions/settings/settings_frontend.h +++ b/chrome/browser/extensions/settings/settings_frontend.h @@ -17,7 +17,7 @@ #include "chrome/browser/extensions/settings/settings_namespace.h" #include "chrome/browser/extensions/settings/settings_observer.h" #include "chrome/browser/extensions/settings/settings_storage_quota_enforcer.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" class Profile; diff --git a/chrome/browser/extensions/settings/settings_sync_processor.cc b/chrome/browser/extensions/settings/settings_sync_processor.cc index 245385f..a9f95f4 100644 --- a/chrome/browser/extensions/settings/settings_sync_processor.cc +++ b/chrome/browser/extensions/settings/settings_sync_processor.cc @@ -5,9 +5,9 @@ #include "chrome/browser/extensions/settings/settings_namespace.h" #include "chrome/browser/extensions/settings/settings_sync_processor.h" #include "chrome/browser/extensions/settings/settings_sync_util.h" -#include "chrome/browser/sync/api/sync_data.h" -#include "chrome/browser/sync/api/sync_change_processor.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_data.h" #include "sync/protocol/extension_setting_specifics.pb.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/settings/settings_sync_processor.h b/chrome/browser/extensions/settings/settings_sync_processor.h index b2481cc..89f1bd8 100644 --- a/chrome/browser/extensions/settings/settings_sync_processor.h +++ b/chrome/browser/extensions/settings/settings_sync_processor.h @@ -10,7 +10,7 @@ #include <string> #include "chrome/browser/extensions/settings/setting_change.h" -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_error.h" class SyncChangeProcessor; diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc index f19c91dd..1da6745 100644 --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc @@ -17,10 +17,10 @@ #include "chrome/browser/extensions/settings/settings_test_util.h" #include "chrome/browser/extensions/settings/syncable_settings_storage.h" #include "chrome/browser/extensions/settings/testing_settings_storage.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "content/test/test_browser_thread.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/settings/settings_sync_util.h b/chrome/browser/extensions/settings/settings_sync_util.h index 1c15c27..40f6557 100644 --- a/chrome/browser/extensions/settings/settings_sync_util.h +++ b/chrome/browser/extensions/settings/settings_sync_util.h @@ -7,8 +7,8 @@ #pragma once -#include "chrome/browser/sync/api/sync_data.h" -#include "chrome/browser/sync/api/sync_change.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_data.h" namespace base { class Value; diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.cc b/chrome/browser/extensions/settings/syncable_settings_storage.cc index 32241c6..b69e1ac 100644 --- a/chrome/browser/extensions/settings/syncable_settings_storage.cc +++ b/chrome/browser/extensions/settings/syncable_settings_storage.cc @@ -8,8 +8,8 @@ #include "chrome/browser/extensions/settings/settings_namespace.h" #include "chrome/browser/extensions/settings/settings_sync_processor.h" #include "chrome/browser/extensions/settings/settings_sync_util.h" -#include "chrome/browser/sync/api/sync_data.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_data.h" #include "sync/protocol/extension_setting_specifics.pb.h" namespace extensions { diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.h b/chrome/browser/extensions/settings/syncable_settings_storage.h index 5074ee2..2de24972 100644 --- a/chrome/browser/extensions/settings/syncable_settings_storage.h +++ b/chrome/browser/extensions/settings/syncable_settings_storage.h @@ -10,11 +10,11 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list_threadsafe.h" #include "base/values.h" +#include "chrome/browser/extensions/settings/setting_sync_data.h" #include "chrome/browser/extensions/settings/settings_observer.h" #include "chrome/browser/extensions/settings/settings_storage.h" -#include "chrome/browser/extensions/settings/setting_sync_data.h" -#include "chrome/browser/sync/api/syncable_service.h" -#include "chrome/browser/sync/api/sync_change.h" +#include "sync/api/sync_change.h" +#include "sync/api/syncable_service.h" namespace extensions { diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc index 0a471d9..86d4788 100644 --- a/chrome/browser/extensions/test_extension_service.cc +++ b/chrome/browser/extensions/test_extension_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_sync_data.h" #include "chrome/browser/extensions/test_extension_service.h" -#include "chrome/browser/sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory.h" #include "testing/gtest/include/gtest/gtest.h" TestExtensionService::~TestExtensionService() {} diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index 16dc0c3..cbb3458 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -11,10 +11,10 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_error_factory.h" #include "sync/protocol/preference_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h index 6d0bb52..22ad33c 100644 --- a/chrome/browser/prefs/pref_model_associator.h +++ b/chrome/browser/prefs/pref_model_associator.h @@ -14,8 +14,8 @@ #include "base/compiler_specific.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/sync/api/syncable_service.h" -#include "chrome/browser/sync/api/sync_data.h" +#include "sync/api/sync_data.h" +#include "sync/api/syncable_service.h" namespace sync_pb { class PreferenceSpecifics; diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 2e0c264..de09247 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -33,8 +33,6 @@ #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/browser/search_engines/util.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -45,6 +43,8 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_error_factory.h" #include "sync/protocol/search_engine_specifics.pb.h" #include "sync/protocol/sync.pb.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index 68e4f12..39519b3 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -18,11 +18,11 @@ #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "sync/api/sync_change.h" +#include "sync/api/syncable_service.h" class Extension; class GURL; diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc index 46214e8..dfe9f11 100644 --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc @@ -11,8 +11,6 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -20,6 +18,8 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/search_engine_specifics.pb.h" #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller.cc b/chrome/browser/sync/glue/app_notification_data_type_controller.cc index c907110..9278b60 100644 --- a/chrome/browser/sync/glue/app_notification_data_type_controller.cc +++ b/chrome/browser/sync/glue/app_notification_data_type_controller.cc @@ -5,15 +5,15 @@ #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" #include "base/metrics/histogram.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/generic_change_processor.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_source.h" +#include "sync/api/syncable_service.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc index 98a358f0..3a1d674 100644 --- a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc @@ -9,7 +9,6 @@ #include "base/tracked_objects.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/sync/api/fake_syncable_service.h" #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/fake_generic_change_processor.h" @@ -19,6 +18,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "content/test/test_browser_thread.h" +#include "sync/api/fake_syncable_service.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc index ac24c0e..7e3cbce 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/metrics/histogram.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" +#include "sync/api/sync_error.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index be9d27d..32330a9 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -7,7 +7,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/autofill_data_type_controller.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/shared_change_processor_mock.h" @@ -21,6 +20,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/test/test_browser_thread.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc index 0c04694..c32d1bb 100644 --- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc @@ -9,8 +9,6 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/webdata/web_data_service.h" @@ -19,6 +17,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "sync/api/sync_error.h" +#include "sync/api/syncable_service.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index a6b0d7e..ed987c2 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -11,7 +11,6 @@ #include "base/message_loop.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" @@ -23,6 +22,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/test/test_browser_thread.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" using browser_sync::BookmarkDataTypeController; diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index a626265..86cac94 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -14,9 +14,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #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" diff --git a/chrome/browser/sync/glue/data_type_controller_mock.h b/chrome/browser/sync/glue/data_type_controller_mock.h index f6bae35..71e4eea 100644 --- a/chrome/browser/sync/glue/data_type_controller_mock.h +++ b/chrome/browser/sync/glue/data_type_controller_mock.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_MOCK_H__ #pragma once -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/data_type_controller.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/data_type_error_handler.h b/chrome/browser/sync/glue/data_type_error_handler.h index 5334d98..d685eff 100644 --- a/chrome/browser/sync/glue/data_type_error_handler.h +++ b/chrome/browser/sync/glue/data_type_error_handler.h @@ -9,9 +9,9 @@ #include <string> #include "base/location.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "sync/util/unrecoverable_error_handler.h" +#include "sync/api/sync_error.h" #include "sync/syncable/model_type.h" +#include "sync/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 991066f..88e05c9 100644 --- a/chrome/browser/sync/glue/data_type_manager.h +++ b/chrome/browser/sync/glue/data_type_manager.h @@ -10,8 +10,8 @@ #include <set> #include <string> -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/data_type_controller.h" +#include "sync/api/sync_error.h" #include "sync/internal_api/configure_reason.h" #include "sync/syncable/model_type.h" diff --git a/chrome/browser/sync/glue/data_type_manager_mock.h b/chrome/browser/sync/glue/data_type_manager_mock.h index 943f656..c4d69a0 100644 --- a/chrome/browser/sync/glue/data_type_manager_mock.h +++ b/chrome/browser/sync/glue/data_type_manager_mock.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_MANAGER_MOCK_H__ #pragma once -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/data_type_manager.h" #include "chrome/browser/sync/profile_sync_test_util.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" ACTION_P2(InvokeCallback, datatype, callback_result) { diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc index f29adaf0..7ce982a 100644 --- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc +++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc @@ -9,10 +9,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/generic_change_processor.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/syncable_service.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/fake_generic_change_processor.cc b/chrome/browser/sync/glue/fake_generic_change_processor.cc index e66662a..a7af21b 100644 --- a/chrome/browser/sync/glue/fake_generic_change_processor.cc +++ b/chrome/browser/sync/glue/fake_generic_change_processor.cc @@ -6,7 +6,7 @@ #include "base/location.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/fake_generic_change_processor.h b/chrome/browser/sync/glue/fake_generic_change_processor.h index c77354c..1e2cdb7 100644 --- a/chrome/browser/sync/glue/fake_generic_change_processor.h +++ b/chrome/browser/sync/glue/fake_generic_change_processor.h @@ -8,7 +8,7 @@ #include "chrome/browser/sync/glue/generic_change_processor.h" -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_error.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc index 18b6259..38a18c5 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc @@ -6,13 +6,13 @@ #include "base/logging.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" #include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error.h" #include "sync/syncable/model_type.h" #include "sync/util/data_type_histogram.h" diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h index ac6852c..5c822f3 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h +++ b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_GLUE_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__ #pragma once -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/frontend_data_type_controller.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index 3317c89..a8accd9 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -7,10 +7,10 @@ #include "base/location.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#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 "content/public/browser/browser_thread.h" +#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" diff --git a/chrome/browser/sync/glue/generic_change_processor.h b/chrome/browser/sync/glue/generic_change_processor.h index 6b9d205..a14da71 100644 --- a/chrome/browser/sync/glue/generic_change_processor.h +++ b/chrome/browser/sync/glue/generic_change_processor.h @@ -11,10 +11,10 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "chrome/browser/sync/api/sync_change_processor.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "sync/api/sync_change_processor.h" class SyncData; class SyncableService; diff --git a/chrome/browser/sync/glue/model_associator.h b/chrome/browser/sync/glue/model_associator.h index 0811a79..5931488 100644 --- a/chrome/browser/sync/glue/model_associator.h +++ b/chrome/browser/sync/glue/model_associator.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/synchronization/lock.h" -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_error.h" #include "sync/syncable/model_type.h" namespace sync_api { diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/chrome/browser/sync/glue/model_associator_mock.h index 5b19ca7..7697705 100644 --- a/chrome/browser/sync/glue/model_associator_mock.h +++ b/chrome/browser/sync/glue/model_associator_mock.h @@ -7,8 +7,8 @@ #pragma once #include "base/location.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/model_associator.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc index d635660..c0c9dbd 100644 --- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc @@ -5,12 +5,12 @@ #include "chrome/browser/sync/glue/new_non_frontend_data_type_controller.h" #include "base/logging.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/shared_change_processor_ref.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error.h" +#include "sync/api/syncable_service.h" #include "sync/syncable/model_type.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h index 820b6e6..b6f6aae 100644 --- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h +++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_GLUE_NEW_NON_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H_ #pragma once -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/new_non_frontend_data_type_controller.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc index eeea983..dfc8292 100644 --- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc @@ -13,7 +13,6 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/tracked_objects.h" -#include "chrome/browser/sync/api/fake_syncable_service.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h" #include "chrome/browser/sync/glue/shared_change_processor_mock.h" @@ -21,6 +20,7 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" #include "content/test/test_browser_thread.h" +#include "sync/api/fake_syncable_service.h" #include "sync/engine/model_safe_worker.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc index 4b1cd92..ec4efea 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc @@ -9,13 +9,13 @@ #include "base/logging.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" #include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error.h" #include "sync/syncable/model_type.h" #include "sync/util/data_type_histogram.h" diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h index 86ac893..bc7a8cd 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__ #pragma once -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" +#include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/password_data_type_controller.cc b/chrome/browser/sync/glue/password_data_type_controller.cc index e0f58b4..54aa4609 100644 --- a/chrome/browser/sync/glue/password_data_type_controller.cc +++ b/chrome/browser/sync/glue/password_data_type_controller.cc @@ -9,11 +9,11 @@ #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc index 75820eb..6565c27 100644 --- a/chrome/browser/sync/glue/password_model_associator.cc +++ b/chrome/browser/sync/glue/password_model_associator.cc @@ -10,9 +10,9 @@ #include "base/stl_util.h" #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/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" diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller.cc b/chrome/browser/sync/glue/search_engine_data_type_controller.cc index 16728cc..1b81ff1 100644 --- a/chrome/browser/sync/glue/search_engine_data_type_controller.cc +++ b/chrome/browser/sync/glue/search_engine_data_type_controller.cc @@ -8,11 +8,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_source.h" +#include "sync/api/syncable_service.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc index 897bfe6..2a3c91d 100644 --- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc @@ -9,7 +9,6 @@ #include "base/tracked_objects.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" -#include "chrome/browser/sync/api/fake_syncable_service.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/fake_generic_change_processor.h" #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" @@ -18,6 +17,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/profile_mock.h" #include "content/public/browser/notification_service.h" +#include "sync/api/fake_syncable_service.h" #include "testing/gtest/include/gtest/gtest.h" using testing::_; diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc index cf146c8..9d82755 100644 --- a/chrome/browser/sync/glue/session_change_processor.cc +++ b/chrome/browser/sync/glue/session_change_processor.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/history/history_notifications.h" #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/profile_sync_service.h" #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h" @@ -23,6 +22,7 @@ #include "content/public/browser/notification_service.h" #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/read_node.h" #include "sync/protocol/session_specifics.pb.h" diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index af58629..b6f8648 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/chrome/browser/sync/glue/session_model_associator.cc @@ -17,7 +17,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/browser/sync/api/sync_error.h" #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" @@ -29,6 +28,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_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" diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc index 2eed84a7..a75b355 100644 --- a/chrome/browser/sync/glue/shared_change_processor.cc +++ b/chrome/browser/sync/glue/shared_change_processor.cc @@ -4,11 +4,11 @@ #include "chrome/browser/sync/glue/shared_change_processor.h" -#include "chrome/browser/sync/api/sync_change.h" #include "chrome/browser/sync/glue/generic_change_processor.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_change.h" using base::AutoLock; using content::BrowserThread; diff --git a/chrome/browser/sync/glue/shared_change_processor.h b/chrome/browser/sync/glue/shared_change_processor.h index 17e24a1..e172ec9 100644 --- a/chrome/browser/sync/glue/shared_change_processor.h +++ b/chrome/browser/sync/glue/shared_change_processor.h @@ -11,10 +11,10 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error.h" +#include "sync/api/sync_error_factory.h" #include "sync/engine/model_safe_worker.h" class ProfileSyncComponentsFactory; diff --git a/chrome/browser/sync/glue/shared_change_processor_mock.h b/chrome/browser/sync/glue/shared_change_processor_mock.h index b373364..60219c0 100644 --- a/chrome/browser/sync/glue/shared_change_processor_mock.h +++ b/chrome/browser/sync/glue/shared_change_processor_mock.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_GLUE_SHARED_CHANGE_PROCESSOR_MOCK_H_ #pragma once -#include "chrome/browser/sync/api/sync_change.h" #include "chrome/browser/sync/glue/shared_change_processor.h" +#include "sync/api/sync_change.h" #include "sync/util/unrecoverable_error_handler.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/glue/shared_change_processor_ref.h b/chrome/browser/sync/glue/shared_change_processor_ref.h index 6b79769..98185fc 100644 --- a/chrome/browser/sync/glue/shared_change_processor_ref.h +++ b/chrome/browser/sync/glue/shared_change_processor_ref.h @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/sync/glue/shared_change_processor.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_error_factory.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/shared_change_processor_unittest.cc b/chrome/browser/sync/glue/shared_change_processor_unittest.cc index 8279cdf..1812eb2 100644 --- a/chrome/browser/sync/glue/shared_change_processor_unittest.cc +++ b/chrome/browser/sync/glue/shared_change_processor_unittest.cc @@ -10,12 +10,12 @@ #include "base/bind_helpers.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "chrome/browser/sync/api/fake_syncable_service.h" -#include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/glue/data_type_error_handler_mock.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" +#include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "content/test/test_browser_thread.h" +#include "sync/api/fake_syncable_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc index 99e0970..8ea538a3 100644 --- a/chrome/browser/sync/glue/theme_model_associator.cc +++ b/chrome/browser/sync/glue/theme_model_associator.cc @@ -8,10 +8,10 @@ #include "base/location.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#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/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" diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc index 3e659f6..ad90e63 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator.cc @@ -12,8 +12,8 @@ #include "base/metrics/histogram.h" #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/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" diff --git a/chrome/browser/sync/glue/ui_data_type_controller.cc b/chrome/browser/sync/glue/ui_data_type_controller.cc index 9066034..bcb1d61 100644 --- a/chrome/browser/sync/glue/ui_data_type_controller.cc +++ b/chrome/browser/sync/glue/ui_data_type_controller.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/shared_change_processor_ref.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/sync_error.h" +#include "sync/api/syncable_service.h" #include "sync/syncable/model_type.h" #include "sync/util/data_type_histogram.h" diff --git a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc index 4a99e9b..f552a1e 100644 --- a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc @@ -8,13 +8,13 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/tracked_objects.h" -#include "chrome/browser/sync/api/fake_syncable_service.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/fake_generic_change_processor.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" #include "content/test/test_browser_thread.h" +#include "sync/api/fake_syncable_service.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index f3f5e0d..07e6ffd 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -15,7 +15,6 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" #include "chrome/browser/sync/glue/autofill_data_type_controller.h" #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" @@ -51,6 +50,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "sync/api/syncable_service.h" using browser_sync::AppNotificationDataTypeController; using browser_sync::AutofillDataTypeController; diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 3e60514..fe3f3f7 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -30,7 +30,6 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/backend_migrator.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/chrome_encryptor.h" @@ -57,6 +56,7 @@ #include "content/public/browser/notification_source.h" #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/js/js_arg_list.h" #include "sync/js/js_event_details.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 856e85f..21aa923 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -22,7 +22,6 @@ #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" -#include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/bookmark_change_processor.h" #include "chrome/browser/sync/glue/bookmark_model_associator.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" @@ -30,6 +29,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" #include "content/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" diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index efd63db..618ccbd 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" -#include "chrome/browser/sync/api/sync_data.h" #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" @@ -29,6 +28,7 @@ #include "chrome/common/pref_names.h" #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/read_node.h" #include "sync/internal_api/read_transaction.h" diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc index fc9fe10..0110c3e 100644 --- a/chrome/browser/webdata/autocomplete_syncable_service.cc +++ b/chrome/browser/webdata/autocomplete_syncable_service.cc @@ -9,8 +9,6 @@ #include "base/rand_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/webdata/autofill_table.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/webdata/web_database.h" @@ -19,6 +17,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/escape.h" +#include "sync/api/sync_error.h" +#include "sync/api/sync_error_factory.h" #include "sync/protocol/autofill_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/webdata/autocomplete_syncable_service.h b/chrome/browser/webdata/autocomplete_syncable_service.h index 84d35fa..d4ecbc6 100644 --- a/chrome/browser/webdata/autocomplete_syncable_service.h +++ b/chrome/browser/webdata/autocomplete_syncable_service.h @@ -14,15 +14,15 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_data.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_entry.h" #include "chrome/browser/webdata/web_data_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_data.h" +#include "sync/api/sync_error.h" +#include "sync/api/syncable_service.h" class ProfileSyncServiceAutofillTest; class SyncErrorFactory; diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc index f65327a..867bb16 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc @@ -10,8 +10,6 @@ #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/form_group.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/sync_error_factory.h" #include "chrome/browser/webdata/autofill_table.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/webdata/web_database.h" @@ -20,6 +18,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "sync/api/sync_error.h" +#include "sync/api/sync_error_factory.h" #include "sync/protocol/sync.pb.h" using content::BrowserThread; diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h index db3aa5c..2da706c 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.h +++ b/chrome/browser/webdata/autofill_profile_syncable_service.h @@ -14,15 +14,15 @@ #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/autofill/autofill_type.h" -#include "chrome/browser/sync/api/sync_change.h" -#include "chrome/browser/sync/api/sync_data.h" -#include "chrome/browser/sync/api/sync_error.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_entry.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "sync/api/sync_change.h" +#include "sync/api/sync_data.h" +#include "sync/api/sync_error.h" +#include "sync/api/syncable_service.h" #include "sync/protocol/autofill_specifics.pb.h" class AutofillProfile; diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc index 455340e..6ae8d90 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc @@ -6,11 +6,11 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_profile.h" -#include "chrome/browser/sync/api/sync_error_factory.h" -#include "chrome/browser/sync/api/sync_error_factory_mock.h" #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_profile_syncable_service.h" #include "content/test/test_browser_thread.h" +#include "sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/syncable/syncable.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 52cd0bb..610a8d4 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -264,43 +264,6 @@ ], }, { - # Provides the API that Chrome services use to talk to sync. - 'target_name': 'syncapi_service', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'sources': [ - 'browser/sync/api/syncable_service.cc', - 'browser/sync/api/syncable_service.h', - 'browser/sync/api/sync_data.h', - 'browser/sync/api/sync_data.cc', - 'browser/sync/api/sync_change.h', - 'browser/sync/api/sync_change.cc', - 'browser/sync/api/sync_change_processor.h', - 'browser/sync/api/sync_change_processor.cc', - 'browser/sync/api/sync_error.h', - 'browser/sync/api/sync_error.cc', - 'browser/sync/api/sync_error_factory.h', - 'browser/sync/api/sync_error_factory.cc', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../sync/protocol/sync_proto.gyp:sync_proto', - '../sync/sync.gyp:sync', - ], - 'export_dependent_settings': [ - '../base/base.gyp:base', - '../sync/protocol/sync_proto.gyp:sync_proto', - '../sync/sync.gyp:sync', - ], - # Even though this target depends on sync_proto, it doesn't - # need to export a hard dependency since we explicitly avoid - # including the generated proto header files from this target's - # header files. - }, - { 'target_name': 'service', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index bb5af91..c010b72 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -28,7 +28,6 @@ 'installer_util', 'safe_browsing_proto', 'safe_browsing_report_proto', - 'syncapi_service', 'feedback_proto', 'gdata_proto', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -39,7 +38,9 @@ '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', + # TODO(akalin): Depend only on syncapi_service from sync. '../sync/sync.gyp:syncapi_core', + '../sync/sync.gyp:syncapi_service', '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', '../third_party/bzip2/bzip2.gyp:bzip2', '../third_party/cld/cld.gyp:cld', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 23c6a82..ff3238c 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -356,27 +356,6 @@ ], }, { - 'target_name': 'test_support_syncapi_service', - 'type': 'static_library', - 'dependencies': [ - '../testing/gmock.gyp:gmock', - 'syncapi_service', - ], - 'export_dependent_settings': [ - '../testing/gmock.gyp:gmock', - 'syncapi_service', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'browser/sync/api/fake_syncable_service.cc', - 'browser/sync/api/fake_syncable_service.h', - 'browser/sync/api/sync_error_factory_mock.cc', - 'browser/sync/api/sync_error_factory_mock.h', - ], - }, - { 'target_name': 'test_support_unit', 'type': 'static_library', 'dependencies': [ @@ -956,7 +935,7 @@ '../sync/sync.gyp:test_support_sync', '../sync/sync.gyp:test_support_sync_notifier', '../sync/sync.gyp:test_support_syncapi_core', - 'test_support_syncapi_service', + '../sync/sync.gyp:test_support_syncapi_service', 'test_support_unit', # 3) anything tests directly depend on '../skia/skia.gyp:skia', @@ -1506,8 +1485,6 @@ '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', @@ -2567,13 +2544,13 @@ 'common/extensions/api/api.gyp:api', 'renderer', 'test_support_common', - 'test_support_syncapi_service', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', + '../sync/sync.gyp:test_support_syncapi_service', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cld/cld.gyp:cld', diff --git a/chrome/browser/sync/api/DEPS b/sync/api/DEPS index 4a424713..157d02f 100644 --- a/chrome/browser/sync/api/DEPS +++ b/sync/api/DEPS @@ -1,10 +1,6 @@ include_rules = [ - "-chrome", - - "+chrome/browser/sync/api", "+sync/internal_api/base_node.h", "+sync/protocol", "+sync/syncable/model_type.h", "+sync/util/immutable.h", ] - diff --git a/chrome/browser/sync/api/fake_syncable_service.cc b/sync/api/fake_syncable_service.cc index 7082577..f5738eb 100644 --- a/chrome/browser/sync/api/fake_syncable_service.cc +++ b/sync/api/fake_syncable_service.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/api/fake_syncable_service.h" -#include "chrome/browser/sync/api/sync_error_factory.h" +#include "sync/api/fake_syncable_service.h" #include "base/location.h" +#include "sync/api/sync_error_factory.h" FakeSyncableService::FakeSyncableService() : syncing_(false), diff --git a/chrome/browser/sync/api/fake_syncable_service.h b/sync/api/fake_syncable_service.h index 3080a630..9f10a65 100644 --- a/chrome/browser/sync/api/fake_syncable_service.h +++ b/sync/api/fake_syncable_service.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_API_FAKE_SYNCABLE_SERVICE_H_ -#define CHROME_BROWSER_SYNC_API_FAKE_SYNCABLE_SERVICE_H_ +#ifndef SYNC_API_FAKE_SYNCABLE_SERVICE_H_ +#define SYNC_API_FAKE_SYNCABLE_SERVICE_H_ #pragma once -#include "chrome/browser/sync/api/syncable_service.h" +#include "sync/api/syncable_service.h" class SyncErrorFactory; @@ -45,4 +45,4 @@ class FakeSyncableService : public SyncableService { syncable::ModelType type_; }; -#endif // CHROME_BROWSER_SYNC_API_FAKE_SYNCABLE_SERVICE_H_ +#endif // SYNC_API_FAKE_SYNCABLE_SERVICE_H_ diff --git a/chrome/browser/sync/api/sync_change.cc b/sync/api/sync_change.cc index 04be0a2..627c19b 100644 --- a/chrome/browser/sync/api/sync_change.cc +++ b/sync/api/sync_change.cc @@ -1,8 +1,8 @@ -// 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/api/sync_change.h" +#include "sync/api/sync_change.h" #include <ostream> diff --git a/chrome/browser/sync/api/sync_change.h b/sync/api/sync_change.h index 1b9787a..19218f5 100644 --- a/chrome/browser/sync/api/sync_change.h +++ b/sync/api/sync_change.h @@ -1,16 +1,16 @@ -// 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_API_SYNC_CHANGE_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_CHANGE_H_ +#ifndef SYNC_API_SYNC_CHANGE_H_ +#define SYNC_API_SYNC_CHANGE_H_ #pragma once #include <iosfwd> #include <string> #include <vector> -#include "chrome/browser/sync/api/sync_data.h" +#include "sync/api/sync_data.h" // A SyncChange object reflects a change to a piece of synced data. The change // can be either a delete, add, or an update. All data relevant to the change @@ -64,4 +64,4 @@ class SyncChange { // gmock printer helper. void PrintTo(const SyncChange& sync_change, std::ostream* os); -#endif // CHROME_BROWSER_SYNC_API_SYNC_CHANGE_H_ +#endif // SYNC_API_SYNC_CHANGE_H_ diff --git a/chrome/browser/sync/api/sync_change_processor.cc b/sync/api/sync_change_processor.cc index 588d17a..74e6401 100644 --- a/chrome/browser/sync/api/sync_change_processor.cc +++ b/sync/api/sync_change_processor.cc @@ -1,8 +1,8 @@ -// 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/api/sync_change_processor.h" +#include "sync/api/sync_change_processor.h" SyncChangeProcessor::SyncChangeProcessor() {} diff --git a/chrome/browser/sync/api/sync_change_processor.h b/sync/api/sync_change_processor.h index a68dc59..1eed159 100644 --- a/chrome/browser/sync/api/sync_change_processor.h +++ b/sync/api/sync_change_processor.h @@ -1,14 +1,14 @@ -// 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_API_SYNC_CHANGE_PROCESSOR_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_CHANGE_PROCESSOR_H_ +#ifndef SYNC_API_SYNC_CHANGE_PROCESSOR_H_ +#define SYNC_API_SYNC_CHANGE_PROCESSOR_H_ #pragma once #include <vector> -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_error.h" class SyncChange; @@ -37,4 +37,4 @@ class SyncChangeProcessor { protected: }; -#endif // CHROME_BROWSER_SYNC_API_SYNC_CHANGE_PROCESSOR_H_ +#endif // SYNC_API_SYNC_CHANGE_PROCESSOR_H_ diff --git a/chrome/browser/sync/api/sync_change_unittest.cc b/sync/api/sync_change_unittest.cc index 2480ffe..263abdd 100644 --- a/chrome/browser/sync/api/sync_change_unittest.cc +++ b/sync/api/sync_change_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/api/sync_change.h" +#include "sync/api/sync_change.h" #include <string> diff --git a/chrome/browser/sync/api/sync_data.cc b/sync/api/sync_data.cc index e3e3dcd..679c547 100644 --- a/chrome/browser/sync/api/sync_data.cc +++ b/sync/api/sync_data.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/api/sync_data.h" +#include "sync/api/sync_data.h" #include <ostream> diff --git a/chrome/browser/sync/api/sync_data.h b/sync/api/sync_data.h index 3fcc738..cef132b 100644 --- a/chrome/browser/sync/api/sync_data.h +++ b/sync/api/sync_data.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_API_SYNC_DATA_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_DATA_H_ +#ifndef SYNC_API_SYNC_DATA_H_ +#define SYNC_API_SYNC_DATA_H_ #pragma once #include <iosfwd> @@ -118,4 +118,4 @@ class SyncData { // gmock printer helper. void PrintTo(const SyncData& sync_data, std::ostream* os); -#endif // CHROME_BROWSER_SYNC_API_SYNC_DATA_H_ +#endif // SYNC_API_SYNC_DATA_H_ diff --git a/chrome/browser/sync/api/sync_error.cc b/sync/api/sync_error.cc index b48e5bc..49bf74b 100644 --- a/chrome/browser/sync/api/sync_error.cc +++ b/sync/api/sync_error.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/api/sync_error.h" +#include "sync/api/sync_error.h" #include <ostream> diff --git a/chrome/browser/sync/api/sync_error.h b/sync/api/sync_error.h index 95a2206..2b6dc93 100644 --- a/chrome/browser/sync/api/sync_error.h +++ b/sync/api/sync_error.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_API_SYNC_ERROR_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_ERROR_H_ +#ifndef SYNC_API_SYNC_ERROR_H_ +#define SYNC_API_SYNC_ERROR_H_ #pragma once #include <iosfwd> @@ -82,4 +82,4 @@ class SyncError { // gmock printer helper. void PrintTo(const SyncError& sync_error, std::ostream* os); -#endif // CHROME_BROWSER_SYNC_API_SYNC_ERROR_H_ +#endif // SYNC_API_SYNC_ERROR_H_ diff --git a/chrome/browser/sync/api/sync_error_factory.cc b/sync/api/sync_error_factory.cc index efc3627..0e9b451 100644 --- a/chrome/browser/sync/api/sync_error_factory.cc +++ b/sync/api/sync_error_factory.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/api/sync_error_factory.h" +#include "sync/api/sync_error_factory.h" SyncErrorFactory::SyncErrorFactory() { } diff --git a/chrome/browser/sync/api/sync_error_factory.h b/sync/api/sync_error_factory.h index 05ea918..72f317e 100644 --- a/chrome/browser/sync/api/sync_error_factory.h +++ b/sync/api/sync_error_factory.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_API_SYNC_ERROR_FACTORY_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_ERROR_FACTORY_H_ +#ifndef SYNC_API_SYNC_ERROR_FACTORY_H_ +#define SYNC_API_SYNC_ERROR_FACTORY_H_ #pragma once #include <string> #include "base/location.h" -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_error.h" class SyncErrorFactory { public: @@ -22,5 +22,5 @@ class SyncErrorFactory { const std::string& message) = 0; }; -#endif // CHROME_BROWSER_SYNC_API_SYNC_ERROR_FACTORY_H_ +#endif // SYNC_API_SYNC_ERROR_FACTORY_H_ diff --git a/chrome/browser/sync/api/sync_error_factory_mock.cc b/sync/api/sync_error_factory_mock.cc index edb1092..e730b88 100644 --- a/chrome/browser/sync/api/sync_error_factory_mock.cc +++ b/sync/api/sync_error_factory_mock.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/api/sync_error_factory_mock.h" +#include "sync/api/sync_error_factory_mock.h" SyncErrorFactoryMock::SyncErrorFactoryMock() { } diff --git a/chrome/browser/sync/api/sync_error_factory_mock.h b/sync/api/sync_error_factory_mock.h index 555b7b9..6fc58074 100644 --- a/chrome/browser/sync/api/sync_error_factory_mock.h +++ b/sync/api/sync_error_factory_mock.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_API_SYNC_ERROR_FACTORY_MOCK_H_ -#define CHROME_BROWSER_SYNC_API_SYNC_ERROR_FACTORY_MOCK_H_ +#ifndef SYNC_API_SYNC_ERROR_FACTORY_MOCK_H_ +#define SYNC_API_SYNC_ERROR_FACTORY_MOCK_H_ #pragma once -#include "chrome/browser/sync/api/sync_error_factory.h" +#include "sync/api/sync_error_factory.h" #include "testing/gmock/include/gmock/gmock.h" @@ -20,4 +20,4 @@ class SyncErrorFactoryMock : public SyncErrorFactory { const std::string& message)); }; -#endif // CHROME_BROWSER_SYNC_API_SYNC_ERROR_FACTORY_MOCK_H_ +#endif // SYNC_API_SYNC_ERROR_FACTORY_MOCK_H_ diff --git a/chrome/browser/sync/api/sync_error_unittest.cc b/sync/api/sync_error_unittest.cc index a1f3c71..c700db55 100644 --- a/chrome/browser/sync/api/sync_error_unittest.cc +++ b/sync/api/sync_error_unittest.cc @@ -1,8 +1,8 @@ -// 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/api/sync_error.h" +#include "sync/api/sync_error.h" #include <string> diff --git a/chrome/browser/sync/api/syncable_service.cc b/sync/api/syncable_service.cc index f94a857..198173a 100644 --- a/chrome/browser/sync/api/syncable_service.cc +++ b/sync/api/syncable_service.cc @@ -1,7 +1,7 @@ -// 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/api/syncable_service.h" +#include "sync/api/syncable_service.h" SyncableService::~SyncableService() {} diff --git a/chrome/browser/sync/api/syncable_service.h b/sync/api/syncable_service.h index 800bdc3..bfcab3a 100644 --- a/chrome/browser/sync/api/syncable_service.h +++ b/sync/api/syncable_service.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_API_SYNCABLE_SERVICE_H_ -#define CHROME_BROWSER_SYNC_API_SYNCABLE_SERVICE_H_ +#ifndef SYNC_API_SYNCABLE_SERVICE_H_ +#define SYNC_API_SYNCABLE_SERVICE_H_ #pragma once #include <vector> @@ -11,9 +11,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/sync/api/sync_change_processor.h" -#include "chrome/browser/sync/api/sync_data.h" -#include "chrome/browser/sync/api/sync_error.h" +#include "sync/api/sync_change_processor.h" +#include "sync/api/sync_data.h" +#include "sync/api/sync_error.h" #include "sync/syncable/model_type.h" class SyncErrorFactory; @@ -62,4 +62,4 @@ class SyncableService : public SyncChangeProcessor, virtual ~SyncableService(); }; -#endif // CHROME_BROWSER_SYNC_API_SYNCABLE_SERVICE_H_ +#endif // SYNC_API_SYNCABLE_SERVICE_H_ diff --git a/sync/sync.gyp b/sync/sync.gyp index 97d493e..ba97a47 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -299,6 +299,39 @@ ], }, + # The sync external API library. + { + 'target_name': 'syncapi_service', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'protocol/sync_proto.gyp:sync_proto', + 'sync', + ], + # Even though this target depends on sync_proto, it doesn't + # need to export a hard dependency since we explicitly avoid + # including the generated proto header files from this target's + # header files. + 'sources': [ + 'api/syncable_service.cc', + 'api/syncable_service.h', + 'api/sync_data.h', + 'api/sync_data.cc', + 'api/sync_change.h', + 'api/sync_change.cc', + 'api/sync_change_processor.h', + 'api/sync_change_processor.cc', + 'api/sync_error.h', + 'api/sync_error.cc', + 'api/sync_error_factory.h', + 'api/sync_error_factory.cc', + ], + }, + # Test support files for the 'sync' target. { 'target_name': 'test_support_sync', @@ -405,6 +438,29 @@ ], }, + # Test support files for the 'syncapi_service' target. + { + 'target_name': 'test_support_syncapi_service', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../testing/gmock.gyp:gmock', + 'syncapi_service', + ], + 'export_dependent_settings': [ + '../testing/gmock.gyp:gmock', + 'syncapi_service', + ], + 'sources': [ + 'api/fake_syncable_service.cc', + 'api/fake_syncable_service.h', + 'api/sync_error_factory_mock.cc', + 'api/sync_error_factory_mock.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 @@ -593,6 +649,45 @@ }, }, + # Unit tests for the 'syncapi_service' 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_service_tests', + 'type': 'none', + # We only want unit test executables to include this target. + 'suppress_wildcard': 1, + 'dependencies': [ + '../base/base.gyp:base', + '../testing/gtest.gyp:gtest', + 'protocol/sync_proto.gyp:sync_proto', + 'sync', + 'syncapi_service', + 'test_support_syncapi_service', + ], + # Propagate all dependencies since the actual compilation + # happens in the dependents. + 'export_dependent_settings': [ + '../base/base.gyp:base', + '../testing/gtest.gyp:gtest', + 'protocol/sync_proto.gyp:sync_proto', + 'sync', + 'syncapi_service', + 'test_support_syncapi_service', + ], + 'direct_dependent_settings': { + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'include_dirs': [ + '..', + ], + 'sources': [ + 'api/sync_change_unittest.cc', + 'api/sync_error_unittest.cc', + ], + }, + }, + # The unit test executable for sync tests. { 'target_name': 'sync_unit_tests', @@ -602,6 +697,7 @@ 'sync_tests', 'sync_notifier_tests', 'syncapi_core_tests', + 'syncapi_service_tests', ], # TODO(akalin): This is needed because histogram.cc uses # leak_annotations.h, which pulls this in. Make 'base' |