diff options
| author | brettw <brettw@chromium.org> | 2016-02-02 16:51:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 00:52:49 +0000 |
| commit | 1f5feb7e317e3c257090858e950273b64a2e31ef (patch) | |
| tree | 9322f3ed006e3c0b0a383fc1439e61ba3674118d /ios/chrome | |
| parent | e788ae26ee13d972ac0299bd121978cfc7185fb1 (diff) | |
| download | chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.zip chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.tar.gz chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.tar.bz2 | |
Delete base/prefs and update callers to use components.
Deletes the forwarding headers in base/prefs.
Updates the remaining users of base/prefs includes to use components/prefs.
Sort headers in updated files.
Move PrefServiceFactory out of the base namespace. Update users.
Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to
COMPONENTS_PREFS_.
Add components/prefs to DEPS file of directories where checkdeps fails after
the update.
BUG=583034
Review URL: https://codereview.chromium.org/1662523004
Cr-Commit-Position: refs/heads/master@{#373105}
Diffstat (limited to 'ios/chrome')
60 files changed, 80 insertions, 78 deletions
diff --git a/ios/chrome/browser/DEPS b/ios/chrome/browser/DEPS index 5764658..73a2669 100644 --- a/ios/chrome/browser/DEPS +++ b/ios/chrome/browser/DEPS @@ -43,6 +43,7 @@ include_rules = [ "+components/password_manager/core/common", "+components/password_manager/sync/browser", "+components/pref_registry", + "+components/prefs", "+components/profile_metrics", "+components/proxy_config", "+components/rappor", diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc index eee2f06..9ad4a79 100644 --- a/ios/chrome/browser/application_context_impl.cc +++ b/ios/chrome/browser/application_context_impl.cc @@ -12,8 +12,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/time/default_tick_clock.h" #include "base/tracked_objects.h" #include "components/component_updater/component_updater_service.h" @@ -28,6 +26,8 @@ #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/net_log/chrome_net_log.h" #include "components/network_time/network_time_tracker.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/update_client/configurator.h" #include "components/update_client/update_query_params.h" diff --git a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc index b3f933e..c0e9cbf 100644 --- a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc +++ b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc @@ -4,12 +4,12 @@ #include "ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/history/core/browser/history_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_service_utils.h" #include "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "ios/chrome/browser/autocomplete/in_memory_url_index_factory.h" diff --git a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc index b9cf90d..4c6c556 100644 --- a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc +++ b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/omnibox/browser/in_memory_url_index.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/chrome_url_constants.h" diff --git a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc index eb14bf1..53b77ea 100644 --- a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc +++ b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc @@ -5,11 +5,11 @@ #include "ios/chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/omnibox/browser/shortcuts_backend.h" #include "components/omnibox/browser/shortcuts_constants.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/history/history_service_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/search_engines/template_url_service_factory.h" diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc index d199a67..08ae8dc 100644 --- a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -7,11 +7,11 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/startup_task_runner_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/undo/bookmark_undo_service.h" #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" diff --git a/ios/chrome/browser/bookmarks/bookmarks_utils.cc b/ios/chrome/browser/bookmarks/bookmarks_utils.cc index 9d4f378..3c1085f 100644 --- a/ios/chrome/browser/bookmarks/bookmarks_utils.cc +++ b/ios/chrome/browser/bookmarks/bookmarks_utils.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.cc b/ios/chrome/browser/browser_state/browser_state_info_cache.cc index ac6869c..95130f0 100644 --- a/ios/chrome/browser/browser_state/browser_state_info_cache.cc +++ b/ios/chrome/browser/browser_state/browser_state_info_cache.cc @@ -11,9 +11,9 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" #include "ios/chrome/browser/browser_state/browser_state_info_cache_observer.h" #include "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc index 1d3af81..a91488d 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc @@ -11,9 +11,6 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" @@ -23,6 +20,9 @@ #include "components/data_reduction_proxy/core/browser/data_store_impl.h" #include "components/domain_reliability/monitor.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_constants.h" #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h index 3461e59..c9449ea9 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" #include "ios/chrome/browser/net/net_types.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc index 8a965a8..ecf3eda 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -31,6 +30,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/metrics/metrics_pref_names.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/pref_names.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h index 8218bff..837cf9b 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h @@ -15,8 +15,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/prefs/pref_member.h" #include "ios/chrome/browser/ios_chrome_io_thread.h" #include "ios/chrome/browser/net/net_types.h" #include "net/cert/ct_verifier.h" diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm index ca91041..c5f1391 100644 --- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm +++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm @@ -12,10 +12,10 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/mac/bind_objc_block.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/threading/worker_pool.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/chrome_constants.h" #include "ios/chrome/browser/ios_chrome_io_thread.h" #include "ios/chrome/browser/net/cookie_util.h" diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc index 3485939..0b43127 100644 --- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc +++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc @@ -14,7 +14,6 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -24,6 +23,7 @@ #include "components/keyed_service/core/service_access_type.h" #include "components/omnibox/browser/omnibox_pref_names.h" #include "components/password_manager/core/browser/password_store.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url_service.h" #include "components/sessions/core/tab_restore_service.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h index aaf15d2..0d5d9a3 100644 --- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h +++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h @@ -11,10 +11,10 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" +#include "components/prefs/pref_member.h" #include "components/search_engines/template_url_service.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc b/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc index 980b06c..baf46ed 100644 --- a/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -5,9 +5,9 @@ #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc index 11380ce..babdeb6 100644 --- a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc +++ b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc @@ -4,11 +4,11 @@ #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.h" -#include "base/prefs/pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_client.h" diff --git a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc index a5d348f..658baf6 100644 --- a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc +++ b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc @@ -11,8 +11,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -22,6 +20,8 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" #include "components/data_reduction_proxy/core/browser/data_store.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/proxy_config/proxy_prefs.h" #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h" diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm index e4daa63..c195f46 100644 --- a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #import "ios/chrome/browser/geolocation/location_manager.h" #import "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm index 2a7c95a..215d9ac 100644 --- a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm @@ -6,7 +6,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "ios/chrome/browser/geolocation/location_manager.h" #include "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h" diff --git a/ios/chrome/browser/google/google_url_tracker_factory.cc b/ios/chrome/browser/google/google_url_tracker_factory.cc index a88a29b..0eef645 100644 --- a/ios/chrome/browser/google/google_url_tracker_factory.cc +++ b/ios/chrome/browser/google/google_url_tracker_factory.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/google/google_url_tracker_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/google/core/browser/google_pref_names.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/google/google_url_tracker_client_impl.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/history/history_service_factory.cc b/ios/chrome/browser/history/history_service_factory.cc index cebdaf5..ea07537 100644 --- a/ios/chrome/browser/history/history_service_factory.cc +++ b/ios/chrome/browser/history/history_service_factory.cc @@ -7,13 +7,13 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/history/core/browser/history_database_params.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/visit_delegate.h" #include "components/history/ios/browser/history_database_helper.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/history/history_client_impl.h" diff --git a/ios/chrome/browser/history/web_history_service_factory.cc b/ios/chrome/browser/history/web_history_service_factory.cc index 27c1ddb..322dcd5 100644 --- a/ios/chrome/browser/history/web_history_service_factory.cc +++ b/ios/chrome/browser/history/web_history_service_factory.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/history/web_history_service_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/history/core/browser/web_history_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/sync_service.h" diff --git a/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm b/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm index bde510c..f441449 100644 --- a/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm +++ b/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm @@ -5,7 +5,7 @@ #include "ios/chrome/browser/interstitials/ios_security_interstitial_page.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/common_string_util.h" #include "components/security_interstitials/core/metrics_helper.h" #include "grit/components_resources.h" diff --git a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc b/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc index 132d02e..d270085 100644 --- a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc +++ b/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc @@ -9,7 +9,6 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_registry.h" #include "components/gcm_driver/gcm_profile_service.h" #include "components/invalidation/impl/invalidator_storage.h" #include "components/invalidation/impl/profile_invalidation_provider.h" @@ -17,6 +16,7 @@ #include "components/invalidation/impl/ticl_profile_settings_provider.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" #include "components/signin/core/browser/profile_identity_provider.h" #include "components/signin/core/browser/signin_manager.h" #include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.cc b/ios/chrome/browser/ios_chrome_io_thread.cc index 477490f..e2376f2 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.cc +++ b/ios/chrome/browser/ios_chrome_io_thread.cc @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -31,6 +30,7 @@ #include "base/trace_event/trace_event.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.h b/ios/chrome/browser/ios_chrome_io_thread.h index 878d28d..e0b481d 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.h +++ b/ios/chrome/browser/ios_chrome_io_thread.h @@ -18,9 +18,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "base/strings/string_piece.h" #include "base/time/time.h" +#include "components/prefs/pref_member.h" #include "components/ssl_config/ssl_config_service_manager.h" #include "ios/web/public/web_thread_delegate.h" #include "net/base/network_change_notifier.h" diff --git a/ios/chrome/browser/ios_chrome_main_parts.mm b/ios/chrome/browser/ios_chrome_main_parts.mm index 07f054b..cab5c26 100644 --- a/ios/chrome/browser/ios_chrome_main_parts.mm +++ b/ios/chrome/browser/ios_chrome_main_parts.mm @@ -9,8 +9,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_service.h" #include "base/time/default_tick_clock.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" @@ -21,6 +19,8 @@ #include "components/metrics/profiler/tracking_synchronizer.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/open_from_clipboard/clipboard_recent_content.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/variations/service/variations_service.h" diff --git a/ios/chrome/browser/memory/memory_debugger_manager.mm b/ios/chrome/browser/memory/memory_debugger_manager.mm index e9e9acb..1c4a037 100644 --- a/ios/chrome/browser/memory/memory_debugger_manager.mm +++ b/ios/chrome/browser/memory/memory_debugger_manager.mm @@ -7,9 +7,9 @@ #include "base/ios/weak_nsobject.h" #import "base/mac/bind_objc_block.h" #include "base/mac/scoped_nsobject.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #import "ios/chrome/browser/memory/memory_debugger.h" #import "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc index 0840dea..e612332 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc @@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" // static diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc index 279fd08..d2ac247 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc @@ -7,9 +7,9 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/metrics_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h" #include "ios/chrome/test/testing_application_context.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc index 49fb58a..211f259 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc @@ -15,8 +15,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/process/process_metrics.h" #include "base/rand_util.h" #include "base/strings/string16.h" @@ -35,6 +33,8 @@ #include "components/metrics/ui/screen_info_metrics_provider.h" #include "components/metrics/url_constants.h" #include "components/omnibox/browser/omnibox_metrics_provider.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_status_metrics_provider.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc index 76519a5..5c94899 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/metrics/metrics_state_manager.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/variations/service/variations_service.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc index 767e138..2202f69 100644 --- a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm index 2074312..09c8d0c 100644 --- a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm +++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/metrics/metrics_state_manager.h" #include "components/metrics/test_metrics_service_client.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest-param-test.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/chrome/browser/net/http_server_properties_manager_factory.cc b/ios/chrome/browser/net/http_server_properties_manager_factory.cc index 59263a3..e0d473b 100644 --- a/ios/chrome/browser/net/http_server_properties_manager_factory.cc +++ b/ios/chrome/browser/net/http_server_properties_manager_factory.cc @@ -4,9 +4,9 @@ #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_thread.h" #include "net/http/http_server_properties_manager.h" diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc index 083d297..f3093c1 100644 --- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc +++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc @@ -4,7 +4,7 @@ #include "ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_client.h" #include "ios/web/public/web_thread.h" diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h index ce40131..707ea00 100644 --- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h +++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "net/url_request/http_user_agent_settings.h" class PrefService; diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.cc b/ios/chrome/browser/net/ios_chrome_network_delegate.cc index a375629..3adf521 100644 --- a/ios/chrome/browser/net/ios_chrome_network_delegate.cc +++ b/ios/chrome/browser/net/ios_chrome_network_delegate.cc @@ -15,10 +15,10 @@ #include "base/metrics/sparse_histogram.h" #include "base/metrics/user_metrics.h" #include "base/path_service.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "components/domain_reliability/monitor.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_thread.h" #include "net/base/load_flags.h" diff --git a/ios/chrome/browser/passwords/credential_manager.h b/ios/chrome/browser/passwords/credential_manager.h index 9a0efce..d37d63e 100644 --- a/ios/chrome/browser/passwords/credential_manager.h +++ b/ios/chrome/browser/passwords/credential_manager.h @@ -12,12 +12,12 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "components/password_manager/core/browser/credential_manager_password_form_manager.h" #include "components/password_manager/core/browser/credential_manager_pending_request_task.h" #include "components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h" #include "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/core/browser/password_store.h" +#include "components/prefs/pref_member.h" #include "ios/web/public/web_state/web_state_observer.h" @class JSCredentialManager; diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h index 4af0cdb..2d7f10b 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h +++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h @@ -6,9 +6,9 @@ #define IOS_CHROME_BROWSER_PASSWORDS_IOS_CHROME_PASSWORD_MANAGER_CLIENT_H_ #include "base/macros.h" -#include "base/prefs/pref_member.h" #import "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/sync/browser/sync_credentials_filter.h" +#include "components/prefs/pref_member.h" namespace ios { class ChromeBrowserState; diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm index de59101..0ec7861 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm @@ -4,7 +4,6 @@ #include "ios/chrome/browser/prefs/browser_prefs.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_manager.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h" @@ -15,6 +14,7 @@ #include "components/omnibox/browser/zero_suggest_provider.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/rappor/rappor_service.h" #include "components/search_engines/template_url_prepopulate_data.h" diff --git a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc index 3f0b416..7fea3ee 100644 --- a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc +++ b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc @@ -8,10 +8,10 @@ #include "base/bind.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/search_engines/default_search_pref_migration.h" #include "components/syncable_prefs/pref_service_syncable.h" diff --git a/ios/chrome/browser/prefs/pref_observer_bridge.mm b/ios/chrome/browser/prefs/pref_observer_bridge.mm index ebd82f7..4ba85bb 100644 --- a/ios/chrome/browser/prefs/pref_observer_bridge.mm +++ b/ios/chrome/browser/prefs/pref_observer_bridge.mm @@ -5,7 +5,7 @@ #import "ios/chrome/browser/prefs/pref_observer_bridge.h" #include "base/bind.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" PrefObserverBridge::PrefObserverBridge(id<PrefObserverDelegate> delegate) : delegate_(delegate) { diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index c34f9eb..d3c8be8 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -15,7 +15,6 @@ #include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" @@ -23,6 +22,7 @@ #include "base/time/time.h" #include "base/values.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/controller_client.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_url_constants.h" diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc index 073d70b..5861e12 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -14,12 +14,12 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_paths.h" #include "ios/chrome/browser/chrome_switches.h" diff --git a/ios/chrome/browser/safe_browsing/ui_manager.cc b/ios/chrome/browser/safe_browsing/ui_manager.cc index 115d4ce..f685735 100644 --- a/ios/chrome/browser/safe_browsing/ui_manager.cc +++ b/ios/chrome/browser/safe_browsing/ui_manager.cc @@ -10,11 +10,11 @@ #include "base/debug/leak_tracker.h" #include "base/macros.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/safe_browsing/metadata.pb.h" #include "ios/chrome/browser/safe_browsing/ping_manager.h" diff --git a/ios/chrome/browser/search_engines/search_engines_util.cc b/ios/chrome/browser/search_engines/search_engines_util.cc index 7d28154..75c3537 100644 --- a/ios/chrome/browser/search_engines/search_engines_util.cc +++ b/ios/chrome/browser/search_engines/search_engines_util.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/ios/chrome/browser/signin/browser_state_data_remover.mm b/ios/chrome/browser/signin/browser_state_data_remover.mm index ffd3471..c9680f7 100644 --- a/ios/chrome/browser/signin/browser_state_data_remover.mm +++ b/ios/chrome/browser/signin/browser_state_data_remover.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "ios/chrome/browser/bookmarks/bookmarks_utils.h" #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" diff --git a/ios/chrome/browser/signin/signin_client_impl.cc b/ios/chrome/browser/signin/signin_client_impl.cc index 5a18bba..352f83c 100644 --- a/ios/chrome/browser/signin/signin_client_impl.cc +++ b/ios/chrome/browser/signin/signin_client_impl.cc @@ -11,11 +11,11 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "components/keyed_service/core/service_access_type.h" #include "components/metrics/metrics_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_cookie_changed_subscription.h" #include "components/signin/core/browser/signin_header_helper.h" diff --git a/ios/chrome/browser/signin/signin_manager_factory.cc b/ios/chrome/browser/signin/signin_manager_factory.cc index c38756e..0449721 100644 --- a/ios/chrome/browser/signin/signin_manager_factory.cc +++ b/ios/chrome/browser/signin/signin_manager_factory.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_registry_simple.h" #include "base/time/time.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/signin_pref_names.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc b/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc index 304af8d..9c412ca 100644 --- a/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc +++ b/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc @@ -7,9 +7,9 @@ #include <utility> #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/metrics_helper.h" #include "components/security_interstitials/core/ssl_error_ui.h" #include "ios/chrome/browser/interstitials/ios_chrome_controller_client.h" diff --git a/ios/chrome/browser/sync/sync_setup_service.cc b/ios/chrome/browser/sync/sync_setup_service.cc index 083e005..42f94c7 100644 --- a/ios/chrome/browser/sync/sync_setup_service.cc +++ b/ios/chrome/browser/sync/sync_setup_service.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_prefs.h" #include "components/sync_driver/sync_service.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/ios/chrome/browser/translate/chrome_ios_translate_client.mm b/ios/chrome/browser/translate/chrome_ios_translate_client.mm index 19fe8c0..4a43fce 100644 --- a/ios/chrome/browser/translate/chrome_ios_translate_client.mm +++ b/ios/chrome/browser/translate/chrome_ios_translate_client.mm @@ -8,8 +8,8 @@ #include <vector> #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/infobars/core/infobar.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/page_translated_details.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "components/translate/core/browser/translate_infobar_delegate.h" diff --git a/ios/chrome/browser/translate/translate_accept_languages_factory.cc b/ios/chrome/browser/translate/translate_accept_languages_factory.cc index ef1a7ca..b9e0c5a 100644 --- a/ios/chrome/browser/translate/translate_accept_languages_factory.cc +++ b/ios/chrome/browser/translate/translate_accept_languages_factory.cc @@ -5,9 +5,9 @@ #include "ios/chrome/browser/translate/translate_accept_languages_factory.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/keyed_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/ui/autofill/autofill_client_ios.mm b/ios/chrome/browser/ui/autofill/autofill_client_ios.mm index f54fb29..eda7362 100644 --- a/ios/chrome/browser/ui/autofill/autofill_client_ios.mm +++ b/ios/chrome/browser/ui/autofill/autofill_client_ios.mm @@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h" #include "components/autofill/core/browser/autofill_save_card_infobar_mobile.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" @@ -17,6 +16,7 @@ #include "components/infobars/core/infobar_manager.h" #include "components/keyed_service/core/service_access_type.h" #include "components/password_manager/core/browser/password_generation_manager.h" +#include "components/prefs/pref_service.h" #include "google_apis/gaia/identity_provider.h" #include "ios/chrome/browser/autofill/personal_data_manager_factory.h" #include "ios/chrome/browser/web_data_service_factory.h" diff --git a/ios/chrome/browser/ui/webui/flags_ui.cc b/ios/chrome/browser/ui/webui/flags_ui.cc index e7ab94f..148de05 100644 --- a/ios/chrome/browser/ui/webui/flags_ui.cc +++ b/ios/chrome/browser/ui/webui/flags_ui.cc @@ -11,13 +11,13 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "components/flags_ui/flags_ui_constants.h" #include "components/flags_ui/flags_ui_pref_names.h" #include "components/flags_ui/pref_service_flags_storage.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "grit/components_chromium_strings.h" #include "grit/components_google_chrome_strings.h" diff --git a/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc b/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc index ac90058..1b415f9 100644 --- a/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc +++ b/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc @@ -13,7 +13,6 @@ #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "components/history/core/browser/top_sites.h" #include "components/history/core/browser/web_history_service.h" #include "components/keyed_service/core/service_access_type.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/device_info.h" #include "components/sync_driver/device_info_tracker.h" #include "components/url_formatter/url_formatter.h" diff --git a/ios/chrome/test/DEPS b/ios/chrome/test/DEPS index 335ddd6..b9e8796 100644 --- a/ios/chrome/test/DEPS +++ b/ios/chrome/test/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/network_time", + "+components/prefs", "+ios/chrome/browser", "+ios/public/provider/chrome", "+ios/public/test", diff --git a/ios/chrome/test/ios_chrome_scoped_testing_local_state.h b/ios/chrome/test/ios_chrome_scoped_testing_local_state.h index 498cb92..77fe316 100644 --- a/ios/chrome/test/ios_chrome_scoped_testing_local_state.h +++ b/ios/chrome/test/ios_chrome_scoped_testing_local_state.h @@ -6,7 +6,7 @@ #define IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_LOCAL_STATE_H_ #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" // Helper class to temporarily set up a |local_state| in the global // TestingApplicationContext. |