diff options
191 files changed, 265 insertions, 194 deletions
@@ -5,7 +5,7 @@ include_rules = [ "+content/public/common", "+content/public/test", "+components/keyed_service", - "+components/user_prefs/pref_registry_syncable.h", + "+components/pref_registry/pref_registry_syncable.h", "+components/web_modal", "+extensions", "+net/base", diff --git a/apps/prefs.cc b/apps/prefs.cc index 7c98bc8..0521a5c 100644 --- a/apps/prefs.cc +++ b/apps/prefs.cc @@ -6,7 +6,7 @@ #include "apps/pref_names.h" #include "base/prefs/pref_registry_simple.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace apps { diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index a0634f8..4e5e22f 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -71,6 +71,8 @@ '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_prefs_test_support', + '<(DEPTH)/components/components.gyp:pref_registry', + '<(DEPTH)/components/components.gyp:user_prefs', '<(DEPTH)/content/content.gyp:content', '<(DEPTH)/content/content.gyp:content_gpu', '<(DEPTH)/content/content.gyp:content_ppapi_plugin', diff --git a/apps/shell/browser/DEPS b/apps/shell/browser/DEPS index 9d8d30b..a803ec5 100644 --- a/apps/shell/browser/DEPS +++ b/apps/shell/browser/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chromeos", + "+components/pref_registry", "+components/user_prefs", "+third_party/cros_system_api", diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc index 343f6b5..6e8f3ef 100644 --- a/apps/shell/browser/shell_extensions_browser_client.cc +++ b/apps/shell/browser/shell_extensions_browser_client.cc @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h" #include "base/prefs/testing_pref_store.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "extensions/browser/api/extensions_api_client.h" #include "extensions/browser/app_sorting.h" diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index e764055..b6f8b83 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -36,6 +36,7 @@ include_rules = [ "+components/password_manager", "+components/policy", "+components/precache", + "+components/pref_registry", "+components/query_parser", "+components/rappor", "+components/search_provider_logos", diff --git a/chrome/browser/accessibility/invert_bubble_prefs.cc b/chrome/browser/accessibility/invert_bubble_prefs.cc index a295cf4..3570c19 100644 --- a/chrome/browser/accessibility/invert_bubble_prefs.cc +++ b/chrome/browser/accessibility/invert_bubble_prefs.cc @@ -5,7 +5,7 @@ #include "chrome/browser/accessibility/invert_bubble_prefs.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace chrome { diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc index fd8609e..79ea0c7 100644 --- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc +++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/bookmarks/core/browser/bookmark_model.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/android/new_tab_page_prefs.cc b/chrome/browser/android/new_tab_page_prefs.cc index 8da809a..0358fb0 100644 --- a/chrome/browser/android/new_tab_page_prefs.cc +++ b/chrome/browser/android/new_tab_page_prefs.cc @@ -11,7 +11,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_android.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "jni/NewTabPagePrefs_jni.h" using base::android::ConvertJavaStringToUTF8; diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 6f1833e..7d0622f 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -33,7 +33,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc index 326722c..e909e82 100644 --- a/chrome/browser/apps/shortcut_manager.cc +++ b/chrome/browser/apps/shortcut_manager.cc @@ -20,7 +20,7 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index 5f0e1b0..723622b 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -32,7 +32,7 @@ #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/user_metrics.h" #include "net/base/escape.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/background/background_contents_service_factory.cc b/chrome/browser/background/background_contents_service_factory.cc index bbc7453..e032664 100644 --- a/chrome/browser/background/background_contents_service_factory.cc +++ b/chrome/browser/background/background_contents_service_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static BackgroundContentsService* BackgroundContentsServiceFactory::GetForProfile( diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc index 0b068fe..6f8e1f4 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -22,7 +22,7 @@ #include "components/bookmarks/core/browser/bookmark_model.h" #include "components/bookmarks/core/common/bookmark_pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" // static diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index a1907c8..b7ee7ab 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -105,9 +105,9 @@ #include "components/nacl/browser/nacl_process_host.h" #include "components/nacl/common/nacl_process_type.h" #include "components/nacl/common/nacl_switches.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/translate/core/common/translate_switches.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/browser_ppapi_host.h" diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc index 0adda12..76c4e2a 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc @@ -24,7 +24,7 @@ #include "chromeos/cryptohome/async_method_caller.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 07304d5..1c7bcd9 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -39,7 +39,7 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/system/statistics_provider.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/http/http_response_headers.h" diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc index cb91510..1760fe5 100644 --- a/chrome/browser/chromeos/customization_document_unittest.cc +++ b/chrome/browser/chromeos/customization_document_unittest.cc @@ -20,7 +20,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/network/network_handler.h" #include "chromeos/system/mock_statistics_provider.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc index b6f9aab..a0fcc8f 100644 --- a/chrome/browser/chromeos/first_run/first_run.cc +++ b/chrome/browser/chromeos/first_run/first_run.cc @@ -12,7 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc index 78ea772..c09d302 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc @@ -16,7 +16,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc index beefccd..936c479 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/net/proxy_config_handler.cc b/chrome/browser/chromeos/net/proxy_config_handler.cc index 1cefa22..66b6d58 100644 --- a/chrome/browser/chromeos/net/proxy_config_handler.cc +++ b/chrome/browser/chromeos/net/proxy_config_handler.cc @@ -19,7 +19,7 @@ #include "chromeos/network/network_profile.h" #include "chromeos/network/network_profile_handler.h" #include "chromeos/network/network_state_handler.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "dbus/object_path.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc index 9e37f44..dcfd083 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc @@ -18,7 +18,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace policy { diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc index 6009f6a..d22a6e1 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc @@ -23,7 +23,7 @@ #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/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/chromeos/power/power_prefs.cc b/chrome/browser/chromeos/power/power_prefs.cc index 33de5c5..2e853a3 100644 --- a/chrome/browser/chromeos/power/power_prefs.cc +++ b/chrome/browser/chromeos/power/power_prefs.cc @@ -17,7 +17,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" #include "chromeos/dbus/power_policy_controller.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc index a328919..ff879e4 100644 --- a/chrome/browser/chromeos/power/power_prefs_unittest.cc +++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc @@ -27,7 +27,7 @@ #include "chromeos/dbus/fake_power_manager_client.h" #include "chromeos/dbus/power_manager/policy.pb.h" #include "chromeos/dbus/power_policy_controller.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index dbf1014..807cd29 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -37,7 +37,7 @@ #include "chromeos/ime/input_method_manager.h" #include "chromeos/system/statistics_provider.h" #include "components/feedback/tracing_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/events/event_constants.h" #include "ui/events/event_utils.h" diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc index ab02c74..4580163 100644 --- a/chrome/browser/chromeos/preferences_unittest.cc +++ b/chrome/browser/chromeos/preferences_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index c88f298..9f27879 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -19,7 +19,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc index 41ae3fb..13198e5 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider.cc @@ -15,7 +15,7 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index 4e46cca..0eaf685 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -22,7 +22,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index 9f91056..395693a 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -26,7 +26,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc index aea4961..146b221 100644 --- a/chrome/browser/content_settings/cookie_settings.cc +++ b/chrome/browser/content_settings/cookie_settings.cc @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/keyed_service.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 27d656d..a1ff14c 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -29,7 +29,7 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 3ceffb0..7043681 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -17,7 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/custom_handlers/protocol_handler.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/child_process_security_policy.h" #include "grit/generated_resources.h" #include "net/base/network_delegate.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index 16d8fc7..7872f81 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/common/custom_handlers/protocol_handler.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index a004fc9..49b4d42 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -30,7 +30,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_client_host.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 114277f..4c27ba6 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -44,7 +44,7 @@ #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index 385356f..750e11b 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -26,7 +26,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/save_page_type.h" diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc index 66ad30a3..23dc74f 100644 --- a/chrome/browser/extensions/api/commands/command_service.cc +++ b/chrome/browser/extensions/api/commands/command_service.cc @@ -22,7 +22,7 @@ #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/extensions/manifest_handlers/ui_overrides_handler.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_function_registry.h" diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc index 804c8c1..7c653e7 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc @@ -28,8 +28,8 @@ #include "chromeos/dbus/dbus_method_call_status.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "google_apis/gaia/gaia_auth_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index d479d76..9a0ca31 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/api/content_settings/content_settings_service.h" #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 3b986f2..8821fca 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -52,8 +52,8 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/translate/core/common/language_detection_details.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index 2ed5be8..ffdf9f13 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index b3cd3eb..fdae3ad 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/common/extension.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 9292f63..b483ff0 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -16,7 +16,7 @@ #include "base/values.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_paths.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_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_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 63fade4..aab6748 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -78,7 +78,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/scoped_browser_locale.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_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/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 9ee2e90..14988da 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -22,7 +22,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/extensions/launch_util.cc b/chrome/browser/extensions/launch_util.cc index 765e5fc..c548e9d 100644 --- a/chrome/browser/extensions/launch_util.cc +++ b/chrome/browser/extensions/launch_util.cc @@ -12,7 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 6ea55b7..c913cbd 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -19,7 +19,7 @@ #include "chrome/browser/prefs/pref_service_mock_factory.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_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/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 553f155..89efce7 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -53,9 +53,9 @@ #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_tracker.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc index a41c7d1..55450da 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.cc @@ -8,7 +8,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(OS_ANDROID) #include "chrome/browser/geolocation/chrome_geolocation_permission_context_android.h" #else diff --git a/chrome/browser/google/google_url_tracker_factory.cc b/chrome/browser/google/google_url_tracker_factory.cc index b7dd52d..c0ae59b 100644 --- a/chrome/browser/google/google_url_tracker_factory.cc +++ b/chrome/browser/google/google_url_tracker_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc index cfd34b4..fe9e873 100644 --- a/chrome/browser/invalidation/invalidation_service_factory.cc +++ b/chrome/browser/invalidation/invalidation_service_factory.cc @@ -23,9 +23,9 @@ #include "components/invalidation/invalidation_service.h" #include "components/invalidation/ticl_settings_provider.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "net/url_request/url_request_context_getter.h" #include "sync/notifier/invalidation_state_tracker.h" diff --git a/chrome/browser/invalidation/invalidator_storage.cc b/chrome/browser/invalidation/invalidator_storage.cc index bc2cb74..0f73a754f 100644 --- a/chrome/browser/invalidation/invalidator_storage.cc +++ b/chrome/browser/invalidation/invalidator_storage.cc @@ -15,7 +15,7 @@ #include "base/task_runner.h" #include "base/values.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace { diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc index e5c23f2..15ba636 100644 --- a/chrome/browser/managed_mode/managed_mode_browsertest.cc +++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc @@ -28,7 +28,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/infobars/core/infobar.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 8ca555f..a6cdf74 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -37,10 +37,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" #include "chrome/common/pref_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_manager_base.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service.cc b/chrome/browser/managed_mode/managed_user_shared_settings_service.cc index 7bceed9..2f1b75d 100644 --- a/chrome/browser/managed_mode/managed_user_shared_settings_service.cc +++ b/chrome/browser/managed_mode/managed_user_shared_settings_service.cc @@ -10,7 +10,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "sync/api/sync_change.h" #include "sync/api/sync_data.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/managed_mode/managed_user_sync_service.cc b/chrome/browser/managed_mode/managed_user_sync_service.cc index fa0730c..d320af0 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service.cc +++ b/chrome/browser/managed_mode/managed_user_sync_service.cc @@ -12,7 +12,7 @@ #include "base/values.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "sync/api/sync_change.h" #include "sync/api/sync_data.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 83562dc..45fb447 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -28,7 +28,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" #include "content/public/browser/media_capture_devices.h" diff --git a/chrome/browser/media/media_device_id_salt.h b/chrome/browser/media/media_device_id_salt.h index 46df854..1cf058b 100644 --- a/chrome/browser/media/media_device_id_salt.h +++ b/chrome/browser/media/media_device_id_salt.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/prefs/pref_member.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" class PrefService; diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc index 93d6145..4d7fbf4 100644 --- a/chrome/browser/media/media_stream_devices_controller.cc +++ b/chrome/browser/media/media_stream_devices_controller.cc @@ -21,7 +21,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/common/media_stream_request.h" diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc index 10e05fe..11c2072 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace { diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index ddde3bb..e7d7e85 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -26,9 +26,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/storage_monitor/media_storage_util.h" #include "components/storage_monitor/storage_monitor.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences_factory.cc b/chrome/browser/media_galleries/media_galleries_preferences_factory.cc index e1ae1f7..78bf5bf 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_factory.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_factory.cc @@ -8,7 +8,7 @@ #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static MediaGalleriesPreferences* diff --git a/chrome/browser/metrics/variations/variations_service.cc b/chrome/browser/metrics/variations/variations_service.cc index 686537e..e19b452 100644 --- a/chrome/browser/metrics/variations/variations_service.cc +++ b/chrome/browser/metrics/variations/variations_service.cc @@ -20,7 +20,7 @@ #include "chrome/browser/network_time/network_time_tracker.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/variations/proto/variations_seed.pb.h" #include "components/variations/variations_seed_processor.h" #include "components/variations/variations_seed_simulator.h" diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc index 24ccfa0..e385c8b 100644 --- a/chrome/browser/net/http_server_properties_manager.cc +++ b/chrome/browser/net/http_server_properties_manager.cc @@ -13,7 +13,7 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc index d731020..60f36aa 100644 --- a/chrome/browser/net/net_pref_observer.cc +++ b/chrome/browser/net/net_pref_observer.cc @@ -9,7 +9,7 @@ #include "chrome/browser/net/predictor.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "net/http/http_stream_factory.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 4c8a435..6c4121f 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -31,7 +31,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc index ccb03cb..3e969c8 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc @@ -11,7 +11,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/network_time/network_time_service.cc b/chrome/browser/network_time/network_time_service.cc index 82fe9e7..86a85d1 100644 --- a/chrome/browser/network_time/network_time_service.cc +++ b/chrome/browser/network_time/network_time_service.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static void NetworkTimeService::RegisterProfilePrefs( diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 184d3d0..6f9ec14 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -31,7 +31,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/infobars/core/infobar.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc index 67e6770..50a5a09 100644 --- a/chrome/browser/notifications/extension_welcome_notification.cc +++ b/chrome/browser/notifications/extension_welcome_notification.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/notifications/extension_welcome_notification_unittest.cc b/chrome/browser/notifications/extension_welcome_notification_unittest.cc index f3952cc..487eaf9 100644 --- a/chrome/browser/notifications/extension_welcome_notification_unittest.cc +++ b/chrome/browser/notifications/extension_welcome_notification_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "sync/api/fake_sync_change_processor.h" #include "sync/api/sync_error_factory_mock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc index 8147387..f7348fd 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc @@ -30,7 +30,7 @@ #include "chrome/browser/notifications/sync_notifier/welcome_delegate.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc index ab9bcab..6d2e59c 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc @@ -25,7 +25,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "sync/api/sync_change.h" #include "sync/api/sync_change_processor.h" diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index c0c527a..1db6e65 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -19,7 +19,7 @@ #include "components/password_manager/core/browser/password_store.h" #include "components/password_manager/core/browser/password_store_default.h" #include "components/password_manager/core/common/password_manager_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #if defined(OS_WIN) diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index 36e0bc8..6f1becc 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/chrome/browser/password_manager/password_store_x.cc @@ -15,7 +15,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "components/password_manager/core/browser/password_store_change.h" #include "components/password_manager/core/common/password_manager_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index f4b3208..1945d67 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -18,7 +18,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/pepper_flash_settings_helper.h" diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc index 26aec17..8b4119e 100644 --- a/chrome/browser/plugins/plugin_prefs_factory.cc +++ b/chrome/browser/plugins/plugin_prefs_factory.cc @@ -13,7 +13,7 @@ #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/keyed_service.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static PluginPrefsFactory* PluginPrefsFactory::GetInstance() { diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc index f4af06f..dd9ea86 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc @@ -14,7 +14,7 @@ #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/policy/core/browser/browser_policy_connector.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "net/url_request/url_request_context_getter.h" #if defined(OS_ANDROID) || defined(OS_IOS) diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc index 61c1a0a..99e25af 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.cc +++ b/chrome/browser/policy/profile_policy_connector_factory.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/policy/schema_registry_service.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index f55c4b1..cb01978 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -91,10 +91,10 @@ #include "components/autofill/core/browser/autofill_manager.h" #include "components/bookmarks/core/browser/bookmark_utils.h" #include "components/password_manager/core/browser/password_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/rappor/rappor_service.h" #include "components/sync_driver/sync_prefs.h" #include "components/translate/core/browser/translate_prefs.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/render_process_host.h" #include "extensions/browser/extension_prefs.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 4051805..390bfc7 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -39,7 +39,7 @@ #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/pref_names.h" diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index ee4e2a8..a0e322d 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -22,7 +22,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/web_contents_tester.h" #include "ui/base/test/data/resource.h" #include "webkit/common/webpreferences.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc index d2bb22b..7d124ff 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.cc +++ b/chrome/browser/prefs/incognito_mode_prefs.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(OS_WIN) #include "base/win/metro.h" diff --git a/chrome/browser/prefs/pref_hash_filter.cc b/chrome/browser/prefs/pref_hash_filter.cc index 4ba42e3..a760dbe 100644 --- a/chrome/browser/prefs/pref_hash_filter.cc +++ b/chrome/browser/prefs/pref_hash_filter.cc @@ -17,7 +17,7 @@ #include "chrome/browser/prefs/tracked/tracked_atomic_preference.h" #include "chrome/browser/prefs/tracked/tracked_split_preference.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" PrefHashFilter::PrefHashFilter( scoped_ptr<PrefHashStore> pref_hash_store, diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc index bd644ad..0a8613c 100644 --- a/chrome/browser/prefs/pref_service_syncable.cc +++ b/chrome/browser/prefs/pref_service_syncable.cc @@ -17,7 +17,7 @@ #include "chrome/browser/prefs/pref_service_syncable_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static PrefServiceSyncable* PrefServiceSyncable::FromProfile(Profile* profile) { diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h index 1c23dd6..eb97a0a 100644 --- a/chrome/browser/prefs/pref_service_syncable.h +++ b/chrome/browser/prefs/pref_service_syncable.h @@ -8,7 +8,7 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/synced_pref_observer.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" class PrefServiceSyncableObserver; class Profile; diff --git a/chrome/browser/prefs/pref_service_syncable_factory.cc b/chrome/browser/prefs/pref_service_syncable_factory.cc index ec729a3..9142d43 100644 --- a/chrome/browser/prefs/pref_service_syncable_factory.cc +++ b/chrome/browser/prefs/pref_service_syncable_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/command_line_pref_store.h" #include "chrome/browser/prefs/pref_service_syncable.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(ENABLE_CONFIGURATION_POLICY) #include "components/policy/core/browser/browser_policy_connector.h" diff --git a/chrome/browser/prefs/prefs_syncable_service_unittest.cc b/chrome/browser/prefs/prefs_syncable_service_unittest.cc index 2bc6182..bb410e2 100644 --- a/chrome/browser/prefs/prefs_syncable_service_unittest.cc +++ b/chrome/browser/prefs/prefs_syncable_service_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "grit/locale_settings.h" #include "sync/api/attachments/attachment_id.h" #include "sync/api/attachments/attachment_service_proxy_for_test.h" diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc index 6558c4a..b47e3d9 100644 --- a/chrome/browser/prefs/profile_pref_store_manager.cc +++ b/chrome/browser/prefs/profile_pref_store_manager.cc @@ -18,7 +18,7 @@ #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace { diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index c83c9b2..6f4c375 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -24,7 +24,7 @@ #include "base/values.h" #include "chrome/browser/prefs/pref_hash_filter.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index a1c9046..0111646 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc @@ -18,7 +18,7 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 69bd418..b709585 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/window_restore_utils.h" diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc index 7239de0..659b492 100644 --- a/chrome/browser/prefs/session_startup_pref_unittest.cc +++ b/chrome/browser/prefs/session_startup_pref_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 5dbc2b55..e610947 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -26,7 +26,7 @@ #include "chrome/common/print_messages.h" #include "chrome/common/url_constants.h" #include "components/cloud_devices/common/cloud_devices_urls.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc index ee67cf5..5a22171 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" // static diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc index ba27f17..e956fa7 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc @@ -24,7 +24,7 @@ #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 "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/variations/variations_associated_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/profiles/chrome_version_service.cc b/chrome/browser/profiles/chrome_version_service.cc index 5a177a6..b81b417 100644 --- a/chrome/browser/profiles/chrome_version_service.cc +++ b/chrome/browser/profiles/chrome_version_service.cc @@ -8,7 +8,7 @@ #include "base/version.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static void ChromeVersionService::RegisterProfilePrefs( diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.cc b/chrome/browser/profiles/gaia_info_update_service_factory.cc index 2fa4601..a173d68 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.cc +++ b/chrome/browser/profiles/gaia_info_update_service_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" GAIAInfoUpdateServiceFactory::GAIAInfoUpdateServiceFactory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index 7e7ee56..c8a92f9 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -15,8 +15,8 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/pref_names.h" #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/sync_driver/sync_prefs.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 049bc46..d73205d 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -84,8 +84,8 @@ #include "components/bookmarks/core/browser/bookmark_model.h" #include "components/dom_distiller/content/dom_distiller_viewer_source.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/startup_metric_utils/startup_metric_utils.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/dom_storage_context.h" diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc index 51d327e..98fdbe2 100644 --- a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc +++ b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc @@ -12,7 +12,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/cryptohome/system_salt_getter.h" #endif -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc index ba1d669..f14c103 100644 --- a/chrome/browser/search/hotword_service_factory.cc +++ b/chrome/browser/search/hotword_service_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/search/hotword_service.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" using content::BrowserContext; diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc index 409d14b..a1f9f73 100644 --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc @@ -27,8 +27,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/search_urls.h" #include "chrome/common/url_constants.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/sessions/serialized_navigation_entry.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc index 557291f..a48fd0b 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.cc +++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc @@ -10,7 +10,7 @@ #include "chrome/browser/search/suggestions/suggestions_service.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace suggestions { diff --git a/chrome/browser/search_engines/default_search_manager.cc b/chrome/browser/search_engines/default_search_manager.cc index fefe7b4..9b45bd6 100644 --- a/chrome/browser/search_engines/default_search_manager.cc +++ b/chrome/browser/search_engines/default_search_manager.cc @@ -26,7 +26,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/util.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // A dictionary to hold all data related to the Default Search Engine. // Eventually, this should replace all the data stored in the diff --git a/chrome/browser/search_engines/default_search_manager_unittest.cc b/chrome/browser/search_engines/default_search_manager_unittest.cc index fd6f99f..482f2ba 100644 --- a/chrome/browser/search_engines/default_search_manager_unittest.cc +++ b/chrome/browser/search_engines/default_search_manager_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index 81aa35b..709531e 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -22,7 +22,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index f928fc9..9e2a4d4 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -15,7 +15,7 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" // static TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) { diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc index 009a683..a14ae00 100644 --- a/chrome/browser/services/gcm/gcm_profile_service.cc +++ b/chrome/browser/services/gcm/gcm_profile_service.cc @@ -15,8 +15,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "google_apis/gaia/identity_provider.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc index df67388..9406e29 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/test/base/testing_profile.h" #include "components/gcm_driver/gcm_client_factory.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gcm/gcm_client.h" diff --git a/chrome/browser/signin/about_signin_internals_factory.cc b/chrome/browser/signin/about_signin_internals_factory.cc index 504f730..c39e5d2 100644 --- a/chrome/browser/signin/about_signin_internals_factory.cc +++ b/chrome/browser/signin/about_signin_internals_factory.cc @@ -11,10 +11,10 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/core/browser/signin_internals_util.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "google_apis/gaia/gaia_constants.h" using namespace signin_internals_util; diff --git a/chrome/browser/signin/easy_unlock.cc b/chrome/browser/signin/easy_unlock.cc index bf79edc..6299211 100644 --- a/chrome/browser/signin/easy_unlock.cc +++ b/chrome/browser/signin/easy_unlock.cc @@ -9,7 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/browser/extension_system.h" namespace easy_unlock { diff --git a/chrome/browser/signin/local_auth.cc b/chrome/browser/signin/local_auth.cc index 2d36571..55b955e 100644 --- a/chrome/browser/signin/local_auth.cc +++ b/chrome/browser/signin/local_auth.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" #include "components/os_crypt/os_crypt.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "crypto/random.h" #include "crypto/secure_util.h" #include "crypto/symmetric_key.h" diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc index aa52867..4c16c54 100644 --- a/chrome/browser/signin/signin_manager_factory.cc +++ b/chrome/browser/signin/signin_manager_factory.cc @@ -12,8 +12,8 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" SigninManagerFactory::SigninManagerFactory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc index 253ba61..91de1f9 100644 --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc @@ -23,9 +23,9 @@ #include "chrome/common/net/url_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc index 4116ff6..ca497fc 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.cc +++ b/chrome/browser/spellchecker/spellcheck_factory.cc @@ -10,7 +10,7 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/render_process_host.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc index 912d076..0445bbe 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc @@ -20,9 +20,9 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/sync_driver/sync_frontend.h" #include "components/sync_driver/sync_prefs.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 73d4de1..627a732 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -58,6 +58,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" @@ -66,7 +67,6 @@ #include "components/sync_driver/pref_names.h" #include "components/sync_driver/system_encryptor.h" #include "components/sync_driver/user_selectable_sync_type.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc index 396d32a..bb85541 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc @@ -12,7 +12,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS) #include "chrome/browser/themes/theme_service_aurax11.h" diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc index e2f8451..3188c21 100644 --- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc @@ -29,7 +29,7 @@ #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/common/form_data.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc index b02441e1..3d60817 100644 --- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc +++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc @@ -9,7 +9,7 @@ #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace { diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index a522eec..b12072e 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -63,7 +63,7 @@ #include "components/autofill/core/browser/validation.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/form_data.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/geolocation_provider.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc index 6f2807a..af42b87 100644 --- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc +++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc @@ -19,7 +19,7 @@ #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc index 6ddfb34..05bb01d 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -9,8 +9,8 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/translate/core/common/translate_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" namespace chrome { diff --git a/chrome/browser/ui/browser_view_prefs.cc b/chrome/browser/ui/browser_view_prefs.cc index 5e98fcf..65b2181 100644 --- a/chrome/browser/ui/browser_view_prefs.cc +++ b/chrome/browser/ui/browser_view_prefs.cc @@ -6,7 +6,7 @@ #include "base/prefs/pref_registry_simple.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc b/chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc index a98920ef..2e153c2 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/browser/pref_names.h" void RegisterBrowserActionsControllerProfilePrefs( diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index febbdd5..c48fde7 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm @@ -11,7 +11,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/test/base/testing_profile.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc index 380fa96..afaf00b 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/overscroll_configuration.h" diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc index 9bcfcd67..e4b3c4c9 100644 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index 736f7f41..a6060e0 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc @@ -25,7 +25,7 @@ #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 3edd66c..c3b609a 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -18,7 +18,7 @@ #include "chrome/common/pref_font_webkit_names.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_names_util.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/ui/startup/autolaunch_prompt.cc b/chrome/browser/ui/startup/autolaunch_prompt.cc index 5ddb328..f67414f 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/startup/autolaunch_prompt.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace chrome { diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc index 021c981..81bb73d 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc @@ -20,7 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/installer/util/auto_launch_util.h" #include "components/infobars/core/infobar.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index e9bfc44..5d7fdab 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -30,7 +30,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/core/browser/bookmark_model.h" #include "components/bookmarks/core/test/bookmark_test_helpers.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_prefs.h" diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc index 0140142..922d86a 100644 --- a/chrome/browser/ui/tabs/pinned_tab_codec.cc +++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index da10080..b82bb77 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -56,7 +56,7 @@ #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index aca6d1b..810a56a 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -39,7 +39,7 @@ #include "chrome/browser/chromeos/settings/owner_flags_storage.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #endif using content::WebContents; diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc index 6326e9f..107b08b 100644 --- a/chrome/browser/ui/webui/instant_ui.cc +++ b/chrome/browser/ui/webui/instant_ui.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h index d2619df..069030f 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/web_ui_controller.h" class LocalDiscoveryUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc index 53f390c..68e1931 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc @@ -9,7 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index a2d593f..97d9528 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -26,7 +26,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 3d02e74..351edb28 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -36,7 +36,7 @@ #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc index 2a30e17..2c0099f 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 065dcdf..2794f4d 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/ntp/suggestions_page_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc index 4cc17ff..040e5d7 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc @@ -25,7 +25,7 @@ #include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h" #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 3dac5cb..b29d1f6 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -33,7 +33,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index 9e3a61f..073f78b 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "printing/page_size_margins.h" namespace printing { diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index de794bc..d6972b9 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -21,7 +21,7 @@ #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/user_metrics.h" #include "net/base/url_util.h" #include "ui/base/device_form_factor.h" diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 95c9e76..c8c7d28 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -16,7 +16,7 @@ #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "url/gurl.h" diff --git a/chrome/test/base/testing_pref_service_syncable.cc b/chrome/test/base/testing_pref_service_syncable.cc index 4d012e9..7946402 100644 --- a/chrome/test/base/testing_pref_service_syncable.cc +++ b/chrome/test/base/testing_pref_service_syncable.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/prefs/pref_notifier_impl.h" #include "base/prefs/pref_value_store.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" template <> diff --git a/components/autofill.gypi b/components/autofill.gypi index ca0d7a3..9b78b76 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -107,7 +107,7 @@ 'components_resources.gyp:components_resources', 'components_strings.gyp:components_strings', 'os_crypt', - 'user_prefs', + 'pref_registry', 'webdata_common', ], 'sources': [ diff --git a/components/autofill/core/DEPS b/components/autofill/core/DEPS index fe503bd..fb45023 100644 --- a/components/autofill/core/DEPS +++ b/components/autofill/core/DEPS @@ -1,7 +1,4 @@ include_rules = [ "+components/os_crypt", - # TODO(joi): Perhaps PrefRegistrySyncable should be a separate - # component since it is currently in the same component as - # UserPrefs, which uses content::BrowserContext. - "+components/user_prefs/pref_registry_syncable.h", + "+components/pref_registry", ] diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc index 4c42479..bfb8d49 100644 --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc @@ -42,7 +42,7 @@ #include "components/autofill/core/common/form_data_predictions.h" #include "components/autofill/core/common/form_field_data.h" #include "components/autofill/core/common/password_form_fill_data.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "grit/component_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc index 2133388..081defa 100644 --- a/components/autofill/core/browser/autofill_test_utils.cc +++ b/components/autofill/core/browser/autofill_test_utils.cc @@ -17,7 +17,7 @@ #include "components/autofill/core/common/form_data.h" #include "components/autofill/core/common/form_field_data.h" #include "components/os_crypt/os_crypt.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" using base::ASCIIToUTF16; diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi index f056d62..1c46f14 100644 --- a/components/bookmarks.gypi +++ b/components/bookmarks.gypi @@ -22,7 +22,7 @@ 'favicon_base', 'query_parser', 'startup_metric_utils', - 'user_prefs', + 'pref_registry', ], 'sources': [ 'bookmarks/core/browser/base_bookmark_model_observer.cc', diff --git a/components/bookmarks/DEPS b/components/bookmarks/DEPS index 3dcea05..b067410 100644 --- a/components/bookmarks/DEPS +++ b/components/bookmarks/DEPS @@ -1,8 +1,8 @@ include_rules = [ "+components/favicon_base", + "+components/pref_registry", "+components/query_parser", "+components/startup_metric_utils", - "+components/user_prefs", "+grit/component_strings.h", "+net/base", "+ui", diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc index 5404964..b45d954 100644 --- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc +++ b/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc @@ -15,7 +15,7 @@ #include "components/bookmarks/core/common/bookmark_pref_names.h" #include "components/bookmarks/core/test/bookmark_test_helpers.h" #include "components/bookmarks/core/test/test_bookmark_client.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "testing/gtest/include/gtest/gtest.h" scoped_ptr<PrefService> PrefServiceForTesting() { diff --git a/components/bookmarks/core/browser/bookmark_utils.cc b/components/bookmarks/core/browser/bookmark_utils.cc index b7e9a17..8baec23 100644 --- a/components/bookmarks/core/browser/bookmark_utils.cc +++ b/components/bookmarks/core/browser/bookmark_utils.cc @@ -17,8 +17,8 @@ #include "components/bookmarks/core/browser/bookmark_model.h" #include "components/bookmarks/core/browser/scoped_group_bookmark_actions.h" #include "components/bookmarks/core/common/bookmark_pref_names.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/query_parser/query_parser.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "net/base/net_util.h" #include "ui/base/models/tree_node_iterator.h" #include "url/gurl.h" diff --git a/components/components.gyp b/components/components.gyp index 7d57704..ef080c0 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -36,6 +36,7 @@ 'password_manager.gypi', 'policy.gypi', 'precache.gypi', + 'pref_registry.gypi', 'query_parser.gypi', 'rappor.gypi', 'search_provider_logos.gypi', diff --git a/components/data_reduction_proxy.gypi b/components/data_reduction_proxy.gypi index 869ef06..31aa0bd 100644 --- a/components/data_reduction_proxy.gypi +++ b/components/data_reduction_proxy.gypi @@ -9,10 +9,11 @@ 'target_name': 'data_reduction_proxy_browser', 'type': 'static_library', 'dependencies': [ - 'data_reduction_proxy_common', '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', '../net/net.gyp:net', + 'data_reduction_proxy_common', + 'pref_registry', ], 'include_dirs': [ '..', @@ -38,7 +39,6 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', - '../components/components.gyp:user_prefs', ], 'include_dirs': [ '..', @@ -54,12 +54,12 @@ 'target_name': 'data_reduction_proxy_test_support', 'type': 'static_library', 'dependencies' : [ - 'data_reduction_proxy_browser', - 'data_reduction_proxy_common', '../base/base.gyp:base', '../net/net.gyp:net', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + 'data_reduction_proxy_browser', + 'data_reduction_proxy_common', ], 'include_dirs': [ '..', diff --git a/components/data_reduction_proxy/DEPS b/components/data_reduction_proxy/DEPS index bfc9d61..a1c481f 100644 --- a/components/data_reduction_proxy/DEPS +++ b/components/data_reduction_proxy/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+components/user_prefs", + "+components/pref_registry", "+crypto", "+net", ] diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc index ee90c2e..8e59a3f 100644 --- a/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc @@ -6,7 +6,7 @@ #include "base/prefs/pref_registry_simple.h" #include "components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" namespace data_reduction_proxy { diff --git a/components/keyed_service/content/DEPS b/components/keyed_service/content/DEPS index 0c342f6..0e3557d 100644 --- a/components/keyed_service/content/DEPS +++ b/components/keyed_service/content/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/pref_registry", "+components/user_prefs", "+content/public/browser", "+content/public/common", diff --git a/components/keyed_service/content/browser_context_keyed_base_factory.cc b/components/keyed_service/content/browser_context_keyed_base_factory.cc index 9a543cd..622f1c8 100644 --- a/components/keyed_service/content/browser_context_keyed_base_factory.cc +++ b/components/keyed_service/content/browser_context_keyed_base_factory.cc @@ -6,7 +6,7 @@ #include "base/prefs/pref_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" diff --git a/components/password_manager/core/browser/DEPS b/components/password_manager/core/browser/DEPS index ddba66f..3cb0b69 100644 --- a/components/password_manager/core/browser/DEPS +++ b/components/password_manager/core/browser/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+components/autofill/core/browser", "+components/keyed_service/core", - "+components/user_prefs", - "+content/public/browser", + "+components/pref_registry", ] diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc index 03e81d8..73c54ef1 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc @@ -19,7 +19,7 @@ #include "components/password_manager/core/browser/password_manager_driver.h" #include "components/password_manager/core/browser/password_manager_metrics_util.h" #include "components/password_manager/core/common/password_manager_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" using autofill::PasswordForm; using autofill::PasswordFormMap; diff --git a/components/policy/core/browser/DEPS b/components/policy/core/browser/DEPS index 9134e3a..73c708d 100644 --- a/components/policy/core/browser/DEPS +++ b/components/policy/core/browser/DEPS @@ -1,7 +1,7 @@ include_rules = [ "+components/autofill/core/common", + "+components/pref_registry", "+components/url_matcher", - "+components/user_prefs", "+grit/component_strings.h", "+third_party/icu", "+ui/base/l10n", diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc index 0706080..b3b6a6d 100644 --- a/components/policy/core/browser/url_blacklist_manager.cc +++ b/components/policy/core/browser/url_blacklist_manager.cc @@ -15,7 +15,7 @@ #include "base/task_runner_util.h" #include "base/values.h" #include "components/policy/core/common/policy_pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "net/base/filename_util.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/components/policy/policy_browser.gypi b/components/policy/policy_browser.gypi index 82d70ae..cdd2fac 100644 --- a/components/policy/policy_browser.gypi +++ b/components/policy/policy_browser.gypi @@ -11,8 +11,8 @@ '../ui/base/ui_base.gyp:ui_base', '../url/url.gyp:url_lib', 'components_strings.gyp:components_strings', + 'pref_registry', 'url_matcher', - 'user_prefs', ], 'defines': [ 'POLICY_COMPONENT_IMPLEMENTATION', diff --git a/components/pref_registry.gypi b/components/pref_registry.gypi new file mode 100644 index 0000000..08dc387 --- /dev/null +++ b/components/pref_registry.gypi @@ -0,0 +1,29 @@ +# Copyright (c) 2013 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. + +{ + 'targets': [ + { + 'target_name': 'pref_registry', + 'type': '<(component)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:base_prefs', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../ui/base/ui_base.gyp:ui_base', + ], + 'include_dirs': [ + '..', + ], + 'defines': [ + 'PREF_REGISTRY_IMPLEMENTATION', + ], + 'sources': [ + 'pref_registry/pref_registry_export.h', + 'pref_registry/pref_registry_syncable.cc', + 'pref_registry/pref_registry_syncable.h', + ], + }, + ], +} diff --git a/components/pref_registry/DEPS b/components/pref_registry/DEPS new file mode 100644 index 0000000..e7cf2c6f --- /dev/null +++ b/components/pref_registry/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+ui/base", +] diff --git a/components/pref_registry/OWNERS b/components/pref_registry/OWNERS new file mode 100644 index 0000000..97ab695 --- /dev/null +++ b/components/pref_registry/OWNERS @@ -0,0 +1,5 @@ +battre@chromium.org +bauerb@chromium.org +gab@chromium.org +mnissler@chromium.org +pam@chromium.org diff --git a/components/pref_registry/README b/components/pref_registry/README new file mode 100644 index 0000000..041a103 --- /dev/null +++ b/components/pref_registry/README @@ -0,0 +1,6 @@ +The //components/pref_registry component provides: + +A place for PrefRegistrySyncable to live, where it can be used by +components that need to register preferences associated with users. + +This component should not depend on content module. diff --git a/components/pref_registry/pref_registry_export.h b/components/pref_registry/pref_registry_export.h new file mode 100644 index 0000000..9ebbb1f --- /dev/null +++ b/components/pref_registry/pref_registry_export.h @@ -0,0 +1,29 @@ +// Copyright 2014 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 COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_ +#define COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(PREF_REGISTRY_IMPLEMENTATION) +#define PREF_REGISTRY_EXPORT __declspec(dllexport) +#else +#define PREF_REGISTRY_EXPORT __declspec(dllimport) +#endif // defined(PREF_REGISTRY_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(PREF_REGISTRY_IMPLEMENTATION) +#define PREF_REGISTRY_EXPORT __attribute__((visibility("default"))) +#else +#define PREF_REGISTRY_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define PREF_REGISTRY_EXPORT +#endif + +#endif // COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_ diff --git a/components/user_prefs/pref_registry_syncable.cc b/components/pref_registry/pref_registry_syncable.cc index b0e40a2..675b309 100644 --- a/components/user_prefs/pref_registry_syncable.cc +++ b/components/pref_registry/pref_registry_syncable.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 "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "base/files/file_path.h" #include "base/prefs/default_pref_store.h" diff --git a/components/user_prefs/pref_registry_syncable.h b/components/pref_registry/pref_registry_syncable.h index 64de0a3..57deda6 100644 --- a/components/user_prefs/pref_registry_syncable.h +++ b/components/pref_registry/pref_registry_syncable.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_ -#define COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_ +#ifndef COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_ +#define COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_ #include <set> #include <string> #include "base/callback.h" #include "base/prefs/pref_registry.h" -#include "components/user_prefs/user_prefs_export.h" +#include "components/pref_registry/pref_registry_export.h" namespace base { class DictionaryValue; @@ -19,6 +19,7 @@ class ListValue; class Value; } +// TODO(tfarina): Change this namespace to pref_registry. namespace user_prefs { // A PrefRegistry that forces users to choose whether each registered @@ -31,7 +32,7 @@ namespace user_prefs { // appropriate time before the PrefService for these preferences is // constructed. See e.g. chrome/browser/prefs/browser_prefs.cc which // does this for Chrome. -class USER_PREFS_EXPORT PrefRegistrySyncable : public PrefRegistry { +class PREF_REGISTRY_EXPORT PrefRegistrySyncable : public PrefRegistry { public: // Enum used when registering preferences to determine if it should // be synced or not. Syncable priority preferences are preferences that are @@ -129,4 +130,4 @@ class USER_PREFS_EXPORT PrefRegistrySyncable : public PrefRegistry { } // namespace user_prefs -#endif // COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_ +#endif // COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_ diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS index 1a20824..c42e59f 100644 --- a/components/sync_driver/DEPS +++ b/components/sync_driver/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+components/os_crypt", - "+components/user_prefs/pref_registry_syncable.h", + "+components/pref_registry/pref_registry_syncable.h", "+sync", ] diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc index 9d34236..9bdd817 100644 --- a/components/sync_driver/sync_prefs.cc +++ b/components/sync_driver/sync_prefs.cc @@ -11,8 +11,8 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/build_config.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/sync_driver/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" namespace sync_driver { diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc index 5396057..8a5608a 100644 --- a/components/sync_driver/sync_prefs_unittest.cc +++ b/components/sync_driver/sync_prefs_unittest.cc @@ -10,8 +10,8 @@ #include "base/prefs/pref_value_store.h" #include "base/prefs/testing_pref_service.h" #include "base/time/time.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/sync_driver/pref_names.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "sync/internal_api/public/base/model_type.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/translate.gypi b/components/translate.gypi index 295ab96fcd..00ec959 100644 --- a/components/translate.gypi +++ b/components/translate.gypi @@ -15,8 +15,8 @@ '../url/url.gyp:url_lib', 'components_resources.gyp:components_resources', 'language_usage_metrics', + 'pref_registry', 'translate_core_common', - 'user_prefs', ], 'include_dirs': [ '..', diff --git a/components/translate/DEPS b/components/translate/DEPS index df3f959..e13509a 100644 --- a/components/translate/DEPS +++ b/components/translate/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/language_usage_metrics", - "+components/user_prefs", + "+components/pref_registry", "+google_apis", "+grit", # For generated headers. "+net", diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc index 646b8d5..bb8dd743 100644 --- a/components/translate/core/browser/translate_prefs.cc +++ b/components/translate/core/browser/translate_prefs.cc @@ -10,10 +10,10 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/common/translate_util.h" -#include "components/user_prefs/pref_registry_syncable.h" const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] = "translate_language_blacklist"; diff --git a/components/user_prefs.gypi b/components/user_prefs.gypi index a5c62ac..a94323e 100644 --- a/components/user_prefs.gypi +++ b/components/user_prefs.gypi @@ -12,7 +12,6 @@ '../base/base.gyp:base_prefs', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../content/content.gyp:content_browser', - '../ui/base/ui_base.gyp:ui_base', ], 'include_dirs': [ '..', @@ -21,8 +20,6 @@ 'USER_PREFS_IMPLEMENTATION', ], 'sources': [ - 'user_prefs/pref_registry_syncable.cc', - 'user_prefs/pref_registry_syncable.h', 'user_prefs/user_prefs.cc', 'user_prefs/user_prefs.h', 'user_prefs/user_prefs_export.h', diff --git a/components/user_prefs/DEPS b/components/user_prefs/DEPS index c36190b..1c35d9c 100644 --- a/components/user_prefs/DEPS +++ b/components/user_prefs/DEPS @@ -1,4 +1,3 @@ include_rules = [ "+content/public/browser", - "+ui/base", ] diff --git a/components/user_prefs/user_prefs_export.h b/components/user_prefs/user_prefs_export.h index 3d20222..af7c0f9 100644 --- a/components/user_prefs/user_prefs_export.h +++ b/components/user_prefs/user_prefs_export.h @@ -12,7 +12,7 @@ #define USER_PREFS_EXPORT __declspec(dllexport) #else #define USER_PREFS_EXPORT __declspec(dllimport) -#endif // defined(BASE_PREFS_IMPLEMENTATION) +#endif // defined(USER_PREFS_IMPLEMENTATION) #else // defined(WIN32) #if defined(USER_PREFS_IMPLEMENTATION) diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index af6e02ab..15dca56 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/keyed_service", - "+components/user_prefs", + "+components/pref_registry", "+content/public/browser", "+grit/extensions_strings.h", "+net", diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index e9b4a76..81f642f 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -12,7 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/value_conversions.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "extensions/browser/admin_policy.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/event_router.h" diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 7233abb..be12b4e 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -225,8 +225,8 @@ 'type': 'static_library', 'dependencies': [ '../components/components.gyp:keyed_service_content', + '../components/components.gyp:pref_registry', '../components/components.gyp:usb_service', - '../components/components.gyp:user_prefs', '../content/content.gyp:content_browser', '../skia/skia.gyp:skia', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |