diff options
Diffstat (limited to 'chrome/browser/extensions')
13 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index 346623c..7fa22ae 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h" #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 12bdc96..c2bc422 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -27,11 +27,11 @@ #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/about_handler/about_protocol_handler.h" #include "components/content_settings/core/browser/cookie_settings.h" +#include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/common/url_constants.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/api/web_request/upload_data_presenter.h" diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index cfce964..ebe5392 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index b589392..7d92e95 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -15,9 +15,9 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_paths.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/test/mock_notification_observer.h" diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc index f89098e..e76013a 100644 --- a/chrome/browser/extensions/extension_service_test_base.cc +++ b/chrome/browser/extensions/extension_service_test_base.cc @@ -16,13 +16,13 @@ #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service_mock_factory.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/syncable_prefs/pref_service_mock_factory.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 368f1af..fa027ac 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -66,7 +66,6 @@ #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/chrome_constants.h" @@ -78,10 +77,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/scoped_browser_locale.h" -#include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "components/crx_file/id_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/syncable_prefs/pref_service_syncable.h" +#include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/browser/dom_storage_context.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/indexed_db_context.h" diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc index 11e7448..22c5bb0 100644 --- a/chrome/browser/extensions/external_policy_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_loader_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" +#include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/browser/pref_names.h" diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index 9d9aed6..2d734dc 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -16,11 +16,11 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/chrome_paths.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h index 7e03758..3695a0a 100644 --- a/chrome/browser/extensions/external_pref_loader.h +++ b/chrome/browser/extensions/external_pref_loader.h @@ -12,9 +12,9 @@ #include "base/scoped_observer.h" #include "base/values.h" #include "chrome/browser/extensions/external_loader.h" -#include "chrome/browser/prefs/pref_service_syncable_observer.h" #include "chrome/browser/sync/profile_sync_service.h" #include "components/sync_driver/sync_service_observer.h" +#include "components/syncable_prefs/pref_service_syncable_observer.h" class PrefServiceSyncable; class Profile; diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc index 7a5ca87..93ef499 100644 --- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -29,6 +28,7 @@ #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager_base.h" #include "components/sync_driver/pref_names.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "components/user_manager/fake_user_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index a9773c1..58f9994 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/context_menus.h" #include "chrome/test/base/testing_profile.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/common/context_menu_params.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 7784408..0e0529e 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -18,12 +18,12 @@ #include "base/values.h" #include "chrome/browser/extensions/chrome_app_sorting.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/prefs/pref_service_mock_factory.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/common/chrome_constants.h" #include "components/crx_file/id_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/syncable_prefs/pref_service_mock_factory.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_pref_store.h" #include "extensions/browser/extension_pref_value_map.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 59052b5..837e7a9e 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -34,11 +34,11 @@ #include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/google/google_brand.h" -#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/crx_file/id_util.h" +#include "components/syncable_prefs/pref_service_syncable.h" #include "components/update_client/update_query_params.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" |