diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:15:57 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:15:57 +0000 |
| commit | 3853a4c9eb39968834334c349ffb801c5672df60 (patch) | |
| tree | 1eb65ffc95ea791b0fd019f1ffc26056b645fde2 /chrome/browser | |
| parent | c172ec86f0856f2355d879693942eb370b34b294 (diff) | |
| download | chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.zip chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.tar.gz chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.tar.bz2 | |
Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.
This is a mostly-automated change, using
./tools/git/move_source_file.py to move files and fix up include
guards and #includes from other files. Manual edits were limited to
fixing up .gypi files and adding BASE_PREFS_EXPORT where needed.
TBR=ben@chromium.org
BUG=155525
Review URL: https://codereview.chromium.org/12211105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
541 files changed, 607 insertions, 3353 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index e9e613d..a4932ac 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -11,11 +11,11 @@ #include "base/command_line.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "cc/switches.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc index ff95775..2a72f21 100644 --- a/chrome/browser/about_flags_unittest.cc +++ b/chrome/browser/about_flags_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_registry_simple.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/about_flags.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 175fcaf..01642fd 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -11,6 +11,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -26,7 +27,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_dialog_cloud.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/service/service_process_control.h" diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index b4b15e9..f3e7c4a 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -5,12 +5,12 @@ #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/autocomplete/bookmark_provider.cc b/chrome/browser/autocomplete/bookmark_provider.cc index 850c7eb..110d51c 100644 --- a/chrome/browser/autocomplete/bookmark_provider.cc +++ b/chrome/browser/autocomplete/bookmark_provider.cc @@ -9,11 +9,11 @@ #include <vector> #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/time.h" #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "net/base/net_util.h" diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 1eb1acc..ec6a595 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" @@ -26,7 +27,6 @@ #include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/scored_history_match.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index 966220b..db504e3 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" #include "chrome/browser/autocomplete/autocomplete_result.h" @@ -21,7 +22,6 @@ #include "chrome/browser/history/in_memory_url_index.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/history/url_index_private_data.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index e7ca9da..ad22d91 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_field_trial.h" @@ -22,7 +23,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index cf82bfe..0a71ecf 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -14,6 +14,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -31,7 +32,6 @@ #include "chrome/browser/history/in_memory_database.h" #include "chrome/browser/metrics/variations/variations_http_header_provider.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 1d17f81..44af16b 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/autocomplete/search_provider.h" #include "base/metrics/field_trial.h" +#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/string_util.h" #include "base/time.h" @@ -20,7 +21,6 @@ #include "chrome/browser/autocomplete/history_url_provider.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index 43b14d1..7bca980 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -13,6 +13,7 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" @@ -24,7 +25,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/shortcuts_backend_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index 8c7d878..1575e2c 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -14,6 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" @@ -25,7 +26,6 @@ #include "chrome/browser/history/shortcuts_backend.h" #include "chrome/browser/history/shortcuts_backend_factory.h" #include "chrome/browser/history/url_database.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index bd06a39..e5ae8b4 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -6,6 +6,7 @@ #include "base/callback.h" #include "base/json/json_string_value_serializer.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/string_util.h" #include "base/time.h" @@ -13,7 +14,6 @@ #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 8615e7b..2cc2b57 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -15,6 +15,7 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_service_base.h" #include "base/string16.h" #include "base/string_util.h" @@ -42,7 +43,6 @@ #include "chrome/browser/autofill/phone_number.h" #include "chrome/browser/autofill/phone_number_i18n.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/autofill/risk/fingerprint.cc b/chrome/browser/autofill/risk/fingerprint.cc index e9b7249..d87aa367 100644 --- a/chrome/browser/autofill/risk/fingerprint.cc +++ b/chrome/browser/autofill/risk/fingerprint.cc @@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/cpu.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_service_base.h" #include "base/string_split.h" #include "base/sys_info.h" @@ -15,7 +16,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/risk/proto/fingerprint.pb.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "content/public/browser/content_browser_client.h" diff --git a/chrome/browser/autofill/risk/fingerprint_browsertest.cc b/chrome/browser/autofill/risk/fingerprint_browsertest.cc index 5237eff..cafe548 100644 --- a/chrome/browser/autofill/risk/fingerprint_browsertest.cc +++ b/chrome/browser/autofill/risk/fingerprint_browsertest.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/port.h" +#include "base/prefs/pref_registry_simple.h" #include "base/prefs/public/pref_service_base.h" #include "chrome/browser/autofill/risk/proto/fingerprint.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index b519f11..7503ae2 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -17,6 +17,7 @@ #include "base/json/string_escape.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/process_util.h" #include "base/stl_util.h" #include "base/string_util.h" @@ -40,7 +41,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_job.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ssl/ssl_blocking_page.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 3982d57..fe99a4c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -17,6 +17,7 @@ #include "base/json/json_writer.h" #include "base/json/string_escape.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/process.h" #include "base/process_util.h" #include "base/sequenced_task_runner.h" @@ -74,7 +75,6 @@ #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index 785e73c..34f785f 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -9,6 +9,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "base/command_line.h" #include "base/i18n/time_formatting.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -38,7 +39,6 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/chromeos/system/timezone_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 173b10b..38b24f5 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -19,7 +20,6 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -29,8 +29,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/site_instance.h" diff --git a/chrome/browser/background/background_contents_service_factory.cc b/chrome/browser/background/background_contents_service_factory.cc index 12670b1..525563a 100644 --- a/chrome/browser/background/background_contents_service_factory.cc +++ b/chrome/browser/background/background_contents_service_factory.cc @@ -5,9 +5,9 @@ #include "chrome/browser/background/background_contents_service_factory.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc index e7e67f7..6964c11 100644 --- a/chrome/browser/background/background_contents_service_unittest.cc +++ b/chrome/browser/background/background_contents_service_unittest.cc @@ -7,10 +7,10 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 513d79f..868f12c 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -10,6 +10,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background/background_application_list_model.h" @@ -19,8 +21,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/background/background_mode_manager_mac.mm b/chrome/browser/background/background_mode_manager_mac.mm index 4eaf8fb..3f764b6 100644 --- a/chrome/browser/background/background_mode_manager_mac.mm +++ b/chrome/browser/background/background_mode_manager_mac.mm @@ -5,9 +5,9 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/mac/mac_util.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/bookmarks/bookmark_prompt_prefs.cc b/chrome/browser/bookmarks/bookmark_prompt_prefs.cc index b412c12..508444f 100644 --- a/chrome/browser/bookmarks/bookmark_prompt_prefs.cc +++ b/chrome/browser/bookmarks/bookmark_prompt_prefs.cc @@ -4,8 +4,8 @@ #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" BookmarkPromptPrefs::BookmarkPromptPrefs(PrefServiceBase* user_prefs) diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 6d63505..4a3798a 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -11,6 +11,7 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -19,7 +20,6 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc index 3a46fe0..f793170 100644 --- a/chrome/browser/browser_encoding_browsertest.cc +++ b/chrome/browser/browser_encoding_browsertest.cc @@ -5,9 +5,9 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index c5d3e8e..69167b6 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -16,6 +16,8 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" @@ -51,8 +53,6 @@ #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_tracker.h" #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/print_job_manager.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 7402cac..cb7d186 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -13,6 +13,8 @@ #include "base/file_util.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/process_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -26,8 +28,6 @@ #include "chrome/browser/jankometer.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/service/service_process_control.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index 10e52d9..ec080a8 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc @@ -4,9 +4,9 @@ #include "base/file_path.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc index 947ce49..58b1dd5 100644 --- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc +++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc @@ -7,6 +7,7 @@ #include <string> #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h" #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h" #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h" @@ -20,7 +21,6 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/mock_settings_observer.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 47685bc..ffebe9d 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -12,13 +12,13 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/captive_portal/captive_portal_service.h" #include "chrome/browser/captive_portal/captive_portal_service_factory.h" #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc index 32e1a80..eb97495 100644 --- a/chrome/browser/captive_portal/captive_portal_service.cc +++ b/chrome/browser/captive_portal/captive_portal_service.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc index 193ec9b..cc0a4ff 100644 --- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/test/test_timeouts.h" #include "chrome/browser/captive_portal/testing_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 53c4a5d..e24ae17 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -22,6 +22,9 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/pref_value_store.h" #include "base/process_info.h" #include "base/process_util.h" #include "base/run_loop.h" @@ -76,9 +79,6 @@ #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index ea0d665..c29692b 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -19,8 +19,8 @@ #include "base/command_line.h" #include "base/linux_util.h" +#include "base/prefs/pref_service.h" #include "chrome/app/breakpad_linux.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/env_vars.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index d2d593e..a3c33ea 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_tokenizer.h" #include "base/utf_string_conversions.h" #include "chrome/app/breakpad_mac.h" @@ -49,7 +50,6 @@ #include "chrome/browser/platform_util.h" #include "chrome/browser/plugins/plugin_info_message_filter.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" diff --git a/chrome/browser/chrome_page_zoom.cc b/chrome/browser/chrome_page_zoom.cc index e18692b..bd33a15 100644 --- a/chrome/browser/chrome_page_zoom.cc +++ b/chrome/browser/chrome_page_zoom.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <cmath> +#include "base/prefs/pref_service.h" #include "chrome/browser/chrome_page_zoom_constants.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 84b3c0c..0e662d0 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -7,10 +7,10 @@ #include <string> #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 730611c..0d18d03 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -11,11 +11,11 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_to_mobile_service_factory.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/token_service.h" diff --git a/chrome/browser/chrome_to_mobile_service_unittest.cc b/chrome/browser/chrome_to_mobile_service_unittest.cc index 59c07ec..79635c8 100644 --- a/chrome/browser/chrome_to_mobile_service_unittest.cc +++ b/chrome/browser/chrome_to_mobile_service_unittest.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chrome_to_mobile_service.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_to_mobile_service_factory.h" -#include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/feature_switch.h" diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc index c74c655..e5a8476 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc @@ -15,6 +15,7 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/accessibility/accessibility_extension_api.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" @@ -22,7 +23,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/file_reader.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/tts_controller.h" diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc index a6fd891..6ae801a 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc @@ -10,9 +10,9 @@ #include "ash/system/tray/system_tray_notifier.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc index c99202a..e6f421c 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc @@ -5,6 +5,7 @@ #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" @@ -13,7 +14,6 @@ #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/user_manager_impl.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc index 051fda7..a025ec3 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc @@ -6,7 +6,7 @@ #include "ash/magnifier/magnifier_constants.h" #include "ash/test/ash_test_base.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/audio/audio_handler.cc b/chrome/browser/chromeos/audio/audio_handler.cc index ebf4fcd..b0f83d8 100644 --- a/chrome/browser/chromeos/audio/audio_handler.cc +++ b/chrome/browser/chromeos/audio/audio_handler.cc @@ -17,8 +17,8 @@ #else #include "chrome/browser/chromeos/audio/audio_mixer_alsa.h" #endif -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 7df0c70..547d806 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -16,6 +16,7 @@ #include "base/lazy_instance.h" #include "base/linux_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" @@ -71,7 +72,6 @@ #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/rlz/rlz.h" diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index bad0dc9..f0a5b6b 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -10,6 +10,8 @@ #include "base/file_util.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -18,8 +20,6 @@ #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/system/statistics_provider.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc index abcb42c..97e0820 100644 --- a/chrome/browser/chromeos/display/display_preferences.cc +++ b/chrome/browser/chromeos/display/display_preferences.cc @@ -7,14 +7,14 @@ #include "ash/display/display_controller.h" #include "ash/display/display_manager.h" #include "ash/shell.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" #include "googleurl/src/url_canon.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc index c5d1d9f..b901c74 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.cc +++ b/chrome/browser/chromeos/drive/drive_file_system.cc @@ -10,6 +10,7 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" @@ -26,7 +27,6 @@ #include "chrome/browser/google_apis/drive_api_util.h" #include "chrome/browser/google_apis/drive_service_interface.h" #include "chrome/browser/google_apis/drive_uploader.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/drive/drive_scheduler.cc b/chrome/browser/chromeos/drive/drive_scheduler.cc index 905d441..1dfa11d 100644 --- a/chrome/browser/chromeos/drive/drive_scheduler.cc +++ b/chrome/browser/chromeos/drive/drive_scheduler.cc @@ -7,11 +7,11 @@ #include <math.h> #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc b/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc index 9b38173..b4dec48 100644 --- a/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/google_apis/fake_drive_service.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client.cc b/chrome/browser/chromeos/drive/drive_sync_client.cc index 739ab7f..a3aa238 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client.cc @@ -9,11 +9,11 @@ #include "base/bind.h" #include "base/message_loop_proxy.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_sync_client_observer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc index a5a30af..3c88346 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc @@ -14,6 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/drive.pb.h" @@ -21,7 +22,6 @@ #include "chrome/browser/chromeos/drive/drive_sync_client_observer.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/mock_drive_file_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/chromeos/drive/drive_system_service.cc b/chrome/browser/chromeos/drive/drive_system_service.cc index d7c85b2..8d61c70 100644 --- a/chrome/browser/chromeos/drive/drive_system_service.cc +++ b/chrome/browser/chromeos/drive/drive_system_service.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/drive_download_handler.h" #include "chrome/browser/chromeos/drive/drive_file_system.h" @@ -25,7 +26,6 @@ #include "chrome/browser/google_apis/drive_uploader.h" #include "chrome/browser/google_apis/gdata_wapi_service.h" #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/chromeos/drive/drive_system_service_browsertest.cc b/chrome/browser/chromeos/drive/drive_system_service_browsertest.cc index 119ce2a..93f9237 100644 --- a/chrome/browser/chromeos/drive/drive_system_service_browsertest.cc +++ b/chrome/browser/chromeos/drive/drive_system_service_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/drive_system_service.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index 20a86d8..6204326 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -5,11 +5,11 @@ #include "chrome/browser/chromeos/drive/search_metadata.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/drive_file_system.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/google_apis/fake_drive_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index 921be57..4f34fe5 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/values.h" @@ -25,7 +26,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/google_apis/drive_service_interface.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router_browsertest.cc b/chrome/browser/chromeos/extensions/file_browser_event_router_browsertest.cc index 1ec734d..6502e04 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/extensions/file_browser_private_api.h" #include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h index 8450fde..b1dfb7f 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.h +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h @@ -12,12 +12,12 @@ #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/drive/drive_file_error.h" #include "chrome/browser/chromeos/drive/search_metadata.h" #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" #include "chrome/browser/chromeos/extensions/zip_file_creator.h" #include "chrome/browser/extensions/extension_function.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "googleurl/src/url_util.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_resource_throttle_browsertest.cc b/chrome/browser/chromeos/extensions/file_browser_resource_throttle_browsertest.cc index fc58288..fbe8819 100644 --- a/chrome/browser/chromeos/extensions/file_browser_resource_throttle_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_browser_resource_throttle_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/extensions/file_browser_handler.h" #include "chrome/browser/chromeos/extensions/file_browser_resource_throttle.h" #include "chrome/browser/download/download_prefs.h" @@ -13,7 +14,6 @@ #include "chrome/browser/google_apis/test_server/http_request.h" #include "chrome/browser/google_apis/test_server/http_response.h" #include "chrome/browser/google_apis/test_server/http_server.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.cc" diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc index a69cdc4..6bd19a9e 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.cc b/chrome/browser/chromeos/input_method/input_method_persistence.cc index 4bb10e9..dd52eec 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence.cc @@ -5,10 +5,10 @@ #include "chrome/browser/chromeos/input_method/input_method_persistence.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/language_preferences.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc index 0546523..07ca00c 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/input_method/input_method_persistence.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" #include "chrome/browser/chromeos/language_preferences.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc index 6ba6e99..9e3144f 100644 --- a/chrome/browser/chromeos/language_preferences.cc +++ b/chrome/browser/chromeos/language_preferences.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/chromeos/language_preferences.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index d7e6219..7c6721f 100644 --- a/chrome/browser/chromeos/locale_change_guard.cc +++ b/chrome/browser/chromeos/locale_change_guard.cc @@ -8,12 +8,12 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/notifications/notification_delegate.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc index a25d034..7782abb 100644 --- a/chrome/browser/chromeos/login/base_login_display_host.cc +++ b/chrome/browser/chromeos/login/base_login_display_host.cc @@ -12,6 +12,7 @@ #include "base/debug/trace_event.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -36,7 +37,6 @@ #include "chrome/browser/managed_mode/managed_mode.h" #include "chrome/browser/policy/auto_enrollment_client.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 3b6632a3..d8dfcd7 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -34,7 +35,6 @@ #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/policy/policy_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index e067245..4b28738 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -6,6 +6,7 @@ #include "ash/shell.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -15,7 +16,6 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/login/language_list.h" #include "chrome/browser/chromeos/login/screen_observer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 63d6a6d..7f40e6b 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -21,7 +22,6 @@ #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/device_local_account_policy_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 8f53d42..efcfa97 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -18,6 +18,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -55,7 +56,6 @@ #include "chrome/browser/policy/cloud_policy_client.h" #include "chrome/browser/policy/cloud_policy_service.h" #include "chrome/browser/policy/network_configuration_updater.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/rlz/rlz.h" diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 9788ead..956bfd7 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -10,6 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/threading/sequenced_worker_pool.h" @@ -28,7 +29,6 @@ #include "chrome/browser/policy/enterprise_install_attributes.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/login/oauth2_login_manager.cc b/chrome/browser/chromeos/login/oauth2_login_manager.cc index 6d67d7c..2497fb5 100644 --- a/chrome/browser/chromeos/login/oauth2_login_manager.cc +++ b/chrome/browser/chromeos/login/oauth2_login_manager.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/login/oauth2_login_manager.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/chromeos/login/terms_of_service_screen.cc b/chrome/browser/chromeos/login/terms_of_service_screen.cc index 42adc17..fbcd9e2 100644 --- a/chrome/browser/chromeos/login/terms_of_service_screen.cc +++ b/chrome/browser/chromeos/login/terms_of_service_screen.cc @@ -8,13 +8,13 @@ #include "base/location.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/screen_observer.h" #include "chrome/browser/chromeos/login/user.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc index 3a3e764..acc74f9 100644 --- a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc @@ -8,13 +8,13 @@ #include "base/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/login/default_user_images.h" #include "chrome/browser/chromeos/login/mock_user_manager.h" #include "chrome/browser/chromeos/login/user_image_manager_impl.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc index 4e5aaf5..096b4b3 100644 --- a/chrome/browser/chromeos/login/user_image_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc @@ -11,6 +11,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/threading/worker_pool.h" #include "base/time.h" @@ -20,8 +22,6 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/user_image.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_downloader.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 8aff7dd..8c4450c 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -16,6 +16,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -30,8 +32,6 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/power/session_length_limiter.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc index 325f225..c82913c 100644 --- a/chrome/browser/chromeos/login/user_manager_unittest.cc +++ b/chrome/browser/chromeos/login/user_manager_unittest.cc @@ -7,6 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -19,7 +20,6 @@ #include "chrome/browser/chromeos/settings/cros_settings_provider.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index 6177eb5..57e89be 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -13,6 +13,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -24,8 +26,6 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index f64c362..d3689c4 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -17,6 +17,8 @@ #include "base/file_util.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/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -40,8 +42,6 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/options/options_util.h" diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc index b55f041..0c4357f 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.cc +++ b/chrome/browser/chromeos/mobile/mobile_activator.cc @@ -17,6 +17,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/observer_list_threadsafe.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/timer.h" @@ -25,7 +26,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index 1c6e8b1..7892ecc 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/chrome/browser/chromeos/network_message_observer.cc @@ -11,13 +11,13 @@ #include "ash/system/tray/system_tray_notifier.h" #include "base/bind.h" #include "base/callback.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/chromeos/power/session_length_limiter.cc b/chrome/browser/chromeos/power/session_length_limiter.cc index a89cd8d..59a6267 100644 --- a/chrome/browser/chromeos/power/session_length_limiter.cc +++ b/chrome/browser/chromeos/power/session_length_limiter.cc @@ -10,11 +10,11 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_service_base.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" namespace chromeos { diff --git a/chrome/browser/chromeos/power/suspend_observer.cc b/chrome/browser/chromeos/power/suspend_observer.cc index 2ff5267..7924d81 100644 --- a/chrome/browser/chromeos/power/suspend_observer.cc +++ b/chrome/browser/chromeos/power/suspend_observer.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/power/suspend_observer.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/extensions/system/system_api.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 528d22d..752ebdf 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -9,15 +9,15 @@ #include "base/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/settings/device_settings_cache.cc b/chrome/browser/chromeos/settings/device_settings_cache.cc index a9bf424..f9b6afd 100644 --- a/chrome/browser/chromeos/settings/device_settings_cache.cc +++ b/chrome/browser/chromeos/settings/device_settings_cache.cc @@ -8,10 +8,10 @@ #include "base/base64.h" #include "base/bind.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" namespace em = enterprise_management; diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc index f58d4b2..44a2534 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" @@ -23,7 +24,6 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/cloud_policy_constants.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc index 989aea8..edda26f 100644 --- a/chrome/browser/chromeos/status/data_promo_notification.cc +++ b/chrome/browser/chromeos/status/data_promo_notification.cc @@ -9,6 +9,8 @@ #include "ash/system/chromeos/network/network_observer.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -16,8 +18,6 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/mobile_config.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index d69e280..f90742a 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -34,6 +34,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_service_base.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -68,7 +69,6 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/cloud_policy_store.h" #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/volume_controller_chromeos.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index 339d982..1ee6428 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc @@ -9,6 +9,7 @@ #include "ash/system/tray_accessibility.h" #include "ash/system/user/login_status.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" @@ -17,7 +18,6 @@ #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/user_manager_impl.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index f665b68..d96a693 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc @@ -12,12 +12,12 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/process_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/component_updater/component_updater_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index 8133505..e401063 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc index cb92744..d636bfb 100644 --- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -4,10 +4,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_default_provider.h" #include "chrome/browser/content_settings/content_settings_mock_observer.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc index 1d8f31a..a405897 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider.cc @@ -8,11 +8,11 @@ #include <vector> #include "base/json/json_reader.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc index a2ffa01..7bfafff 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc @@ -10,10 +10,10 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_mock_observer.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index 33ba182..f6ab3bf 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -12,11 +12,11 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.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 ca8e570..7801239 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -10,6 +10,7 @@ #include "base/message_loop.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/testing_pref_store.h" #include "base/threading/platform_thread.h" @@ -18,7 +19,6 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc index 50753c2..b13d432 100644 --- a/chrome/browser/content_settings/cookie_settings.cc +++ b/chrome/browser/content_settings/cookie_settings.cc @@ -5,10 +5,10 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc index 68b0197..a3a91ef 100644 --- a/chrome/browser/content_settings/cookie_settings_unittest.cc +++ b/chrome/browser/content_settings/cookie_settings_unittest.cc @@ -5,8 +5,8 @@ #include "base/auto_reset.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/cookie_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 01b150d7..421f0c1 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -23,7 +24,6 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_pattern.h" diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 5d19b03..b0050ab 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -7,11 +7,11 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_details.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/mock_settings_observer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index be39398..d649875 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -9,10 +9,10 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index fca0a06..54f1c08 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index 753d7d6..6e8856d 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc @@ -11,11 +11,11 @@ #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/md5.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/value_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc index 71fbcda..74cb730 100644 --- a/chrome/browser/do_not_track_browsertest.cc +++ b/chrome/browser/do_not_track_browsertest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index cdd91fd..532896f 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/file_util.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/rand_util.h" #include "base/stringprintf.h" @@ -34,7 +35,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index b8e18dc..1a5e2a0 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -7,13 +7,13 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/observer_list.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/value_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/safe_browsing/download_protection_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 4aa80ed..925133b 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -11,6 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/test/test_file_util.h" @@ -36,7 +37,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index f3ecd58..a2ca783 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include "base/bind_helpers.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -21,7 +22,6 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index 4bea024..6ed710e 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc @@ -6,12 +6,12 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index f0793e6..f011a12 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -9,6 +9,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/test/test_file_util.h" #include "chrome/app/chrome_command_ids.h" @@ -19,7 +20,6 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/history/download_row.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc index 87aa262..a46d9e2 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc @@ -8,13 +8,13 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/extensions/extension_function_test_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 5cb6179..0a82bcc 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map.h" @@ -22,7 +23,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_installer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/content_settings.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index a37f37a..f5a317d 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index 23f758a..71089dd 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -8,6 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "chrome/browser/download/download_file_icon_extractor.h" @@ -20,7 +21,6 @@ #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/history/download_row.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc index 15f11be..e1f4a32 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc @@ -10,13 +10,13 @@ #include "base/command_line.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/font_settings.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 183c4da..93dcf9e 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -11,11 +11,11 @@ #include <string> #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function.h" -#include "chrome/browser/prefs/pref_service.h" class Profile; diff --git a/chrome/browser/extensions/api/font_settings/font_settings_apitest.cc b/chrome/browser/extensions/api/font_settings/font_settings_apitest.cc index 84f4254..64733a8 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_apitest.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_apitest.cc @@ -4,8 +4,8 @@ // Font Settings Extension API browser tests. +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/chrome/browser/extensions/api/i18n/i18n_api.cc index 6c97dc4..af33722 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/chrome/browser/extensions/api/i18n/i18n_api.cc @@ -9,9 +9,9 @@ #include <vector> #include "base/lazy_instance.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/string_split.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/i18n.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.h" diff --git a/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc b/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc index eaca495..48c9452 100644 --- a/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc +++ b/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc @@ -11,12 +11,12 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/managed_mode/managed_mode.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 55cc2c3..b2dc049 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" @@ -14,7 +15,6 @@ #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/updater/extension_downloader.h" #include "chrome/browser/extensions/updater/extension_updater.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index f56276e..463e5ad 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/values.h" @@ -19,7 +20,6 @@ #include "chrome/browser/extensions/extension_prefs_scope.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/permissions/api_permission.h" diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index d9cd21a..5a17b59 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc index 7a7af96..739f401 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.cc +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc @@ -5,12 +5,12 @@ #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "base/json/json_writer.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" namespace extensions { diff --git a/chrome/browser/extensions/api/proxy/proxy_apitest.cc b/chrome/browser/extensions/api/proxy/proxy_apitest.cc index 88290b7..be76c40 100644 --- a/chrome/browser/extensions/api/proxy/proxy_apitest.cc +++ b/chrome/browser/extensions/api/proxy/proxy_apitest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 2d2da44..9f91fd7 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string16.h" #include "base/string_util.h" @@ -33,7 +34,6 @@ #include "chrome/browser/extensions/window_controller_list.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/translate/translate_tab_helper.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index ec96b6a..320c11e 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -7,6 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" @@ -15,7 +16,6 @@ #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index e218bbe..e07acce 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -21,7 +22,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/gpu/gpu_feature_checker.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/extensions/app_launcher.cc b/chrome/browser/extensions/app_launcher.cc index 3855177..5ca6fbf 100644 --- a/chrome/browser/extensions/app_launcher.cc +++ b/chrome/browser/extensions/app_launcher.cc @@ -5,10 +5,10 @@ #include "chrome/browser/extensions/app_launcher.h" #include "base/command_line.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc index 19b06b8..8e8dbd1 100644 --- a/chrome/browser/extensions/app_notify_channel_setup.cc +++ b/chrome/browser/extensions/app_notify_channel_setup.cc @@ -13,8 +13,8 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc index 03fac35..4f93381 100644 --- a/chrome/browser/extensions/blacklist.cc +++ b/chrome/browser/extensions/blacklist.cc @@ -9,9 +9,9 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/safe_browsing/database_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index a3e87cd..833c482 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -9,11 +9,11 @@ #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" #include "base/prefs/pref_notifier.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index a9cdc83..ced2a70 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/extensions/test_extension_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index d268aeb..4bc5278 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -10,7 +10,7 @@ #if !defined(OS_ANDROID) #include "chrome/browser/first_run/first_run.h" #endif -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc index 2141f75..e9120f9 100644 --- a/chrome/browser/extensions/default_apps_unittest.cc +++ b/chrome/browser/extensions/default_apps_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/external_pref_loader.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/default_apps.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index c03ed27..8443324 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" @@ -11,7 +12,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/management_policy.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 2d039fb..4d88e31 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -16,7 +17,6 @@ #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 6f0a0da..1640c84f 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -5,12 +5,12 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index bbf3fd0..d0989a6 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 8ccbf96..38dcaf3 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/prefs/pref_notifier.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -15,7 +16,6 @@ #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_sorting.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 765fa37..3dd373d 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/prefs/mock_pref_change_callback.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/stringprintf.h" @@ -14,7 +15,6 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/prefs/mock_pref_change_callback.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 759f3b7..8807986 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -16,6 +16,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -66,7 +67,6 @@ #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/extensions/extension_sorting.cc b/chrome/browser/extensions/extension_sorting.cc index b4413c85..d5e07db 100644 --- a/chrome/browser/extensions/extension_sorting.cc +++ b/chrome/browser/extensions/extension_sorting.cc @@ -7,9 +7,9 @@ #include <algorithm> #include <vector> +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_scoped_prefs.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index daffa3d..f2da0b4 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/file_path.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_tokenizer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings.h" @@ -35,7 +36,6 @@ #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 93828b3..6cbd2ba 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_apitest.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index d3b4594..16a9acf 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_toolbar_model.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/browser_event_router.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" @@ -11,7 +12,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 7e41fca..0ddde7c 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" @@ -16,7 +17,6 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/external_policy_loader.cc b/chrome/browser/extensions/external_policy_loader.cc index d84421a..f36ceff 100644 --- a/chrome/browser/extensions/external_policy_loader.cc +++ b/chrome/browser/extensions/external_policy_loader.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 4050315..3b24485 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -9,6 +9,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_names.h" @@ -17,7 +18,6 @@ #include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index c4c6731..3e39b37 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" @@ -19,7 +20,6 @@ #include "chrome/browser/extensions/platform_app_launcher.h" #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 7509eb0..7c159a0 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc b/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc index d6e7ce4..e349da8 100644 --- a/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc +++ b/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" +#include "base/prefs/mock_pref_change_callback.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/shell_window_geometry_cache.h" #include "chrome/browser/extensions/test_extension_prefs.h" -#include "chrome/browser/prefs/mock_pref_change_callback.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc index eba5c60..31c56c9 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.cc +++ b/chrome/browser/extensions/standard_management_policy_provider.cc @@ -4,10 +4,10 @@ #include "chrome/browser/extensions/standard_management_policy_provider.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/admin_policy.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/system/system_api.cc b/chrome/browser/extensions/system/system_api.cc index d6d547d..8d38980 100644 --- a/chrome/browser/extensions/system/system_api.cc +++ b/chrome/browser/extensions/system/system_api.cc @@ -4,10 +4,10 @@ #include "chrome/browser/extensions/system/system_api.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_router_forwarder.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/system/system_apitest.cc b/chrome/browser/extensions/system/system_apitest.cc index 213a648..b74a6b2 100644 --- a/chrome/browser/extensions/system/system_apitest.cc +++ b/chrome/browser/extensions/system/system_apitest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 5424931..2d9a3f6 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -11,6 +11,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_value_store.h" #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" @@ -21,7 +22,6 @@ #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/pref_service_syncable.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_manifest_constants.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index ff28916..dec79d4 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/test_extension_system.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/api/alarms/alarm_manager.h" #include "chrome/browser/extensions/api/messaging/message_service.h" #include "chrome/browser/extensions/blacklist.h" @@ -20,7 +21,6 @@ #include "chrome/browser/extensions/standard_management_policy_provider.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/value_store/testing_value_store.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index f73641b..47958b8 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/string_split.h" @@ -20,7 +21,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/updater/extension_downloader.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc index 9eeed5b..faaecc3 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -9,13 +9,13 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc index e414d2c..f3f7d83 100644 --- a/chrome/browser/favicon/favicon_service_factory.cc +++ b/chrome/browser/favicon/favicon_service_factory.cc @@ -5,10 +5,10 @@ #include "chrome/browser/favicon/favicon_service_factory.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 3c06b3c..c1406c8 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -10,6 +10,8 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" @@ -25,9 +27,7 @@ #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/importer_progress_dialog.h" #include "chrome/browser/importer/importer_progress_observer.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index 63e880f..9f23257 100644 --- a/chrome/browser/first_run/first_run_browsertest.cc +++ b/chrome/browser/first_run/first_run_browsertest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/first_run/first_run_posix.cc b/chrome/browser/first_run/first_run_posix.cc index 57e8f34..f71cf81 100644 --- a/chrome/browser/first_run/first_run_posix.cc +++ b/chrome/browser/first_run/first_run_posix.cc @@ -5,6 +5,7 @@ #include "chrome/browser/first_run/first_run.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run_internal.h" @@ -12,7 +13,6 @@ #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/importer_progress_dialog.h" #include "chrome/browser/importer/importer_progress_observer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index f04f4bf..429b0b9 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -13,6 +13,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/process_util.h" #include "base/string_split.h" #include "base/stringprintf.h" @@ -29,7 +30,6 @@ #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/importer_progress_dialog.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc index e01886e..7007abe5 100644 --- a/chrome/browser/geolocation/chrome_access_token_store.cc +++ b/chrome/browser/geolocation/chrome_access_token_store.cc @@ -5,12 +5,12 @@ #include "chrome/browser/geolocation/chrome_access_token_store.h" #include "base/bind.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc index 88253b8..3a8a978 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc @@ -4,8 +4,8 @@ #include "chrome/browser/geolocation/chrome_geolocation_permission_context_android.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/android/google_location_settings_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h index 3ab4289..dadd048 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_FACTORY_H_ #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h" class ChromeGeolocationPermissionContext; diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index f7871a86..c7a9ee4 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -33,9 +33,9 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_ANDROID) -#include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/pref_names.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/android/mock_google_location_settings_helper.h" +#include "chrome/common/pref_names.h" #endif using content::MockRenderProcessHost; diff --git a/chrome/browser/geolocation/geolocation_infobar_queue_controller.cc b/chrome/browser/geolocation/geolocation_infobar_queue_controller.cc index e336b9e..3c9c221 100644 --- a/chrome/browser/geolocation/geolocation_infobar_queue_controller.cc +++ b/chrome/browser/geolocation/geolocation_infobar_queue_controller.cc @@ -4,11 +4,11 @@ #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc index 7746bbf..41b26ac 100644 --- a/chrome/browser/geolocation/geolocation_settings_state.cc +++ b/chrome/browser/geolocation/geolocation_settings_state.cc @@ -6,10 +6,10 @@ #include <string> +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/navigation_details.h" diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index b935e2b..6e616fe 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/google/google_url_tracker_factory.cc b/chrome/browser/google/google_url_tracker_factory.cc index ad49875..f23269f 100644 --- a/chrome/browser/google/google_url_tracker_factory.cc +++ b/chrome/browser/google/google_url_tracker_factory.cc @@ -4,9 +4,9 @@ #include "chrome/browser/google/google_url_tracker_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index 8b511ee..8ccfc6c 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -8,11 +8,11 @@ #include <string> #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/google/google_util_chromeos.cc b/chrome/browser/google/google_util_chromeos.cc index 5fb4ad9..90251ba 100644 --- a/chrome/browser/google/google_util_chromeos.cc +++ b/chrome/browser/google/google_util_chromeos.cc @@ -7,11 +7,11 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/task_runner_util.h" #include "base/threading/worker_pool.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/gpu/gl_string_manager.cc b/chrome/browser/gpu/gl_string_manager.cc index 1f2382d..6e7091b 100644 --- a/chrome/browser/gpu/gl_string_manager.cc +++ b/chrome/browser/gpu/gl_string_manager.cc @@ -4,9 +4,9 @@ #include "chrome/browser/gpu/gl_string_manager.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/gpu_data_manager.h" diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 633f492..5bb2367 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index 4c65998..b96d1d4 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -33,6 +33,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/sequenced_task_runner.h" #include "base/string_util.h" @@ -53,7 +54,6 @@ #include "chrome/browser/history/top_sites.h" #include "chrome/browser/history/visit_database.h" #include "chrome/browser/history/visit_filter.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc index e62448a..813c0a0 100644 --- a/chrome/browser/history/history_service_factory.cc +++ b/chrome/browser/history/history_service_factory.cc @@ -4,10 +4,10 @@ #include "chrome/browser/history/history_service_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/history_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/history/shortcuts_backend_factory.cc b/chrome/browser/history/shortcuts_backend_factory.cc index da37fc7..566dbae 100644 --- a/chrome/browser/history/shortcuts_backend_factory.cc +++ b/chrome/browser/history/shortcuts_backend_factory.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/shortcuts_backend_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/history/shortcuts_backend.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 046e039..e1e4067 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -13,6 +13,7 @@ #include "base/md5.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop_proxy.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/task_runner.h" #include "base/utf_string_conversions.h" @@ -23,7 +24,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites_cache.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ntp/most_visited_handler.h" diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index b9f7a47..88e8cf8 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" @@ -17,7 +18,6 @@ #include "chrome/browser/importer/importer_type.h" #include "chrome/browser/importer/in_process_importer_bridge.h" #include "chrome/browser/importer/toolbar_importer_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 2555b59..0c59448 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" @@ -20,7 +21,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/instant/instant_test_utils.cc b/chrome/browser/instant/instant_test_utils.cc index efd35a3..5c179bc 100644 --- a/chrome/browser/instant/instant_test_utils.cc +++ b/chrome/browser/instant/instant_test_utils.cc @@ -5,7 +5,7 @@ #include "chrome/browser/instant/instant_test_utils.h" #include "base/command_line.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index c92000e..308a14a 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 8677d13..f522fbc 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -12,6 +12,8 @@ #include "base/compiler_specific.h" #include "base/debug/leak_tracker.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/string_util.h" @@ -35,8 +37,6 @@ #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.h" #include "chrome/browser/policy/policy_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc index 036f651..b3ceb75 100644 --- a/chrome/browser/lifetime/application_lifetime.cc +++ b/chrome/browser/lifetime/application_lifetime.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/metrics/thread_watcher.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/lifetime/application_lifetime_android.cc b/chrome/browser/lifetime/application_lifetime_android.cc index f385cd7..e359b79 100644 --- a/chrome/browser/lifetime/application_lifetime_android.cc +++ b/chrome/browser/lifetime/application_lifetime_android.cc @@ -8,9 +8,9 @@ #include "base/android/jni_android.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc index 5f426c7..01cb1f7 100644 --- a/chrome/browser/managed_mode/managed_mode.cc +++ b/chrome/browser/managed_mode/managed_mode.cc @@ -5,13 +5,13 @@ #include "chrome/browser/managed_mode/managed_mode.h" #include "base/command_line.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/sequenced_task_runner.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" #include "chrome/browser/policy/url_blacklist_manager.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc index f3de7d1..96caea6 100644 --- a/chrome/browser/managed_mode/managed_mode_browsertest.cc +++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" @@ -12,7 +13,6 @@ #include "chrome/browser/managed_mode/managed_user_service.h" #include "chrome/browser/managed_mode/managed_user_service_factory.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc index d3e7471..e585274 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.cc +++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc @@ -6,8 +6,8 @@ #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc index cc2ac2c..31c3573 100644 --- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc +++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" @@ -17,7 +18,6 @@ #include "chrome/browser/managed_mode/managed_mode_url_filter.h" #include "chrome/browser/managed_mode/managed_user_service.h" #include "chrome/browser/managed_mode/managed_user_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 045dc9a..b596956 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -5,12 +5,12 @@ #include "chrome/browser/managed_mode/managed_user_service.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc index f920063..0850622 100644 --- a/chrome/browser/managed_mode/managed_user_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/managed_mode/managed_user_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 215b58d..f1d6165 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -4,9 +4,9 @@ #include "chrome/browser/media/media_capture_devices_dispatcher.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/media/media_stream_capture_indicator.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc index 08bc4cc..e533b74 100644 --- a/chrome/browser/media/media_stream_devices_controller.cc +++ b/chrome/browser/media/media_stream_devices_controller.cc @@ -5,6 +5,7 @@ #include "chrome/browser/media/media_stream_devices_controller.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/content_settings/content_settings_provider.h" #include "chrome/browser/content_settings/host_content_settings_map.h" @@ -13,7 +14,6 @@ #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc index 3db6468..5ca1e0a 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.cc +++ b/chrome/browser/media_gallery/media_file_system_registry.cc @@ -15,6 +15,7 @@ #include "base/file_path.h" #include "base/json/json_writer.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" @@ -26,7 +27,6 @@ #include "chrome/browser/media_gallery/media_file_system_context.h" #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h" #include "chrome/browser/media_gallery/scoped_mtp_device_map_entry.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/system_monitor/media_storage_util.h" #include "chrome/browser/system_monitor/removable_storage_notifications.h" diff --git a/chrome/browser/media_gallery/media_galleries_preferences.cc b/chrome/browser/media_gallery/media_galleries_preferences.cc index 978035d..582b5fc 100644 --- a/chrome/browser/media_gallery/media_galleries_preferences.cc +++ b/chrome/browser/media_gallery/media_galleries_preferences.cc @@ -5,6 +5,7 @@ #include "chrome/browser/media_gallery/media_galleries_preferences.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/values.h" @@ -15,7 +16,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_gallery/media_file_system_registry.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/system_monitor/media_storage_util.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index f7a4948..3e51814 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -13,6 +13,8 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/perftimer.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/profiler/alternate_timer.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" @@ -29,8 +31,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/logging_chrome.h" diff --git a/chrome/browser/metrics/metrics_log_serializer.cc b/chrome/browser/metrics/metrics_log_serializer.cc index f99b544..ca3c00b 100644 --- a/chrome/browser/metrics/metrics_log_serializer.cc +++ b/chrome/browser/metrics/metrics_log_serializer.cc @@ -7,8 +7,8 @@ #include "base/base64.h" #include "base/md5.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index 19ac1e5..72df209 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "base/port.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/time.h" @@ -14,7 +15,6 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/metrics/metrics_log.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/metrics/proto/profiler_event.pb.h" #include "chrome/common/metrics/proto/system_profile.pb.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index da89ce6..cb183c7 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -158,6 +158,8 @@ #include "base/md5.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/threading/platform_thread.h" @@ -178,8 +180,6 @@ #include "chrome/browser/metrics/tracking_synchronizer.h" #include "chrome/browser/net/http_pipelining_compatibility_client.h" #include "chrome/browser/net/network_stats.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 542edbf..55093ca 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -10,9 +10,9 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/metrics/variations/variations_service.cc b/chrome/browser/metrics/variations/variations_service.cc index a6fd9ae..7f55041 100644 --- a/chrome/browser/metrics/variations/variations_service.cc +++ b/chrome/browser/metrics/variations/variations_service.cc @@ -12,11 +12,11 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/proto/trials_seed.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/chrome_http_user_agent_settings.cc b/chrome/browser/net/chrome_http_user_agent_settings.cc index e42e7f5..a7bdde5 100644 --- a/chrome/browser/net/chrome_http_user_agent_settings.cc +++ b/chrome/browser/net/chrome_http_user_agent_settings.cc @@ -4,7 +4,7 @@ #include "chrome/browser/net/chrome_http_user_agent_settings.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_client.h" diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 7125e73..93ff16a 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" @@ -27,7 +28,6 @@ #include "chrome/browser/net/connect_interceptor.h" #include "chrome/browser/net/load_time_stats.h" #include "chrome/browser/performance_monitor/performance_monitor.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index 1fbec10..2fb5fa5 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc index 1e9c291..d74b05c 100644 --- a/chrome/browser/net/http_server_properties_manager.cc +++ b/chrome/browser/net/http_server_properties_manager.cc @@ -4,12 +4,12 @@ #include "chrome/browser/net/http_server_properties_manager.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/net/http_server_properties_manager_unittest.cc b/chrome/browser/net/http_server_properties_manager_unittest.cc index a883900d..7c8dbbe 100644 --- a/chrome/browser/net/http_server_properties_manager_unittest.cc +++ b/chrome/browser/net/http_server_properties_manager_unittest.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc index 5b401b8..db6e311 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/metrics/field_trial.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/dns_probe_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/net/net_error_info.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc index e2cdc24..65d94da 100644 --- a/chrome/browser/net/net_pref_observer.cc +++ b/chrome/browser/net/net_pref_observer.cc @@ -4,9 +4,9 @@ #include "chrome/browser/net/net_pref_observer.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 88ddd6b..fb77931 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/string_util.h" @@ -24,7 +25,6 @@ #include "chrome/browser/io_thread.h" #include "chrome/browser/net/preconnect.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/net/predictor_browsertest.cc b/chrome/browser/net/predictor_browsertest.cc index cdc10e0..3182b8c 100644 --- a/chrome/browser/net/predictor_browsertest.cc +++ b/chrome/browser/net/predictor_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/json/json_string_value_serializer.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/net/predictor.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc index 4c48a32..17ba22c 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc @@ -5,10 +5,10 @@ #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" #include "base/bind.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc index a51630f..7860bdb 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index 3e8718e..4303b8f 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -9,11 +9,11 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/public/pref_member.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index 8b7306a..d1b5b4b 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_store.h" #include "base/values.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/notifications/balloon_notification_ui_manager.cc b/chrome/browser/notifications/balloon_notification_ui_manager.cc index f49ec6a..6497fd7 100644 --- a/chrome/browser/notifications/balloon_notification_ui_manager.cc +++ b/chrome/browser/notifications/balloon_notification_ui_manager.cc @@ -6,13 +6,13 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/fullscreen.h" #include "chrome/browser/idle.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 8fd12db..3cfdc1a 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -6,11 +6,11 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/notifications/notification_prefs_manager.cc b/chrome/browser/notifications/notification_prefs_manager.cc index 1283d14..97e12eb 100644 --- a/chrome/browser/notifications/notification_prefs_manager.cc +++ b/chrome/browser/notifications/notification_prefs_manager.cc @@ -4,8 +4,8 @@ #include "chrome/browser/notifications/notification_prefs_manager.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/common/pref_names.h" // static diff --git a/chrome/browser/notifications/notification_ui_manager_impl.cc b/chrome/browser/notifications/notification_ui_manager_impl.cc index fcf56e8..324530f 100644 --- a/chrome/browser/notifications/notification_ui_manager_impl.cc +++ b/chrome/browser/notifications/notification_ui_manager_impl.cc @@ -5,6 +5,7 @@ #include "chrome/browser/notifications/notification_ui_manager_impl.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/memory/linked_ptr.h" #include "base/stl_util.h" #include "chrome/browser/browser_process.h" @@ -12,7 +13,6 @@ #include "chrome/browser/idle.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index e89fae2..538835e 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -9,12 +9,12 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/autocomplete/autocomplete_log.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_result.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index eb0e44d..393ecdb 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -5,13 +5,13 @@ #include <stdarg.h> #include "base/basictypes.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 190b40e..ad00e11 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -9,11 +9,11 @@ #include "base/bind.h" #include "base/pickle.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_kwallet_x.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index e1f93fc..d6c0008a 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -5,13 +5,13 @@ #include "chrome/browser/password_manager/password_manager.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/password_manager/password_manager_delegate.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc index 22ace74..8ae53fb 100644 --- a/chrome/browser/password_manager/password_store_default.cc +++ b/chrome/browser/password_manager/password_store_default.cc @@ -7,9 +7,9 @@ #include <set> #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_change.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 2febab2b..92d0e98 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -5,6 +5,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" @@ -14,7 +15,6 @@ #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_default.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index db128af..0df883c 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/environment.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_default.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/webdata/web_data_service_factory.h" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 142cb93..bde353a 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -12,6 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" @@ -19,7 +20,6 @@ #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_win.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index 017c838..f0fd998 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/chrome/browser/password_manager/password_store_x.cc @@ -10,10 +10,10 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 95ae367..8ba62cc 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -18,7 +19,6 @@ #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_x.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc index 05ab26c..b225bca 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.cc +++ b/chrome/browser/pepper_broker_infobar_delegate.cc @@ -4,12 +4,12 @@ #include "chrome/browser/pepper_broker_infobar_delegate.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_metadata.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index e5b3e18..8da7276 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -10,11 +10,11 @@ #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner_helpers.h" #include "base/utf_string_conversions.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index fcfc6bf..0c309ab 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -7,14 +7,14 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/plugins/plugin_metadata.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 0c653a7..3c4d31e 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_metadata.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 944378c..1840c20 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/file_path.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/plugins/plugin_finder.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" class Profile; diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc index 6f49307..1e20e2f 100644 --- a/chrome/browser/plugins/plugin_prefs_factory.cc +++ b/chrome/browser/plugins/plugin_prefs_factory.cc @@ -5,9 +5,9 @@ #include "chrome/browser/plugins/plugin_prefs_factory.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/plugins/plugin_status_pref_setter.cc b/chrome/browser/plugins/plugin_status_pref_setter.cc index b9113c7..e7a6b9d 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.cc +++ b/chrome/browser/plugins/plugin_status_pref_setter.cc @@ -5,10 +5,10 @@ #include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/plugins/plugin_data_remover_helper.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/policy/auto_enrollment_client.cc b/chrome/browser/policy/auto_enrollment_client.cc index 06dbba0..e94a3be 100644 --- a/chrome/browser/policy/auto_enrollment_client.cc +++ b/chrome/browser/policy/auto_enrollment_client.cc @@ -11,13 +11,13 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" #include "chrome/browser/policy/device_management_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "crypto/sha2.h" diff --git a/chrome/browser/policy/auto_enrollment_client_unittest.cc b/chrome/browser/policy/auto_enrollment_client_unittest.cc index 6525372..9060f93 100644 --- a/chrome/browser/policy/auto_enrollment_client_unittest.cc +++ b/chrome/browser/policy/auto_enrollment_client_unittest.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/mock_device_management_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 0dc0abd..949fb8c 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -10,6 +10,8 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -21,8 +23,6 @@ #include "chrome/browser/policy/managed_mode_policy_provider.h" #include "chrome/browser/policy/policy_service_impl.h" #include "chrome/browser/policy/policy_statistics_collector.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/policy/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud_policy_browsertest.cc index 632ca1b..7f60752 100644 --- a/chrome/browser/policy/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud_policy_browsertest.cc @@ -8,6 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" @@ -18,7 +19,6 @@ #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/proto/chrome_settings.pb.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/policy/cloud_policy_core.cc b/chrome/browser/policy/cloud_policy_core.cc index 38c4c2b..2c56562 100644 --- a/chrome/browser/policy/cloud_policy_core.cc +++ b/chrome/browser/policy/cloud_policy_core.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/policy/cloud_policy_client.h" #include "chrome/browser/policy/cloud_policy_refresh_scheduler.h" #include "chrome/browser/policy/cloud_policy_service.h" #include "chrome/browser/policy/cloud_policy_store.h" -#include "chrome/browser/prefs/pref_service.h" namespace policy { diff --git a/chrome/browser/policy/cloud_policy_manager.cc b/chrome/browser/policy/cloud_policy_manager.cc index 56adc26..a89d0ca 100644 --- a/chrome/browser/policy/cloud_policy_manager.cc +++ b/chrome/browser/policy/cloud_policy_manager.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/policy/cloud_policy_service.h" #include "chrome/browser/policy/policy_bundle.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_service.h" namespace policy { diff --git a/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc index 0646374..8655de5 100644 --- a/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_registry_simple.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" @@ -17,7 +18,6 @@ #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/test/base/testing_pref_service.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc index 3b76121..ceba816 100644 --- a/chrome/browser/policy/device_status_collector.cc +++ b/chrome/browser/policy/device_status_collector.cc @@ -11,14 +11,14 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/policy/device_status_collector_browsertest.cc b/chrome/browser/policy/device_status_collector_browsertest.cc index d95b55b..dc89b2f 100644 --- a/chrome/browser/policy/device_status_collector_browsertest.cc +++ b/chrome/browser/policy/device_status_collector_browsertest.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" @@ -16,7 +17,6 @@ #include "chrome/browser/chromeos/system/mock_statistics_provider.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 46011f4..5d44020 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -14,6 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/string16.h" #include "base/stringprintf.h" @@ -37,7 +38,6 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 14243fe..8579e44 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -14,6 +14,7 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "base/string_util.h" @@ -23,7 +24,6 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/policy/policy_statistics_collector.cc b/chrome/browser/policy/policy_statistics_collector.cc index de762c1..0989e44 100644 --- a/chrome/browser/policy/policy_statistics_collector.cc +++ b/chrome/browser/policy/policy_statistics_collector.cc @@ -10,10 +10,10 @@ #include "base/bind.h" #include "base/location.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/task_runner.h" #include "chrome/browser/policy/policy_service.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index 3bc2669..0b6b7b6 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 81000ec..ec4e5db 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" -#include "chrome/browser/prefs/pref_registry_simple.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc index 86fd7ed..2bc6ab97 100644 --- a/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc @@ -7,13 +7,13 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/policy/cloud_policy_constants.h" #include "chrome/browser/policy/mock_cloud_policy_store.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/mock_device_management_service.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/test/base/testing_pref_service.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/policy/user_policy_signin_service.cc b/chrome/browser/policy/user_policy_signin_service.cc index 3207e80..19b70ae 100644 --- a/chrome/browser/policy/user_policy_signin_service.cc +++ b/chrome/browser/policy/user_policy_signin_service.cc @@ -6,6 +6,7 @@ #include <vector> +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/browser_policy_connector.h" @@ -14,7 +15,6 @@ #include "chrome/browser/policy/user_cloud_policy_manager.h" #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" #include "chrome/browser/policy/user_info_fetcher.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/policy/user_policy_signin_service_factory.cc b/chrome/browser/policy/user_policy_signin_service_factory.cc index 7c69c78..3033a97 100644 --- a/chrome/browser/policy/user_policy_signin_service_factory.cc +++ b/chrome/browser/policy/user_policy_signin_service_factory.cc @@ -4,10 +4,10 @@ #include "chrome/browser/policy/user_policy_signin_service_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" #include "chrome/browser/policy/user_policy_signin_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc index 7e40dd2..d6af6dc 100644 --- a/chrome/browser/policy/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/cloud_policy_constants.h" @@ -13,7 +14,6 @@ #include "chrome/browser/policy/user_policy_signin_service.h" #include "chrome/browser/policy/user_policy_signin_service_factory.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_manager_fake.h" diff --git a/chrome/browser/predictors/resource_prefetch_common.cc b/chrome/browser/predictors/resource_prefetch_common.cc index 6acce17..4fe002e 100644 --- a/chrome/browser/predictors/resource_prefetch_common.cc +++ b/chrome/browser/predictors/resource_prefetch_common.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index e1722f0..2f708c7 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -4,6 +4,8 @@ #include "chrome/browser/prefs/browser_prefs.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/invert_bubble_prefs.h" #include "chrome/browser/autofill/autofill_manager.h" @@ -46,9 +48,7 @@ #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/chrome_version_service.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index be2f66b..c03547a 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -10,15 +10,15 @@ #include "base/metrics/histogram.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_notifier_impl.h" +#include "base/prefs/pref_registry.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/pref_value_store.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/prefs/command_line_pref_store.h" #include "chrome/browser/prefs/pref_model_associator.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_registry.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable_builder.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc index 79ffcdc..22d67ac 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.cc +++ b/chrome/browser/prefs/incognito_mode_prefs.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/prefs/mock_pref_change_callback.cc b/chrome/browser/prefs/mock_pref_change_callback.cc deleted file mode 100644 index 3dbd2a0..0000000 --- a/chrome/browser/prefs/mock_pref_change_callback.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/mock_pref_change_callback.h" - -#include "base/bind.h" -#include "chrome/common/chrome_notification_types.h" - -MockPrefChangeCallback::MockPrefChangeCallback(PrefServiceBase* prefs) - : prefs_(prefs) { -} - -MockPrefChangeCallback::~MockPrefChangeCallback() {} - -PrefChangeRegistrar::NamedChangeCallback MockPrefChangeCallback::GetCallback() { - return base::Bind(&MockPrefChangeCallback::OnPreferenceChanged, - base::Unretained(this)); -} - -void MockPrefChangeCallback::Expect(const std::string& pref_name, - const Value* value) { - EXPECT_CALL(*this, OnPreferenceChanged(pref_name)) - .With(PrefValueMatches(prefs_, pref_name, value)); -} diff --git a/chrome/browser/prefs/mock_pref_change_callback.h b/chrome/browser/prefs/mock_pref_change_callback.h deleted file mode 100644 index 34d9beb..0000000 --- a/chrome/browser/prefs/mock_pref_change_callback.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ -#define CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ - -#include <string> - -#include "base/prefs/public/pref_change_registrar.h" -#include "chrome/browser/prefs/pref_service.h" -#include "testing/gmock/include/gmock/gmock.h" - -using testing::Pointee; -using testing::Property; -using testing::Truly; - -// Matcher that checks whether the current value of the preference named -// |pref_name| in |prefs| matches |value|. If |value| is NULL, the matcher -// checks that the value is not set. -MATCHER_P3(PrefValueMatches, prefs, pref_name, value, "") { - const PrefServiceBase::Preference* pref = - prefs->FindPreference(pref_name.c_str()); - if (!pref) - return false; - - const Value* actual_value = pref->GetValue(); - if (!actual_value) - return value == NULL; - if (!value) - return actual_value == NULL; - return value->Equals(actual_value); -} - -// A mock for testing preference notifications and easy setup of expectations. -class MockPrefChangeCallback { - public: - explicit MockPrefChangeCallback(PrefServiceBase* prefs); - virtual ~MockPrefChangeCallback(); - - PrefChangeRegistrar::NamedChangeCallback GetCallback(); - - MOCK_METHOD1(OnPreferenceChanged, void(const std::string&)); - - void Expect(const std::string& pref_name, - const Value* value); - - private: - PrefServiceBase* prefs_; -}; - -#endif // CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index dea061d..07bde77 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -9,9 +9,9 @@ #include "base/json/json_string_value_serializer.h" #include "base/location.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/prefs/pref_notifier_impl.cc b/chrome/browser/prefs/pref_notifier_impl.cc deleted file mode 100644 index 9bdf322..0000000 --- a/chrome/browser/prefs/pref_notifier_impl.cc +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_notifier_impl.h" - -#include "base/logging.h" -#include "base/stl_util.h" -#include "chrome/browser/prefs/pref_service.h" - -PrefNotifierImpl::PrefNotifierImpl() - : pref_service_(NULL) { -} - -PrefNotifierImpl::PrefNotifierImpl(PrefService* service) - : pref_service_(service) { -} - -PrefNotifierImpl::~PrefNotifierImpl() { - DCHECK(CalledOnValidThread()); - - // Verify that there are no pref observers when we shut down. - for (PrefObserverMap::iterator it = pref_observers_.begin(); - it != pref_observers_.end(); ++it) { - PrefObserverList::Iterator obs_iterator(*(it->second)); - if (obs_iterator.GetNext()) { - LOG(WARNING) << "pref observer found at shutdown " << it->first; - } - } - - // Same for initialization observers. - if (!init_observers_.empty()) - LOG(WARNING) << "Init observer found at shutdown."; - - STLDeleteContainerPairSecondPointers(pref_observers_.begin(), - pref_observers_.end()); - pref_observers_.clear(); - init_observers_.clear(); -} - -void PrefNotifierImpl::AddPrefObserver(const char* path, - PrefObserver* obs) { - // Get the pref observer list associated with the path. - PrefObserverList* observer_list = NULL; - const PrefObserverMap::iterator observer_iterator = - pref_observers_.find(path); - if (observer_iterator == pref_observers_.end()) { - observer_list = new PrefObserverList; - pref_observers_[path] = observer_list; - } else { - observer_list = observer_iterator->second; - } - - // Add the pref observer. ObserverList will DCHECK if it already is - // in the list. - observer_list->AddObserver(obs); -} - -void PrefNotifierImpl::RemovePrefObserver(const char* path, - PrefObserver* obs) { - DCHECK(CalledOnValidThread()); - - const PrefObserverMap::iterator observer_iterator = - pref_observers_.find(path); - if (observer_iterator == pref_observers_.end()) { - return; - } - - PrefObserverList* observer_list = observer_iterator->second; - observer_list->RemoveObserver(obs); -} - -void PrefNotifierImpl::AddInitObserver(base::Callback<void(bool)> obs) { - init_observers_.push_back(obs); -} - -void PrefNotifierImpl::OnPreferenceChanged(const std::string& path) { - FireObservers(path); -} - -void PrefNotifierImpl::OnInitializationCompleted(bool succeeded) { - DCHECK(CalledOnValidThread()); - - // We must make a copy of init_observers_ and clear it before we run - // observers, or we can end up in this method re-entrantly before - // clearing the observers list. - PrefInitObserverList observers(init_observers_); - init_observers_.clear(); - - for (PrefInitObserverList::iterator it = observers.begin(); - it != observers.end(); - ++it) { - it->Run(succeeded); - } -} - -void PrefNotifierImpl::FireObservers(const std::string& path) { - DCHECK(CalledOnValidThread()); - - // Only send notifications for registered preferences. - if (!pref_service_->FindPreference(path.c_str())) - return; - - const PrefObserverMap::iterator observer_iterator = - pref_observers_.find(path); - if (observer_iterator == pref_observers_.end()) - return; - - FOR_EACH_OBSERVER(PrefObserver, - *(observer_iterator->second), - OnPreferenceChanged(pref_service_, path)); -} - -void PrefNotifierImpl::SetPrefService(PrefService* pref_service) { - DCHECK(pref_service_ == NULL); - pref_service_ = pref_service; -} diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h deleted file mode 100644 index 7ec092d..0000000 --- a/chrome/browser/prefs/pref_notifier_impl.h +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_PREF_NOTIFIER_IMPL_H_ -#define CHROME_BROWSER_PREFS_PREF_NOTIFIER_IMPL_H_ - -#include <list> -#include <string> - -#include "base/callback.h" -#include "base/hash_tables.h" -#include "base/observer_list.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_observer.h" -#include "base/threading/non_thread_safe.h" - -class PrefService; - -// The PrefNotifier implementation used by the PrefService. -class PrefNotifierImpl : public PrefNotifier, - public base::NonThreadSafe { - public: - PrefNotifierImpl(); - explicit PrefNotifierImpl(PrefService* pref_service); - virtual ~PrefNotifierImpl(); - - // If the pref at the given path changes, we call the observer's - // OnPreferenceChanged method. - void AddPrefObserver(const char* path, PrefObserver* observer); - void RemovePrefObserver(const char* path, PrefObserver* observer); - - // We run the callback once, when initialization completes. The bool - // parameter will be set to true for successful initialization, - // false for unsuccessful. - void AddInitObserver(base::Callback<void(bool)> observer); - - void SetPrefService(PrefService* pref_service); - - protected: - // PrefNotifier overrides. - virtual void OnPreferenceChanged(const std::string& pref_name) OVERRIDE; - virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; - - // A map from pref names to a list of observers. Observers get fired in the - // order they are added. These should only be accessed externally for unit - // testing. - typedef ObserverList<PrefObserver> PrefObserverList; - typedef base::hash_map<std::string, PrefObserverList*> PrefObserverMap; - - typedef std::list<base::Callback<void(bool)> > PrefInitObserverList; - - const PrefObserverMap* pref_observers() const { return &pref_observers_; } - - private: - // For the given pref_name, fire any observer of the pref. Virtual so it can - // be mocked for unit testing. - virtual void FireObservers(const std::string& path); - - // Weak reference; the notifier is owned by the PrefService. - PrefService* pref_service_; - - PrefObserverMap pref_observers_; - PrefInitObserverList init_observers_; - - DISALLOW_COPY_AND_ASSIGN(PrefNotifierImpl); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_NOTIFIER_IMPL_H_ diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc index 241d436..d812bf4 100644 --- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc +++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc @@ -4,12 +4,12 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/prefs/mock_pref_change_callback.h" +#include "base/prefs/pref_notifier_impl.h" #include "base/prefs/pref_observer.h" -#include "chrome/browser/prefs/mock_pref_change_callback.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/prefs/pref_value_store.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/pref_value_store.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/prefs/pref_registry.cc b/chrome/browser/prefs/pref_registry.cc deleted file mode 100644 index c91aa83..0000000 --- a/chrome/browser/prefs/pref_registry.cc +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_registry.h" - -#include "base/logging.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_store.h" -#include "base/values.h" - -PrefRegistry::PrefRegistry() - : defaults_(new DefaultPrefStore()) { -} - -PrefRegistry::~PrefRegistry() { -} - -scoped_refptr<PrefStore> PrefRegistry::defaults() { - return defaults_.get(); -} - -PrefRegistry::const_iterator PrefRegistry::begin() const { - return defaults_->begin(); -} - -PrefRegistry::const_iterator PrefRegistry::end() const { - return defaults_->end(); -} - -void PrefRegistry::SetRegistrationCallback( - const RegistrationCallback& callback) { - registration_callback_ = callback; -} - -void PrefRegistry::SetUnregistrationCallback( - const UnregistrationCallback& callback) { - unregistration_callback_ = callback; -} - -void PrefRegistry::DeprecatedUnregisterPreference(const char* path) { - DCHECK(defaults_->GetValue(path, NULL)) << - "Trying to unregister an unregistered pref: " << path; - - defaults_->RemoveDefaultValue(path); - - if (!unregistration_callback_.is_null()) - unregistration_callback_.Run(path); -} - -void PrefRegistry::RegisterPreference(const char* path, - base::Value* default_value) { - base::Value::Type orig_type = default_value->GetType(); - DCHECK(orig_type != base::Value::TYPE_NULL && - orig_type != base::Value::TYPE_BINARY) << - "invalid preference type: " << orig_type; - DCHECK(!defaults_->GetValue(path, NULL)) << - "Trying to register a previously registered pref: " << path; - - defaults_->SetDefaultValue(path, default_value); - - if (!registration_callback_.is_null()) - registration_callback_.Run(path, default_value); -} diff --git a/chrome/browser/prefs/pref_registry.h b/chrome/browser/prefs/pref_registry.h deleted file mode 100644 index 3a2e6ff..0000000 --- a/chrome/browser/prefs/pref_registry.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_PREF_REGISTRY_H_ -#define CHROME_BROWSER_PREFS_PREF_REGISTRY_H_ - -#include "base/callback.h" -#include "base/memory/ref_counted.h" -#include "base/prefs/pref_value_map.h" - -namespace base { -class Value; -} - -class DefaultPrefStore; -class PrefStore; - -// Preferences need to be registered with a type and default value -// before they are used. -// -// The way you use a PrefRegistry is that you register all required -// preferences on it (via one of its subclasses), then pass it as a -// construction parameter to PrefService. -// -// Currently, registrations after constructing the PrefService will -// also work, but this is being deprecated. -class PrefRegistry : public base::RefCounted<PrefRegistry> { - public: - typedef PrefValueMap::const_iterator const_iterator; - typedef base::Callback<void(const char*, base::Value*)> RegistrationCallback; - typedef base::Callback<void(const char*)> UnregistrationCallback; - - PrefRegistry(); - - // Gets the registered defaults. - scoped_refptr<PrefStore> defaults(); - - // Allows iteration over defaults. - const_iterator begin() const; - const_iterator end() const; - - // Exactly one callback can be set for each of two events: - // Registration and unregistration. If either is set, the callback - // will be invoked each time registration and/or unregistration has - // been performed on this object. - // - // Calling either of these methods after a callback has already been - // set will make the object forget the previous callback and use the - // new one instead. - void SetRegistrationCallback(const RegistrationCallback& callback); - void SetUnregistrationCallback(const UnregistrationCallback& callback); - - // Unregisters a preference. This is going away soon. - void DeprecatedUnregisterPreference(const char* path); - - protected: - friend class base::RefCounted<PrefRegistry>; - virtual ~PrefRegistry(); - - // Used by subclasses to register a default value for a preference. - void RegisterPreference(const char* path, base::Value* default_value); - - scoped_refptr<DefaultPrefStore> defaults_; - - private: - RegistrationCallback registration_callback_; - UnregistrationCallback unregistration_callback_; - - DISALLOW_COPY_AND_ASSIGN(PrefRegistry); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_REGISTRY_H_ diff --git a/chrome/browser/prefs/pref_registry_simple.cc b/chrome/browser/prefs/pref_registry_simple.cc deleted file mode 100644 index f8addf1..0000000 --- a/chrome/browser/prefs/pref_registry_simple.cc +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_registry_simple.h" - -#include "base/file_path.h" -#include "base/string_number_conversions.h" -#include "base/values.h" - -PrefRegistrySimple::PrefRegistrySimple() { -} - -PrefRegistrySimple::~PrefRegistrySimple() { -} - -void PrefRegistrySimple::RegisterBooleanPref(const char* path, - bool default_value) { - RegisterPreference(path, base::Value::CreateBooleanValue(default_value)); -} - -void PrefRegistrySimple::RegisterIntegerPref(const char* path, - int default_value) { - RegisterPreference(path, base::Value::CreateIntegerValue(default_value)); -} - -void PrefRegistrySimple::RegisterDoublePref(const char* path, - double default_value) { - RegisterPreference(path, base::Value::CreateDoubleValue(default_value)); -} - -void PrefRegistrySimple::RegisterStringPref(const char* path, - const std::string& default_value) { - RegisterPreference(path, base::Value::CreateStringValue(default_value)); -} - -void PrefRegistrySimple::RegisterFilePathPref( - const char* path, - const base::FilePath& default_value) { - RegisterPreference(path, - base::Value::CreateStringValue(default_value.value())); -} - -void PrefRegistrySimple::RegisterListPref(const char* path) { - RegisterPreference(path, new base::ListValue()); -} - -void PrefRegistrySimple::RegisterListPref(const char* path, - base::ListValue* default_value) { - RegisterPreference(path, default_value); -} - -void PrefRegistrySimple::RegisterDictionaryPref(const char* path) { - RegisterPreference(path, new base::DictionaryValue()); -} - -void PrefRegistrySimple::RegisterDictionaryPref( - const char* path, - base::DictionaryValue* default_value) { - RegisterPreference(path, default_value); -} - -void PrefRegistrySimple::RegisterInt64Pref(const char* path, - int64 default_value) { - RegisterPreference( - path, base::Value::CreateStringValue(base::Int64ToString(default_value))); -} diff --git a/chrome/browser/prefs/pref_registry_simple.h b/chrome/browser/prefs/pref_registry_simple.h deleted file mode 100644 index d175f50..0000000 --- a/chrome/browser/prefs/pref_registry_simple.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_PREF_REGISTRY_SIMPLE_H_ -#define CHROME_BROWSER_PREFS_PREF_REGISTRY_SIMPLE_H_ - -#include <string> - -#include "chrome/browser/prefs/pref_registry.h" - -namespace base { -class DictionaryValue; -class FilePath; -class ListValue; -} - -// A simple implementation of PrefRegistry. -class PrefRegistrySimple : public PrefRegistry { - public: - PrefRegistrySimple(); - - void RegisterBooleanPref(const char* path, bool default_value); - void RegisterIntegerPref(const char* path, int default_value); - void RegisterDoublePref(const char* path, double default_value); - void RegisterStringPref(const char* path, const std::string& default_value); - void RegisterFilePathPref(const char* path, - const base::FilePath& default_value); - void RegisterListPref(const char* path); - void RegisterDictionaryPref(const char* path); - void RegisterListPref(const char* path, base::ListValue* default_value); - void RegisterDictionaryPref(const char* path, - base::DictionaryValue* default_value); - void RegisterInt64Pref(const char* path, - int64 default_value); - - private: - virtual ~PrefRegistrySimple(); - - DISALLOW_COPY_AND_ASSIGN(PrefRegistrySimple); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_REGISTRY_SIMPLE_H_ diff --git a/chrome/browser/prefs/pref_registry_syncable.h b/chrome/browser/prefs/pref_registry_syncable.h index 5989031..d6d1a4a 100644 --- a/chrome/browser/prefs/pref_registry_syncable.h +++ b/chrome/browser/prefs/pref_registry_syncable.h @@ -8,7 +8,7 @@ #include <set> #include <string> -#include "chrome/browser/prefs/pref_registry.h" +#include "base/prefs/pref_registry.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc deleted file mode 100644 index bd9c26f..0000000 --- a/chrome/browser/prefs/pref_service.cc +++ /dev/null @@ -1,597 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_service.h" - -#include <algorithm> - -#include "base/bind.h" -#include "base/file_path.h" -#include "base/logging.h" -#include "base/message_loop.h" -#include "base/metrics/histogram.h" -#include "base/prefs/default_pref_store.h" -#include "base/stl_util.h" -#include "base/string_util.h" -#include "base/strings/string_number_conversions.h" -#include "base/value_conversions.h" -#include "build/build_config.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_registry.h" -#include "chrome/browser/prefs/pref_value_store.h" - -using content::BrowserContext; - -namespace { - -class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate { - public: - ReadErrorHandler(base::Callback<void(PersistentPrefStore::PrefReadError)> cb) - : callback_(cb) {} - - virtual void OnError(PersistentPrefStore::PrefReadError error) OVERRIDE { - callback_.Run(error); - } - - private: - base::Callback<void(PersistentPrefStore::PrefReadError)> callback_; -}; - -} // namespace - -PrefService::PrefService( - PrefNotifierImpl* pref_notifier, - PrefValueStore* pref_value_store, - PersistentPrefStore* user_prefs, - PrefRegistry* pref_registry, - base::Callback<void(PersistentPrefStore::PrefReadError)> - read_error_callback, - bool async) - : pref_notifier_(pref_notifier), - pref_value_store_(pref_value_store), - pref_registry_(pref_registry), - user_pref_store_(user_prefs), - read_error_callback_(read_error_callback) { - pref_notifier_->SetPrefService(this); - - pref_registry_->SetRegistrationCallback( - base::Bind(&PrefService::AddRegisteredPreference, - base::Unretained(this))); - pref_registry_->SetUnregistrationCallback( - base::Bind(&PrefService::RemoveRegisteredPreference, - base::Unretained(this))); - AddInitialPreferences(); - - InitFromStorage(async); -} - -PrefService::~PrefService() { - DCHECK(CalledOnValidThread()); - - // Remove our callbacks, setting NULL ones. - pref_registry_->SetRegistrationCallback(PrefRegistry::RegistrationCallback()); - pref_registry_->SetUnregistrationCallback( - PrefRegistry::UnregistrationCallback()); - - // Reset pointers so accesses after destruction reliably crash. - pref_value_store_.reset(); - pref_registry_ = NULL; - user_pref_store_ = NULL; - pref_notifier_.reset(); -} - -void PrefService::InitFromStorage(bool async) { - if (!async) { - read_error_callback_.Run(user_pref_store_->ReadPrefs()); - } else { - // Guarantee that initialization happens after this function returned. - MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&PersistentPrefStore::ReadPrefsAsync, - user_pref_store_.get(), - new ReadErrorHandler(read_error_callback_))); - } -} - -bool PrefService::ReloadPersistentPrefs() { - return user_pref_store_->ReadPrefs() == - PersistentPrefStore::PREF_READ_ERROR_NONE; -} - -void PrefService::CommitPendingWrite() { - DCHECK(CalledOnValidThread()); - user_pref_store_->CommitPendingWrite(); -} - -bool PrefService::GetBoolean(const char* path) const { - DCHECK(CalledOnValidThread()); - - bool result = false; - - const base::Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return result; - } - bool rv = value->GetAsBoolean(&result); - DCHECK(rv); - return result; -} - -int PrefService::GetInteger(const char* path) const { - DCHECK(CalledOnValidThread()); - - int result = 0; - - const base::Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return result; - } - bool rv = value->GetAsInteger(&result); - DCHECK(rv); - return result; -} - -double PrefService::GetDouble(const char* path) const { - DCHECK(CalledOnValidThread()); - - double result = 0.0; - - const base::Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return result; - } - bool rv = value->GetAsDouble(&result); - DCHECK(rv); - return result; -} - -std::string PrefService::GetString(const char* path) const { - DCHECK(CalledOnValidThread()); - - std::string result; - - const base::Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return result; - } - bool rv = value->GetAsString(&result); - DCHECK(rv); - return result; -} - -base::FilePath PrefService::GetFilePath(const char* path) const { - DCHECK(CalledOnValidThread()); - - base::FilePath result; - - const base::Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return base::FilePath(result); - } - bool rv = base::GetValueAsFilePath(*value, &result); - DCHECK(rv); - return result; -} - -bool PrefService::HasPrefPath(const char* path) const { - const Preference* pref = FindPreference(path); - return pref && !pref->IsDefaultValue(); -} - -DictionaryValue* PrefService::GetPreferenceValues() const { - DCHECK(CalledOnValidThread()); - DictionaryValue* out = new DictionaryValue; - PrefRegistry::const_iterator i = pref_registry_->begin(); - for (; i != pref_registry_->end(); ++i) { - const Value* value = GetPreferenceValue(i->first); - DCHECK(value); - out->Set(i->first, value->DeepCopy()); - } - return out; -} - -const PrefService::Preference* PrefService::FindPreference( - const char* pref_name) const { - DCHECK(CalledOnValidThread()); - PreferenceMap::iterator it = prefs_map_.find(pref_name); - if (it != prefs_map_.end()) - return &(it->second); - const base::Value* default_value = NULL; - if (!pref_registry_->defaults()->GetValue(pref_name, &default_value)) - return NULL; - it = prefs_map_.insert( - std::make_pair(pref_name, Preference( - this, pref_name, default_value->GetType()))).first; - return &(it->second); -} - -bool PrefService::ReadOnly() const { - return user_pref_store_->ReadOnly(); -} - -PrefService::PrefInitializationStatus PrefService::GetInitializationStatus() - const { - if (!user_pref_store_->IsInitializationComplete()) - return INITIALIZATION_STATUS_WAITING; - - switch (user_pref_store_->GetReadError()) { - case PersistentPrefStore::PREF_READ_ERROR_NONE: - return INITIALIZATION_STATUS_SUCCESS; - case PersistentPrefStore::PREF_READ_ERROR_NO_FILE: - return INITIALIZATION_STATUS_CREATED_NEW_PROFILE; - default: - return INITIALIZATION_STATUS_ERROR; - } -} - -bool PrefService::IsManagedPreference(const char* pref_name) const { - const Preference* pref = FindPreference(pref_name); - return pref && pref->IsManaged(); -} - -bool PrefService::IsUserModifiablePreference(const char* pref_name) const { - const Preference* pref = FindPreference(pref_name); - return pref && pref->IsUserModifiable(); -} - -const DictionaryValue* PrefService::GetDictionary(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return NULL; - } - if (value->GetType() != Value::TYPE_DICTIONARY) { - NOTREACHED(); - return NULL; - } - return static_cast<const DictionaryValue*>(value); -} - -const base::Value* PrefService::GetUserPrefValue(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Preference* pref = FindPreference(path); - if (!pref) { - NOTREACHED() << "Trying to get an unregistered pref: " << path; - return NULL; - } - - // Look for an existing preference in the user store. If it doesn't - // exist, return NULL. - base::Value* value = NULL; - if (!user_pref_store_->GetMutableValue(path, &value)) - return NULL; - - if (!value->IsType(pref->GetType())) { - NOTREACHED() << "Pref value type doesn't match registered type."; - return NULL; - } - - return value; -} - -const base::Value* PrefService::GetDefaultPrefValue(const char* path) const { - DCHECK(CalledOnValidThread()); - // Lookup the preference in the default store. - const base::Value* value = NULL; - if (!pref_registry_->defaults()->GetValue(path, &value)) { - NOTREACHED() << "Default value missing for pref: " << path; - return NULL; - } - return value; -} - -const ListValue* PrefService::GetList(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return NULL; - } - if (value->GetType() != Value::TYPE_LIST) { - NOTREACHED(); - return NULL; - } - return static_cast<const ListValue*>(value); -} - -void PrefService::AddPrefObserver(const char* path, PrefObserver* obs) { - pref_notifier_->AddPrefObserver(path, obs); -} - -void PrefService::RemovePrefObserver(const char* path, PrefObserver* obs) { - pref_notifier_->RemovePrefObserver(path, obs); -} - -void PrefService::AddPrefInitObserver(base::Callback<void(bool)> obs) { - pref_notifier_->AddInitObserver(obs); -} - -PrefRegistry* PrefService::DeprecatedGetPrefRegistry() { - return pref_registry_.get(); -} - -void PrefService::AddInitialPreferences() { - for (PrefRegistry::const_iterator it = pref_registry_->begin(); - it != pref_registry_->end(); - ++it) { - AddRegisteredPreference(it->first.c_str(), it->second); - } -} - -// TODO(joi): Once MarkNeedsEmptyValue is gone, we can probably -// completely get rid of this method. There will be one difference in -// semantics; currently all registered preferences are stored right -// away in the prefs_map_, if we remove this they would be stored only -// opportunistically. -void PrefService::AddRegisteredPreference(const char* path, - Value* default_value) { - DCHECK(CalledOnValidThread()); - - // For ListValue and DictionaryValue with non empty default, empty value - // for |path| needs to be persisted in |user_pref_store_|. So that - // non empty default is not used when user sets an empty ListValue or - // DictionaryValue. - bool needs_empty_value = false; - base::Value::Type orig_type = default_value->GetType(); - if (orig_type == base::Value::TYPE_LIST) { - const base::ListValue* list = NULL; - if (default_value->GetAsList(&list) && !list->empty()) - needs_empty_value = true; - } else if (orig_type == base::Value::TYPE_DICTIONARY) { - const base::DictionaryValue* dict = NULL; - if (default_value->GetAsDictionary(&dict) && !dict->empty()) - needs_empty_value = true; - } - if (needs_empty_value) - user_pref_store_->MarkNeedsEmptyValue(path); -} - -// TODO(joi): We can get rid of this once the ability to unregister -// prefs has been removed. -void PrefService::RemoveRegisteredPreference(const char* path) { - DCHECK(CalledOnValidThread()); - - prefs_map_.erase(path); -} - -void PrefService::ClearPref(const char* path) { - DCHECK(CalledOnValidThread()); - - const Preference* pref = FindPreference(path); - if (!pref) { - NOTREACHED() << "Trying to clear an unregistered pref: " << path; - return; - } - user_pref_store_->RemoveValue(path); -} - -void PrefService::Set(const char* path, const Value& value) { - SetUserPrefValue(path, value.DeepCopy()); -} - -void PrefService::SetBoolean(const char* path, bool value) { - SetUserPrefValue(path, Value::CreateBooleanValue(value)); -} - -void PrefService::SetInteger(const char* path, int value) { - SetUserPrefValue(path, Value::CreateIntegerValue(value)); -} - -void PrefService::SetDouble(const char* path, double value) { - SetUserPrefValue(path, Value::CreateDoubleValue(value)); -} - -void PrefService::SetString(const char* path, const std::string& value) { - SetUserPrefValue(path, Value::CreateStringValue(value)); -} - -void PrefService::SetFilePath(const char* path, const base::FilePath& value) { - SetUserPrefValue(path, base::CreateFilePathValue(value)); -} - -void PrefService::SetInt64(const char* path, int64 value) { - SetUserPrefValue(path, Value::CreateStringValue(base::Int64ToString(value))); -} - -int64 PrefService::GetInt64(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return 0; - } - std::string result("0"); - bool rv = value->GetAsString(&result); - DCHECK(rv); - - int64 val; - base::StringToInt64(result, &val); - return val; -} - -void PrefService::SetUint64(const char* path, uint64 value) { - SetUserPrefValue(path, Value::CreateStringValue(base::Uint64ToString(value))); -} - -uint64 PrefService::GetUint64(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Value* value = GetPreferenceValue(path); - if (!value) { - NOTREACHED() << "Trying to read an unregistered pref: " << path; - return 0; - } - std::string result("0"); - bool rv = value->GetAsString(&result); - DCHECK(rv); - - uint64 val; - base::StringToUint64(result, &val); - return val; -} - -Value* PrefService::GetMutableUserPref(const char* path, - base::Value::Type type) { - CHECK(type == Value::TYPE_DICTIONARY || type == Value::TYPE_LIST); - DCHECK(CalledOnValidThread()); - - const Preference* pref = FindPreference(path); - if (!pref) { - NOTREACHED() << "Trying to get an unregistered pref: " << path; - return NULL; - } - if (pref->GetType() != type) { - NOTREACHED() << "Wrong type for GetMutableValue: " << path; - return NULL; - } - - // Look for an existing preference in the user store. If it doesn't - // exist or isn't the correct type, create a new user preference. - Value* value = NULL; - if (!user_pref_store_->GetMutableValue(path, &value) || - !value->IsType(type)) { - if (type == Value::TYPE_DICTIONARY) { - value = new DictionaryValue; - } else if (type == Value::TYPE_LIST) { - value = new ListValue; - } else { - NOTREACHED(); - } - user_pref_store_->SetValueSilently(path, value); - } - return value; -} - -void PrefService::ReportUserPrefChanged(const std::string& key) { - user_pref_store_->ReportValueChanged(key); -} - -void PrefService::SetUserPrefValue(const char* path, Value* new_value) { - scoped_ptr<Value> owned_value(new_value); - DCHECK(CalledOnValidThread()); - - const Preference* pref = FindPreference(path); - if (!pref) { - NOTREACHED() << "Trying to write an unregistered pref: " << path; - return; - } - if (pref->GetType() != new_value->GetType()) { - NOTREACHED() << "Trying to set pref " << path - << " of type " << pref->GetType() - << " to value of type " << new_value->GetType(); - return; - } - - user_pref_store_->SetValue(path, owned_value.release()); -} - -void PrefService::UpdateCommandLinePrefStore(PrefStore* command_line_store) { - pref_value_store_->UpdateCommandLinePrefStore(command_line_store); -} - -/////////////////////////////////////////////////////////////////////////////// -// PrefService::Preference - -PrefService::Preference::Preference(const PrefService* service, - const char* name, - base::Value::Type type) - : name_(name), - type_(type), - pref_service_(service) { - DCHECK(name); - DCHECK(service); -} - -const std::string PrefService::Preference::name() const { - return name_; -} - -base::Value::Type PrefService::Preference::GetType() const { - return type_; -} - -const Value* PrefService::Preference::GetValue() const { - const Value* result= pref_service_->GetPreferenceValue(name_); - DCHECK(result) << "Must register pref before getting its value"; - return result; -} - -const Value* PrefService::Preference::GetRecommendedValue() const { - DCHECK(pref_service_->FindPreference(name_.c_str())) << - "Must register pref before getting its value"; - - const Value* found_value = NULL; - if (pref_value_store()->GetRecommendedValue(name_, type_, &found_value)) { - DCHECK(found_value->IsType(type_)); - return found_value; - } - - // The pref has no recommended value. - return NULL; -} - -bool PrefService::Preference::IsManaged() const { - return pref_value_store()->PrefValueInManagedStore(name_.c_str()); -} - -bool PrefService::Preference::IsRecommended() const { - return pref_value_store()->PrefValueFromRecommendedStore(name_.c_str()); -} - -bool PrefService::Preference::HasExtensionSetting() const { - return pref_value_store()->PrefValueInExtensionStore(name_.c_str()); -} - -bool PrefService::Preference::HasUserSetting() const { - return pref_value_store()->PrefValueInUserStore(name_.c_str()); -} - -bool PrefService::Preference::IsExtensionControlled() const { - return pref_value_store()->PrefValueFromExtensionStore(name_.c_str()); -} - -bool PrefService::Preference::IsUserControlled() const { - return pref_value_store()->PrefValueFromUserStore(name_.c_str()); -} - -bool PrefService::Preference::IsDefaultValue() const { - return pref_value_store()->PrefValueFromDefaultStore(name_.c_str()); -} - -bool PrefService::Preference::IsUserModifiable() const { - return pref_value_store()->PrefValueUserModifiable(name_.c_str()); -} - -bool PrefService::Preference::IsExtensionModifiable() const { - return pref_value_store()->PrefValueExtensionModifiable(name_.c_str()); -} - -const base::Value* PrefService::GetPreferenceValue( - const std::string& path) const { - DCHECK(CalledOnValidThread()); - const Value* default_value = NULL; - if (pref_registry_->defaults()->GetValue(path, &default_value)) { - const Value* found_value = NULL; - base::Value::Type default_type = default_value->GetType(); - if (pref_value_store_->GetValue(path, default_type, &found_value)) { - DCHECK(found_value->IsType(default_type)); - return found_value; - } else { - // Every registered preference has at least a default value. - NOTREACHED() << "no valid value found for registered pref " << path; - } - } - - return NULL; -} diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h deleted file mode 100644 index 9ea3787..0000000 --- a/chrome/browser/prefs/pref_service.h +++ /dev/null @@ -1,259 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This provides a way to access the application's current preferences. - -// Chromium settings and storage represent user-selected preferences and -// information and MUST not be extracted, overwritten or modified except -// through Chromium defined APIs. - -#ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_H_ -#define CHROME_BROWSER_PREFS_PREF_SERVICE_H_ - -#include <set> -#include <string> - -#include "base/callback.h" -#include "base/hash_tables.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/public/pref_service_base.h" -#include "base/threading/non_thread_safe.h" - -class PrefNotifier; -class PrefNotifierImpl; -class PrefObserver; -class PrefRegistry; -class PrefValueStore; -class PrefStore; - -namespace subtle { -class ScopedUserPrefUpdateBase; -}; - -// Base class for PrefServices. You can use the base class to read and -// interact with preferences, but not to register new preferences; for -// that see e.g. PrefRegistrySimple. -class PrefService : public PrefServiceBase, public base::NonThreadSafe { - public: - enum PrefInitializationStatus { - INITIALIZATION_STATUS_WAITING, - INITIALIZATION_STATUS_SUCCESS, - INITIALIZATION_STATUS_CREATED_NEW_PROFILE, - INITIALIZATION_STATUS_ERROR - }; - - // A helper class to store all the information associated with a preference. - class Preference : public PrefServiceBase::Preference { - public: - // The type of the preference is determined by the type with which it is - // registered. This type needs to be a boolean, integer, double, string, - // dictionary (a branch), or list. You shouldn't need to construct this on - // your own; use the PrefService::Register*Pref methods instead. - Preference(const PrefService* service, - const char* name, - base::Value::Type type); - virtual ~Preference() {} - - // PrefServiceBase::Preference implementation. - virtual const std::string name() const OVERRIDE; - virtual base::Value::Type GetType() const OVERRIDE; - virtual const base::Value* GetValue() const OVERRIDE; - virtual const base::Value* GetRecommendedValue() const OVERRIDE; - virtual bool IsManaged() const OVERRIDE; - virtual bool IsRecommended() const OVERRIDE; - virtual bool HasExtensionSetting() const OVERRIDE; - virtual bool HasUserSetting() const OVERRIDE; - virtual bool IsExtensionControlled() const OVERRIDE; - virtual bool IsUserControlled() const OVERRIDE; - virtual bool IsDefaultValue() const OVERRIDE; - virtual bool IsUserModifiable() const OVERRIDE; - virtual bool IsExtensionModifiable() const OVERRIDE; - - private: - friend class PrefService; - - PrefValueStore* pref_value_store() const { - return pref_service_->pref_value_store_.get(); - } - - const std::string name_; - - const base::Value::Type type_; - - // Reference to the PrefService in which this pref was created. - const PrefService* pref_service_; - }; - - // You may wish to use PrefServiceBuilder or one of its subclasses - // for simplified construction. - PrefService( - PrefNotifierImpl* pref_notifier, - PrefValueStore* pref_value_store, - PersistentPrefStore* user_prefs, - PrefRegistry* pref_registry, - base::Callback<void(PersistentPrefStore::PrefReadError)> - read_error_callback, - bool async); - virtual ~PrefService(); - - // Reloads the data from file. This should only be called when the importer - // is running during first run, and the main process may not change pref - // values while the importer process is running. Returns true on success. - bool ReloadPersistentPrefs(); - - // Lands pending writes to disk. This should only be used if we need to save - // immediately (basically, during shutdown). - void CommitPendingWrite(); - - // PrefServiceBase implementation. - virtual bool IsManagedPreference(const char* pref_name) const OVERRIDE; - virtual bool IsUserModifiablePreference(const char* pref_name) const OVERRIDE; - virtual const PrefService::Preference* FindPreference( - const char* path) const OVERRIDE; - virtual bool GetBoolean(const char* path) const OVERRIDE; - virtual int GetInteger(const char* path) const OVERRIDE; - virtual double GetDouble(const char* path) const OVERRIDE; - virtual std::string GetString(const char* path) const OVERRIDE; - virtual base::FilePath GetFilePath(const char* path) const OVERRIDE; - virtual const base::DictionaryValue* GetDictionary( - const char* path) const OVERRIDE; - virtual const base::ListValue* GetList(const char* path) const OVERRIDE; - virtual void ClearPref(const char* path) OVERRIDE; - virtual void Set(const char* path, const base::Value& value) OVERRIDE; - virtual void SetBoolean(const char* path, bool value) OVERRIDE; - virtual void SetInteger(const char* path, int value) OVERRIDE; - virtual void SetDouble(const char* path, double value) OVERRIDE; - virtual void SetString(const char* path, const std::string& value) OVERRIDE; - virtual void SetFilePath(const char* path, - const base::FilePath& value) OVERRIDE; - virtual void SetInt64(const char* path, int64 value) OVERRIDE; - virtual int64 GetInt64(const char* path) const OVERRIDE; - virtual void SetUint64(const char* path, uint64 value) OVERRIDE; - virtual uint64 GetUint64(const char* path) const OVERRIDE; - - // Returns the value of the given preference, from the user pref store. If - // the preference is not set in the user pref store, returns NULL. - const base::Value* GetUserPrefValue(const char* path) const; - - // Returns the default value of the given preference. |path| must point to a - // registered preference. In that case, will never return NULL. - const base::Value* GetDefaultPrefValue(const char* path) const; - - // Returns true if a value has been set for the specified path. - // NOTE: this is NOT the same as FindPreference. In particular - // FindPreference returns whether RegisterXXX has been invoked, where as - // this checks if a value exists for the path. - bool HasPrefPath(const char* path) const; - - // Returns a dictionary with effective preference values. The ownership - // is passed to the caller. - base::DictionaryValue* GetPreferenceValues() const; - - bool ReadOnly() const; - - PrefInitializationStatus GetInitializationStatus() const; - - // Tell our PrefValueStore to update itself to |command_line_store|. - // Takes ownership of the store. - virtual void UpdateCommandLinePrefStore(PrefStore* command_line_store); - - // We run the callback once, when initialization completes. The bool - // parameter will be set to true for successful initialization, - // false for unsuccessful. - void AddPrefInitObserver(base::Callback<void(bool)> callback); - - // Returns the PrefRegistry object for this service. You should not - // use this; the intent is for no registrations to take place after - // PrefService has been constructed. - PrefRegistry* DeprecatedGetPrefRegistry(); - - protected: - // Adds the registered preferences from the PrefRegistry instance - // passed to us at construction time. - void AddInitialPreferences(); - - // Updates local caches for a preference registered at |path|. The - // |default_value| must not be NULL as it determines the preference - // value's type. AddRegisteredPreference must not be called twice - // for the same path. - void AddRegisteredPreference(const char* path, - base::Value* default_value); - - // Updates local caches for a preference unregistered at |path|. - virtual void RemoveRegisteredPreference(const char* path); - - // The PrefNotifier handles registering and notifying preference observers. - // It is created and owned by this PrefService. Subclasses may access it for - // unit testing. - scoped_ptr<PrefNotifierImpl> pref_notifier_; - - // The PrefValueStore provides prioritized preference values. It is owned by - // this PrefService. Subclasses may access it for unit testing. - scoped_ptr<PrefValueStore> pref_value_store_; - - scoped_refptr<PrefRegistry> pref_registry_; - - // Pref Stores and profile that we passed to the PrefValueStore. - scoped_refptr<PersistentPrefStore> user_pref_store_; - - // Callback to call when a read error occurs. - base::Callback<void(PersistentPrefStore::PrefReadError)> read_error_callback_; - - private: - // Hash map expected to be fastest here since it minimises expensive - // string comparisons. Order is unimportant, and deletions are rare. - // Confirmed on Android where this speeded Chrome startup by roughly 50ms - // vs. std::map, and by roughly 180ms vs. std::set of Preference pointers. - typedef base::hash_map<std::string, Preference> PreferenceMap; - - // Give access to ReportUserPrefChanged() and GetMutableUserPref(). - friend class subtle::ScopedUserPrefUpdateBase; - - // PrefServiceBase implementation (protected in base, private here). - virtual void AddPrefObserver(const char* path, - PrefObserver* obs) OVERRIDE; - virtual void RemovePrefObserver(const char* path, - PrefObserver* obs) OVERRIDE; - - // Sends notification of a changed preference. This needs to be called by - // a ScopedUserPrefUpdate if a DictionaryValue or ListValue is changed. - void ReportUserPrefChanged(const std::string& key); - - // Sets the value for this pref path in the user pref store and informs the - // PrefNotifier of the change. - void SetUserPrefValue(const char* path, base::Value* new_value); - - // Load preferences from storage, attempting to diagnose and handle errors. - // This should only be called from the constructor. - void InitFromStorage(bool async); - - // Used to set the value of dictionary or list values in the user pref store. - // This will create a dictionary or list if one does not exist in the user - // pref store. This method returns NULL only if you're requesting an - // unregistered pref or a non-dict/non-list pref. - // |type| may only be Values::TYPE_DICTIONARY or Values::TYPE_LIST and - // |path| must point to a registered preference of type |type|. - // Ownership of the returned value remains at the user pref store. - base::Value* GetMutableUserPref(const char* path, - base::Value::Type type); - - // GetPreferenceValue is the equivalent of FindPreference(path)->GetValue(), - // it has been added for performance. If is faster because it does - // not need to find or create a Preference object to get the - // value (GetValue() calls back though the preference service to - // actually get the value.). - const base::Value* GetPreferenceValue(const std::string& path) const; - - // Local cache of registered Preference objects. The pref_registry_ - // is authoritative with respect to what the types and default values - // of registered preferences are. - mutable PreferenceMap prefs_map_; - - DISALLOW_COPY_AND_ASSIGN(PrefService); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_SERVICE_H_ diff --git a/chrome/browser/prefs/pref_service_builder.cc b/chrome/browser/prefs/pref_service_builder.cc deleted file mode 100644 index ada9f0f..0000000 --- a/chrome/browser/prefs/pref_service_builder.cc +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_service_builder.h" - -#include "base/bind.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/json_pref_store.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_service.h" - -#include "chrome/browser/prefs/pref_value_store.h" - -namespace { - -// Do-nothing default implementation. -void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) { -} - -} // namespace - -PrefServiceBuilder::PrefServiceBuilder() { - ResetDefaultState(); -} - -PrefServiceBuilder::~PrefServiceBuilder() { -} - -PrefServiceBuilder& PrefServiceBuilder::WithManagedPrefs(PrefStore* store) { - managed_prefs_ = store; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithExtensionPrefs(PrefStore* store) { - extension_prefs_ = store; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithCommandLinePrefs(PrefStore* store) { - command_line_prefs_ = store; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithUserPrefs( - PersistentPrefStore* store) { - user_prefs_ = store; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithRecommendedPrefs(PrefStore* store) { - recommended_prefs_ = store; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithReadErrorCallback( - const base::Callback<void(PersistentPrefStore::PrefReadError)>& - read_error_callback) { - read_error_callback_ = read_error_callback; - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithUserFilePrefs( - const base::FilePath& prefs_file, - base::SequencedTaskRunner* task_runner) { - user_prefs_ = new JsonPrefStore(prefs_file, task_runner); - return *this; -} - -PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool async) { - async_ = async; - return *this; -} - -PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) { - PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); - PrefService* pref_service = new PrefService( - pref_notifier, - new PrefValueStore( - managed_prefs_.get(), - extension_prefs_.get(), - command_line_prefs_.get(), - user_prefs_.get(), - recommended_prefs_.get(), - pref_registry->defaults(), - pref_notifier), - user_prefs_.get(), - pref_registry, - read_error_callback_, - async_); - ResetDefaultState(); - return pref_service; -} - -void PrefServiceBuilder::ResetDefaultState() { - managed_prefs_ = NULL; - extension_prefs_ = NULL; - command_line_prefs_ = NULL; - user_prefs_ = NULL; - recommended_prefs_ = NULL; - read_error_callback_ = base::Bind(&DoNothingHandleReadError); - async_ = false; -} diff --git a/chrome/browser/prefs/pref_service_builder.h b/chrome/browser/prefs/pref_service_builder.h deleted file mode 100644 index 21489ae..0000000 --- a/chrome/browser/prefs/pref_service_builder.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_ -#define CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_ - -#include "base/basictypes.h" -#include "base/callback.h" -#include "base/memory/ref_counted.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_store.h" -#include "chrome/browser/prefs/pref_registry.h" - -class PrefService; - -namespace base { -class FilePath; -class SequencedTaskRunner; -} - -// A class that allows convenient building of PrefService. -class PrefServiceBuilder { - public: - PrefServiceBuilder(); - virtual ~PrefServiceBuilder(); - - // Functions for setting the various parameters of the PrefService to build. - // These take ownership of the |store| parameter. - PrefServiceBuilder& WithManagedPrefs(PrefStore* store); - PrefServiceBuilder& WithExtensionPrefs(PrefStore* store); - PrefServiceBuilder& WithCommandLinePrefs(PrefStore* store); - PrefServiceBuilder& WithUserPrefs(PersistentPrefStore* store); - PrefServiceBuilder& WithRecommendedPrefs(PrefStore* store); - - // Sets up error callback for the PrefService. A do-nothing default - // is provided if this is not called. - PrefServiceBuilder& WithReadErrorCallback( - const base::Callback<void(PersistentPrefStore::PrefReadError)>& - read_error_callback); - - // Specifies to use an actual file-backed user pref store. - PrefServiceBuilder& WithUserFilePrefs( - const base::FilePath& prefs_file, - base::SequencedTaskRunner* task_runner); - - PrefServiceBuilder& WithAsync(bool async); - - // Creates a PrefService object initialized with the parameters from - // this builder. - virtual PrefService* Create(PrefRegistry* registry); - - protected: - virtual void ResetDefaultState(); - - scoped_refptr<PrefStore> managed_prefs_; - scoped_refptr<PrefStore> extension_prefs_; - scoped_refptr<PrefStore> command_line_prefs_; - scoped_refptr<PersistentPrefStore> user_prefs_; - scoped_refptr<PrefStore> recommended_prefs_; - - base::Callback<void(PersistentPrefStore::PrefReadError)> read_error_callback_; - - // Defaults to false. - bool async_; - - private: - DISALLOW_COPY_AND_ASSIGN(PrefServiceBuilder); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_ diff --git a/chrome/browser/prefs/pref_service_simple.cc b/chrome/browser/prefs/pref_service_simple.cc deleted file mode 100644 index ba004be..0000000 --- a/chrome/browser/prefs/pref_service_simple.cc +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_service.h" - -#include "base/file_path.h" -#include "base/strings/string_number_conversions.h" -#include "base/values.h" - -PrefServiceSimple::PrefServiceSimple( - PrefNotifierImpl* pref_notifier, - PrefValueStore* pref_value_store, - PersistentPrefStore* user_prefs, - DefaultPrefStore* default_store, - base::Callback<void(PersistentPrefStore::PrefReadError)> - read_error_callback, - bool async) - : PrefService(pref_notifier, - pref_value_store, - user_prefs, - default_store, - read_error_callback, - async) { -} - -PrefServiceSimple::~PrefServiceSimple() {} - -void PrefServiceSimple::RegisterBooleanPref(const char* path, - bool default_value) { - RegisterPreference(path, Value::CreateBooleanValue(default_value)); -} - -void PrefServiceSimple::RegisterIntegerPref(const char* path, - int default_value) { - RegisterPreference(path, Value::CreateIntegerValue(default_value)); -} - -void PrefServiceSimple::RegisterDoublePref(const char* path, - double default_value) { - RegisterPreference(path, Value::CreateDoubleValue(default_value)); -} - -void PrefServiceSimple::RegisterStringPref(const char* path, - const std::string& default_value) { - RegisterPreference(path, Value::CreateStringValue(default_value)); -} - -void PrefServiceSimple::RegisterFilePathPref( - const char* path, - const base::FilePath& default_value) { - RegisterPreference(path, Value::CreateStringValue(default_value.value())); -} - -void PrefServiceSimple::RegisterListPref(const char* path) { - RegisterPreference(path, new ListValue()); -} - -void PrefServiceSimple::RegisterListPref(const char* path, - ListValue* default_value) { - RegisterPreference(path, default_value); -} - -void PrefServiceSimple::RegisterDictionaryPref(const char* path) { - RegisterPreference(path, new DictionaryValue()); -} - -void PrefServiceSimple::RegisterDictionaryPref(const char* path, - DictionaryValue* default_value) { - RegisterPreference(path, default_value); -} - -void PrefServiceSimple::RegisterInt64Pref(const char* path, - int64 default_value) { - RegisterPreference( - path, Value::CreateStringValue(base::Int64ToString(default_value))); -} diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc index d6fe226..cf1ab7a 100644 --- a/chrome/browser/prefs/pref_service_syncable.cc +++ b/chrome/browser/prefs/pref_service_syncable.cc @@ -8,14 +8,14 @@ #include "base/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/pref_notifier_impl.h" +#include "base/prefs/pref_registry.h" +#include "base/prefs/pref_value_store.h" #include "base/strings/string_number_conversions.h" #include "base/value_conversions.h" #include "chrome/browser/prefs/pref_model_associator.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_registry.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_syncable_observer.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h index 2515be9..5d8eb2c 100644 --- a/chrome/browser/prefs/pref_service_syncable.h +++ b/chrome/browser/prefs/pref_service_syncable.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_ #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_ +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_model_associator.h" -#include "chrome/browser/prefs/pref_service.h" class PrefRegistrySyncable; class PrefServiceSyncableObserver; diff --git a/chrome/browser/prefs/pref_service_syncable_builder.cc b/chrome/browser/prefs/pref_service_syncable_builder.cc index 4a51a86..b11ba20 100644 --- a/chrome/browser/prefs/pref_service_syncable_builder.cc +++ b/chrome/browser/prefs/pref_service_syncable_builder.cc @@ -5,13 +5,13 @@ #include "chrome/browser/prefs/pref_service_syncable_builder.h" #include "base/prefs/default_pref_store.h" +#include "base/prefs/pref_notifier_impl.h" +#include "base/prefs/pref_value_store.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/pref_notifier_impl.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_syncable.h" -#include "chrome/browser/prefs/pref_value_store.h" PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { } diff --git a/chrome/browser/prefs/pref_service_syncable_builder.h b/chrome/browser/prefs/pref_service_syncable_builder.h index 10081af..9b15c92 100644 --- a/chrome/browser/prefs/pref_service_syncable_builder.h +++ b/chrome/browser/prefs/pref_service_syncable_builder.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_BUILDER_H_ #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_BUILDER_H_ -#include "chrome/browser/prefs/pref_service_builder.h" +#include "base/prefs/pref_service_builder.h" class CommandLine; class PrefRegistrySyncable; diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc index 1a5ab78..a1b4b8b 100644 --- a/chrome/browser/prefs/pref_service_unittest.cc +++ b/chrome/browser/prefs/pref_service_unittest.cc @@ -10,6 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/mock_pref_change_callback.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_value_store.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/testing_pref_store.h" #include "base/utf_string_conversions.h" @@ -18,11 +21,8 @@ #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/mock_pref_change_callback.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc deleted file mode 100644 index 0742359..0000000 --- a/chrome/browser/prefs/pref_value_store.cc +++ /dev/null @@ -1,276 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/prefs/pref_value_store.h" - -#include "base/logging.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_observer.h" - -PrefValueStore::PrefStoreKeeper::PrefStoreKeeper() - : pref_value_store_(NULL), - type_(PrefValueStore::INVALID_STORE) { -} - -PrefValueStore::PrefStoreKeeper::~PrefStoreKeeper() { - if (pref_store_.get()) { - pref_store_->RemoveObserver(this); - pref_store_ = NULL; - } - pref_value_store_ = NULL; -} - -void PrefValueStore::PrefStoreKeeper::Initialize( - PrefValueStore* store, - PrefStore* pref_store, - PrefValueStore::PrefStoreType type) { - if (pref_store_.get()) { - pref_store_->RemoveObserver(this); - DCHECK_EQ(0U, pref_store_->NumberOfObservers()); - } - type_ = type; - pref_value_store_ = store; - pref_store_ = pref_store; - if (pref_store_.get()) - pref_store_->AddObserver(this); -} - -void PrefValueStore::PrefStoreKeeper::OnPrefValueChanged( - const std::string& key) { - pref_value_store_->OnPrefValueChanged(type_, key); -} - -void PrefValueStore::PrefStoreKeeper::OnInitializationCompleted( - bool succeeded) { - pref_value_store_->OnInitializationCompleted(type_, succeeded); -} - -PrefValueStore::PrefValueStore(PrefStore* managed_prefs, - PrefStore* extension_prefs, - PrefStore* command_line_prefs, - PrefStore* user_prefs, - PrefStore* recommended_prefs, - PrefStore* default_prefs, - PrefNotifier* pref_notifier) - : pref_notifier_(pref_notifier), - initialization_failed_(false) { - InitPrefStore(MANAGED_STORE, managed_prefs); - InitPrefStore(EXTENSION_STORE, extension_prefs); - InitPrefStore(COMMAND_LINE_STORE, command_line_prefs); - InitPrefStore(USER_STORE, user_prefs); - InitPrefStore(RECOMMENDED_STORE, recommended_prefs); - InitPrefStore(DEFAULT_STORE, default_prefs); - - CheckInitializationCompleted(); -} - -PrefValueStore::~PrefValueStore() {} - -PrefValueStore* PrefValueStore::CloneAndSpecialize( - PrefStore* managed_prefs, - PrefStore* extension_prefs, - PrefStore* command_line_prefs, - PrefStore* user_prefs, - PrefStore* recommended_prefs, - PrefStore* default_prefs, - PrefNotifier* pref_notifier) { - DCHECK(pref_notifier); - if (!managed_prefs) - managed_prefs = GetPrefStore(MANAGED_STORE); - if (!extension_prefs) - extension_prefs = GetPrefStore(EXTENSION_STORE); - if (!command_line_prefs) - command_line_prefs = GetPrefStore(COMMAND_LINE_STORE); - if (!user_prefs) - user_prefs = GetPrefStore(USER_STORE); - if (!recommended_prefs) - recommended_prefs = GetPrefStore(RECOMMENDED_STORE); - if (!default_prefs) - default_prefs = GetPrefStore(DEFAULT_STORE); - - return new PrefValueStore( - managed_prefs, extension_prefs, command_line_prefs, user_prefs, - recommended_prefs, default_prefs, pref_notifier); -} - -void PrefValueStore::set_callback(const PrefChangedCallback& callback) { - pref_changed_callback_ = callback; -} - -bool PrefValueStore::GetValue(const std::string& name, - base::Value::Type type, - const Value** out_value) const { - // Check the |PrefStore|s in order of their priority from highest to lowest, - // looking for the first preference value with the given |name| and |type|. - for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) { - if (GetValueFromStoreWithType(name.c_str(), type, - static_cast<PrefStoreType>(i), out_value)) - return true; - } - return false; -} - -bool PrefValueStore::GetRecommendedValue(const std::string& name, - base::Value::Type type, - const Value** out_value) const { - return GetValueFromStoreWithType(name.c_str(), type, RECOMMENDED_STORE, - out_value); -} - -void PrefValueStore::NotifyPrefChanged( - const char* path, - PrefValueStore::PrefStoreType new_store) { - DCHECK(new_store != INVALID_STORE); - // A notification is sent when the pref value in any store changes. If this - // store is currently being overridden by a higher-priority store, the - // effective value of the pref will not have changed. - pref_notifier_->OnPreferenceChanged(path); - if (!pref_changed_callback_.is_null()) - pref_changed_callback_.Run(path); -} - -bool PrefValueStore::PrefValueInManagedStore(const char* name) const { - return PrefValueInStore(name, MANAGED_STORE); -} - -bool PrefValueStore::PrefValueInExtensionStore(const char* name) const { - return PrefValueInStore(name, EXTENSION_STORE); -} - -bool PrefValueStore::PrefValueInUserStore(const char* name) const { - return PrefValueInStore(name, USER_STORE); -} - -bool PrefValueStore::PrefValueFromExtensionStore(const char* name) const { - return ControllingPrefStoreForPref(name) == EXTENSION_STORE; -} - -bool PrefValueStore::PrefValueFromUserStore(const char* name) const { - return ControllingPrefStoreForPref(name) == USER_STORE; -} - -bool PrefValueStore::PrefValueFromRecommendedStore(const char* name) const { - return ControllingPrefStoreForPref(name) == RECOMMENDED_STORE; -} - -bool PrefValueStore::PrefValueFromDefaultStore(const char* name) const { - return ControllingPrefStoreForPref(name) == DEFAULT_STORE; -} - -bool PrefValueStore::PrefValueUserModifiable(const char* name) const { - PrefStoreType effective_store = ControllingPrefStoreForPref(name); - return effective_store >= USER_STORE || - effective_store == INVALID_STORE; -} - -bool PrefValueStore::PrefValueExtensionModifiable(const char* name) const { - PrefStoreType effective_store = ControllingPrefStoreForPref(name); - return effective_store >= EXTENSION_STORE || - effective_store == INVALID_STORE; -} - -void PrefValueStore::UpdateCommandLinePrefStore(PrefStore* command_line_prefs) { - InitPrefStore(COMMAND_LINE_STORE, command_line_prefs); -} - -bool PrefValueStore::PrefValueInStore( - const char* name, - PrefValueStore::PrefStoreType store) const { - // Declare a temp Value* and call GetValueFromStore, - // ignoring the output value. - const Value* tmp_value = NULL; - return GetValueFromStore(name, store, &tmp_value); -} - -bool PrefValueStore::PrefValueInStoreRange( - const char* name, - PrefValueStore::PrefStoreType first_checked_store, - PrefValueStore::PrefStoreType last_checked_store) const { - if (first_checked_store > last_checked_store) { - NOTREACHED(); - return false; - } - - for (size_t i = first_checked_store; - i <= static_cast<size_t>(last_checked_store); ++i) { - if (PrefValueInStore(name, static_cast<PrefStoreType>(i))) - return true; - } - return false; -} - -PrefValueStore::PrefStoreType PrefValueStore::ControllingPrefStoreForPref( - const char* name) const { - for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) { - if (PrefValueInStore(name, static_cast<PrefStoreType>(i))) - return static_cast<PrefStoreType>(i); - } - return INVALID_STORE; -} - -bool PrefValueStore::GetValueFromStore(const char* name, - PrefValueStore::PrefStoreType store_type, - const Value** out_value) const { - // Only return true if we find a value and it is the correct type, so stale - // values with the incorrect type will be ignored. - const PrefStore* store = GetPrefStore(static_cast<PrefStoreType>(store_type)); - if (store && store->GetValue(name, out_value)) - return true; - - // No valid value found for the given preference name: set the return value - // to false. - *out_value = NULL; - return false; -} - -bool PrefValueStore::GetValueFromStoreWithType(const char* name, - base::Value::Type type, - PrefStoreType store, - const Value** out_value) const { - if (GetValueFromStore(name, store, out_value)) { - if ((*out_value)->IsType(type)) - return true; - - LOG(WARNING) << "Expected type for " << name << " is " << type - << " but got " << (*out_value)->GetType() - << " in store " << store; - } - - *out_value = NULL; - return false; -} - -void PrefValueStore::OnPrefValueChanged(PrefValueStore::PrefStoreType type, - const std::string& key) { - NotifyPrefChanged(key.c_str(), type); -} - -void PrefValueStore::OnInitializationCompleted( - PrefValueStore::PrefStoreType type, bool succeeded) { - if (initialization_failed_) - return; - if (!succeeded) { - initialization_failed_ = true; - pref_notifier_->OnInitializationCompleted(false); - return; - } - CheckInitializationCompleted(); -} - -void PrefValueStore::InitPrefStore(PrefValueStore::PrefStoreType type, - PrefStore* pref_store) { - pref_stores_[type].Initialize(this, pref_store, type); -} - -void PrefValueStore::CheckInitializationCompleted() { - if (initialization_failed_) - return; - for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) { - scoped_refptr<PrefStore> store = - GetPrefStore(static_cast<PrefStoreType>(i)); - if (store && !store->IsInitializationComplete()) - return; - } - pref_notifier_->OnInitializationCompleted(true); -} diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h deleted file mode 100644 index 404796b..0000000 --- a/chrome/browser/prefs/pref_value_store.h +++ /dev/null @@ -1,259 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ -#define CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ - -#include <map> -#include <string> -#include <vector> - -#include "base/basictypes.h" -#include "base/callback.h" -#include "base/gtest_prod_util.h" -#include "base/memory/ref_counted.h" -#include "base/prefs/pref_store.h" -#include "base/values.h" - -class PrefNotifier; -class PrefStore; - -// The PrefValueStore manages various sources of values for Preferences -// (e.g., configuration policies, extensions, and user settings). It returns -// the value of a Preference from the source with the highest priority, and -// allows setting user-defined values for preferences that are not managed. -// -// Unless otherwise explicitly noted, all of the methods of this class must -// be called on the UI thread. -class PrefValueStore { - public: - typedef base::Callback<void(const std::string&)> PrefChangedCallback; - - // In decreasing order of precedence: - // |managed_prefs| contains all preferences from mandatory policies. - // |extension_prefs| contains preference values set by extensions. - // |command_line_prefs| contains preference values set by command-line - // switches. - // |user_prefs| contains all user-set preference values. - // |recommended_prefs| contains all preferences from recommended policies. - // |default_prefs| contains application-default preference values. It must - // be non-null if any preferences are to be registered. - // - // |pref_notifier| facilitates broadcasting preference change notifications - // to the world. - PrefValueStore(PrefStore* managed_prefs, - PrefStore* extension_prefs, - PrefStore* command_line_prefs, - PrefStore* user_prefs, - PrefStore* recommended_prefs, - PrefStore* default_prefs, - PrefNotifier* pref_notifier); - virtual ~PrefValueStore(); - - // Creates a clone of this PrefValueStore with PrefStores overwritten - // by the parameters passed, if unequal NULL. - PrefValueStore* CloneAndSpecialize(PrefStore* managed_prefs, - PrefStore* extension_prefs, - PrefStore* command_line_prefs, - PrefStore* user_prefs, - PrefStore* recommended_prefs, - PrefStore* default_prefs, - PrefNotifier* pref_notifier); - - // A PrefValueStore can have exactly one callback that is directly - // notified of preferences changing in the store. This does not - // filter through the PrefNotifier mechanism, which may not forward - // certain changes (e.g. unregistered prefs). - void set_callback(const PrefChangedCallback& callback); - - // Gets the value for the given preference name that has the specified value - // type. Values stored in a PrefStore that have the matching |name| but - // a non-matching |type| are silently skipped. Returns true if a valid value - // was found in any of the available PrefStores. Most callers should use - // Preference::GetValue() instead of calling this method directly. - bool GetValue(const std::string& name, - base::Value::Type type, - const Value** out_value) const; - - // Gets the recommended value for the given preference name that has the - // specified value type. A value stored in the recommended PrefStore that has - // the matching |name| but a non-matching |type| is silently ignored. Returns - // true if a valid value was found. Most callers should use - // Preference::GetRecommendedValue() instead of calling this method directly. - bool GetRecommendedValue(const std::string& name, - base::Value::Type type, - const Value** out_value) const; - - // These methods return true if a preference with the given name is in the - // indicated pref store, even if that value is currently being overridden by - // a higher-priority source. - bool PrefValueInManagedStore(const char* name) const; - bool PrefValueInExtensionStore(const char* name) const; - bool PrefValueInUserStore(const char* name) const; - - // These methods return true if a preference with the given name is actually - // being controlled by the indicated pref store and not being overridden by - // a higher-priority source. - bool PrefValueFromExtensionStore(const char* name) const; - bool PrefValueFromUserStore(const char* name) const; - bool PrefValueFromRecommendedStore(const char* name) const; - bool PrefValueFromDefaultStore(const char* name) const; - - // Check whether a Preference value is modifiable by the user, i.e. whether - // there is no higher-priority source controlling it. - bool PrefValueUserModifiable(const char* name) const; - - // Check whether a Preference value is modifiable by an extension, i.e. - // whether there is no higher-priority source controlling it. - bool PrefValueExtensionModifiable(const char* name) const; - - // Update the command line PrefStore with |command_line_prefs|. - void UpdateCommandLinePrefStore(PrefStore* command_line_prefs); - - private: - // PrefStores must be listed here in order from highest to lowest priority. - // MANAGED contains all managed preference values that are provided by - // mandatory policies (e.g. Windows Group Policy or cloud policy). - // EXTENSION contains preference values set by extensions. - // COMMAND_LINE contains preference values set by command-line switches. - // USER contains all user-set preference values. - // RECOMMENDED contains all preferences that are provided by recommended - // policies. - // DEFAULT contains all application default preference values. - enum PrefStoreType { - // INVALID_STORE is not associated with an actual PrefStore but used as - // an invalid marker, e.g. as a return value. - INVALID_STORE = -1, - MANAGED_STORE = 0, - EXTENSION_STORE, - COMMAND_LINE_STORE, - USER_STORE, - RECOMMENDED_STORE, - DEFAULT_STORE, - PREF_STORE_TYPE_MAX = DEFAULT_STORE - }; - - // Keeps a PrefStore reference on behalf of the PrefValueStore and monitors - // the PrefStore for changes, forwarding notifications to PrefValueStore. This - // indirection is here for the sake of disambiguating notifications from the - // individual PrefStores. - class PrefStoreKeeper : public PrefStore::Observer { - public: - PrefStoreKeeper(); - virtual ~PrefStoreKeeper(); - - // Takes ownership of |pref_store|. - void Initialize(PrefValueStore* store, - PrefStore* pref_store, - PrefStoreType type); - - PrefStore* store() { return pref_store_.get(); } - const PrefStore* store() const { return pref_store_.get(); } - - private: - // PrefStore::Observer implementation. - virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; - virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; - - // PrefValueStore this keeper is part of. - PrefValueStore* pref_value_store_; - - // The PrefStore managed by this keeper. - scoped_refptr<PrefStore> pref_store_; - - // Type of the pref store. - PrefStoreType type_; - - DISALLOW_COPY_AND_ASSIGN(PrefStoreKeeper); - }; - - typedef std::map<std::string, base::Value::Type> PrefTypeMap; - - friend class PrefValueStorePolicyRefreshTest; - FRIEND_TEST_ALL_PREFIXES(PrefValueStorePolicyRefreshTest, TestPolicyRefresh); - FRIEND_TEST_ALL_PREFIXES(PrefValueStorePolicyRefreshTest, - TestRefreshPolicyPrefsCompletion); - FRIEND_TEST_ALL_PREFIXES(PrefValueStorePolicyRefreshTest, - TestConcurrentPolicyRefresh); - - // Returns true if the preference with the given name has a value in the - // given PrefStoreType, of the same value type as the preference was - // registered with. - bool PrefValueInStore(const char* name, PrefStoreType store) const; - - // Returns true if a preference has an explicit value in any of the - // stores in the range specified by |first_checked_store| and - // |last_checked_store|, even if that value is currently being - // overridden by a higher-priority store. - bool PrefValueInStoreRange(const char* name, - PrefStoreType first_checked_store, - PrefStoreType last_checked_store) const; - - // Returns the pref store type identifying the source that controls the - // Preference identified by |name|. If none of the sources has a value, - // INVALID_STORE is returned. In practice, the default PrefStore - // should always have a value for any registered preferencem, so INVALID_STORE - // indicates an error. - PrefStoreType ControllingPrefStoreForPref(const char* name) const; - - // Get a value from the specified |store|. - bool GetValueFromStore(const char* name, - PrefStoreType store, - const Value** out_value) const; - - // Get a value from the specified |store| if its |type| matches. - bool GetValueFromStoreWithType(const char* name, - base::Value::Type type, - PrefStoreType store, - const Value** out_value) const; - - // Called upon changes in individual pref stores in order to determine whether - // the user-visible pref value has changed. Triggers the change notification - // if the effective value of the preference has changed, or if the store - // controlling the pref has changed. - void NotifyPrefChanged(const char* path, PrefStoreType new_store); - - // Called from the PrefStoreKeeper implementation when a pref value for |key| - // changed in the pref store for |type|. - void OnPrefValueChanged(PrefStoreType type, const std::string& key); - - // Handle the event that the store for |type| has completed initialization. - void OnInitializationCompleted(PrefStoreType type, bool succeeded); - - // Initializes a pref store keeper. Sets up a PrefStoreKeeper that will take - // ownership of the passed |pref_store|. - void InitPrefStore(PrefStoreType type, PrefStore* pref_store); - - // Checks whether initialization is completed and tells the notifier if that - // is the case. - void CheckInitializationCompleted(); - - // Get the PrefStore pointer for the given type. May return NULL if there is - // no PrefStore for that type. - PrefStore* GetPrefStore(PrefStoreType type) { - return pref_stores_[type].store(); - } - const PrefStore* GetPrefStore(PrefStoreType type) const { - return pref_stores_[type].store(); - } - - // Keeps the PrefStore references in order of precedence. - PrefStoreKeeper pref_stores_[PREF_STORE_TYPE_MAX + 1]; - - PrefChangedCallback pref_changed_callback_; - - // Used for generating notifications. This is a weak reference, - // since the notifier is owned by the corresponding PrefService. - PrefNotifier* pref_notifier_; - - // A mapping of preference names to their registered types. - PrefTypeMap pref_types_; - - // True if not all of the PrefStores were initialized successfully. - bool initialization_failed_; - - DISALLOW_COPY_AND_ASSIGN(PrefValueStore); -}; - -#endif // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_ diff --git a/chrome/browser/prefs/pref_value_store_unittest.cc b/chrome/browser/prefs/pref_value_store_unittest.cc deleted file mode 100644 index 2a84bc7..0000000 --- a/chrome/browser/prefs/pref_value_store_unittest.cc +++ /dev/null @@ -1,594 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <string> - -#include "base/bind.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/testing_pref_store.h" -#include "base/values.h" -#include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/common/pref_names.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -using testing::Mock; -using testing::_; - -namespace { - -// Allows to capture pref notifications through gmock. -class MockPrefNotifier : public PrefNotifier { - public: - MOCK_METHOD1(OnPreferenceChanged, void(const std::string&)); - MOCK_METHOD1(OnInitializationCompleted, void(bool)); -}; - -// Allows to capture sync model associator interaction. -class MockPrefModelAssociator { - public: - MOCK_METHOD1(ProcessPrefChange, void(const std::string&)); -}; - -} // namespace - -// Names of the preferences used in this test. -namespace prefs { -const char kManagedPref[] = "this.pref.managed"; -const char kCommandLinePref[] = "this.pref.command_line"; -const char kExtensionPref[] = "this.pref.extension"; -const char kUserPref[] = "this.pref.user"; -const char kRecommendedPref[] = "this.pref.recommended"; -const char kDefaultPref[] = "this.pref.default"; -const char kMissingPref[] = "this.pref.does_not_exist"; -} - -// Potentially expected values of all preferences used in this test program. -namespace managed_pref { -const char kManagedValue[] = "managed:managed"; -} - -namespace extension_pref { -const char kManagedValue[] = "extension:managed"; -const char kExtensionValue[] = "extension:extension"; -} - -namespace command_line_pref { -const char kManagedValue[] = "command_line:managed"; -const char kExtensionValue[] = "command_line:extension"; -const char kCommandLineValue[] = "command_line:command_line"; -} - -namespace user_pref { -const char kManagedValue[] = "user:managed"; -const char kExtensionValue[] = "user:extension"; -const char kCommandLineValue[] = "user:command_line"; -const char kUserValue[] = "user:user"; -} - -namespace recommended_pref { -const char kManagedValue[] = "recommended:managed"; -const char kExtensionValue[] = "recommended:extension"; -const char kCommandLineValue[] = "recommended:command_line"; -const char kUserValue[] = "recommended:user"; -const char kRecommendedValue[] = "recommended:recommended"; -} - -namespace default_pref { -const char kManagedValue[] = "default:managed"; -const char kExtensionValue[] = "default:extension"; -const char kCommandLineValue[] = "default:command_line"; -const char kUserValue[] = "default:user"; -const char kRecommendedValue[] = "default:recommended"; -const char kDefaultValue[] = "default:default"; -} - -class PrefValueStoreTest : public testing::Test { - protected: - virtual void SetUp() { - // Create TestingPrefStores. - CreateManagedPrefs(); - CreateExtensionPrefs(); - CreateCommandLinePrefs(); - CreateUserPrefs(); - CreateRecommendedPrefs(); - CreateDefaultPrefs(); - sync_associator_.reset(new MockPrefModelAssociator()); - - // Create a fresh PrefValueStore. - pref_value_store_.reset(new PrefValueStore( - managed_pref_store_, - extension_pref_store_, - command_line_pref_store_, - user_pref_store_, - recommended_pref_store_, - default_pref_store_, - &pref_notifier_)); - - pref_value_store_->set_callback( - base::Bind(&MockPrefModelAssociator::ProcessPrefChange, - base::Unretained(sync_associator_.get()))); - } - - void CreateManagedPrefs() { - managed_pref_store_ = new TestingPrefStore; - managed_pref_store_->SetString( - prefs::kManagedPref, - managed_pref::kManagedValue); - } - - void CreateExtensionPrefs() { - extension_pref_store_ = new TestingPrefStore; - extension_pref_store_->SetString( - prefs::kManagedPref, - extension_pref::kManagedValue); - extension_pref_store_->SetString( - prefs::kExtensionPref, - extension_pref::kExtensionValue); - } - - void CreateCommandLinePrefs() { - command_line_pref_store_ = new TestingPrefStore; - command_line_pref_store_->SetString( - prefs::kManagedPref, - command_line_pref::kManagedValue); - command_line_pref_store_->SetString( - prefs::kExtensionPref, - command_line_pref::kExtensionValue); - command_line_pref_store_->SetString( - prefs::kCommandLinePref, - command_line_pref::kCommandLineValue); - } - - void CreateUserPrefs() { - user_pref_store_ = new TestingPrefStore; - user_pref_store_->SetString( - prefs::kManagedPref, - user_pref::kManagedValue); - user_pref_store_->SetString( - prefs::kCommandLinePref, - user_pref::kCommandLineValue); - user_pref_store_->SetString( - prefs::kExtensionPref, - user_pref::kExtensionValue); - user_pref_store_->SetString( - prefs::kUserPref, - user_pref::kUserValue); - } - - void CreateRecommendedPrefs() { - recommended_pref_store_ = new TestingPrefStore; - recommended_pref_store_->SetString( - prefs::kManagedPref, - recommended_pref::kManagedValue); - recommended_pref_store_->SetString( - prefs::kCommandLinePref, - recommended_pref::kCommandLineValue); - recommended_pref_store_->SetString( - prefs::kExtensionPref, - recommended_pref::kExtensionValue); - recommended_pref_store_->SetString( - prefs::kUserPref, - recommended_pref::kUserValue); - recommended_pref_store_->SetString( - prefs::kRecommendedPref, - recommended_pref::kRecommendedValue); - } - - void CreateDefaultPrefs() { - default_pref_store_ = new TestingPrefStore; - default_pref_store_->SetString( - prefs::kManagedPref, - default_pref::kManagedValue); - default_pref_store_->SetString( - prefs::kCommandLinePref, - default_pref::kCommandLineValue); - default_pref_store_->SetString( - prefs::kExtensionPref, - default_pref::kExtensionValue); - default_pref_store_->SetString( - prefs::kUserPref, - default_pref::kUserValue); - default_pref_store_->SetString( - prefs::kRecommendedPref, - default_pref::kRecommendedValue); - default_pref_store_->SetString( - prefs::kDefaultPref, - default_pref::kDefaultValue); - } - - void ExpectValueChangeNotifications(const char* name) { - EXPECT_CALL(pref_notifier_, OnPreferenceChanged(name)); - EXPECT_CALL(*sync_associator_, ProcessPrefChange(name)); - } - - void CheckAndClearValueChangeNotifications() { - Mock::VerifyAndClearExpectations(&pref_notifier_); - Mock::VerifyAndClearExpectations(sync_associator_.get()); - } - - MockPrefNotifier pref_notifier_; - scoped_ptr<MockPrefModelAssociator> sync_associator_; - scoped_ptr<PrefValueStore> pref_value_store_; - - scoped_refptr<TestingPrefStore> managed_pref_store_; - scoped_refptr<TestingPrefStore> extension_pref_store_; - scoped_refptr<TestingPrefStore> command_line_pref_store_; - scoped_refptr<TestingPrefStore> user_pref_store_; - scoped_refptr<TestingPrefStore> recommended_pref_store_; - scoped_refptr<TestingPrefStore> default_pref_store_; -}; - -TEST_F(PrefValueStoreTest, GetValue) { - const Value* value; - - // The following tests read a value from the PrefService. The preferences are - // set in a way such that all lower-priority stores have a value and we can - // test whether overrides work correctly. - - // Test getting a managed value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedPref, - Value::TYPE_STRING, &value)); - std::string actual_str_value; - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(managed_pref::kManagedValue, actual_str_value); - - // Test getting an extension value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kExtensionPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(extension_pref::kExtensionValue, actual_str_value); - - // Test getting a command-line value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kCommandLinePref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(command_line_pref::kCommandLineValue, actual_str_value); - - // Test getting a user-set value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kUserPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(user_pref::kUserValue, actual_str_value); - - // Test getting a user set value overwriting a recommended value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kRecommendedPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kRecommendedValue, - actual_str_value); - - // Test getting a default value. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetValue(prefs::kDefaultPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(default_pref::kDefaultValue, actual_str_value); - - // Test getting a preference value that the |PrefValueStore| - // does not contain. - base::FundamentalValue tmp_dummy_value(true); - value = &tmp_dummy_value; - ASSERT_FALSE(pref_value_store_->GetValue(prefs::kMissingPref, - Value::TYPE_STRING, &value)); - ASSERT_FALSE(value); -} - -TEST_F(PrefValueStoreTest, GetRecommendedValue) { - const Value* value; - - // The following tests read a value from the PrefService. The preferences are - // set in a way such that all lower-priority stores have a value and we can - // test whether overrides do not clutter the recommended value. - - // Test getting recommended value when a managed value is present. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetRecommendedValue( - prefs::kManagedPref, - Value::TYPE_STRING, &value)); - std::string actual_str_value; - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kManagedValue, actual_str_value); - - // Test getting recommended value when an extension value is present. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetRecommendedValue( - prefs::kExtensionPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kExtensionValue, actual_str_value); - - // Test getting recommended value when a command-line value is present. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetRecommendedValue( - prefs::kCommandLinePref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kCommandLineValue, actual_str_value); - - // Test getting recommended value when a user-set value is present. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetRecommendedValue( - prefs::kUserPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kUserValue, actual_str_value); - - // Test getting recommended value when no higher-priority value is present. - value = NULL; - ASSERT_TRUE(pref_value_store_->GetRecommendedValue( - prefs::kRecommendedPref, - Value::TYPE_STRING, &value)); - EXPECT_TRUE(value->GetAsString(&actual_str_value)); - EXPECT_EQ(recommended_pref::kRecommendedValue, - actual_str_value); - - // Test getting recommended value when no recommended value is present. - base::FundamentalValue tmp_dummy_value(true); - value = &tmp_dummy_value; - ASSERT_FALSE(pref_value_store_->GetRecommendedValue( - prefs::kDefaultPref, - Value::TYPE_STRING, &value)); - ASSERT_FALSE(value); - - // Test getting a preference value that the |PrefValueStore| - // does not contain. - value = &tmp_dummy_value; - ASSERT_FALSE(pref_value_store_->GetRecommendedValue( - prefs::kMissingPref, - Value::TYPE_STRING, &value)); - ASSERT_FALSE(value); -} - -TEST_F(PrefValueStoreTest, PrefChanges) { - // Check pref controlled by highest-priority store. - ExpectValueChangeNotifications(prefs::kManagedPref); - managed_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kManagedPref); - extension_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kManagedPref); - command_line_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kManagedPref); - user_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kManagedPref); - recommended_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kManagedPref); - default_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); - CheckAndClearValueChangeNotifications(); - - // Check pref controlled by user store. - ExpectValueChangeNotifications(prefs::kUserPref); - managed_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kUserPref); - extension_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kUserPref); - command_line_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kUserPref); - user_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kUserPref); - recommended_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kUserPref); - default_pref_store_->NotifyPrefValueChanged(prefs::kUserPref); - CheckAndClearValueChangeNotifications(); - - // Check pref controlled by default-pref store. - ExpectValueChangeNotifications(prefs::kDefaultPref); - managed_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kDefaultPref); - extension_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kDefaultPref); - command_line_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kDefaultPref); - user_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kDefaultPref); - recommended_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); - - ExpectValueChangeNotifications(prefs::kDefaultPref); - default_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); - CheckAndClearValueChangeNotifications(); -} - -TEST_F(PrefValueStoreTest, OnInitializationCompleted) { - EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(0); - managed_pref_store_->SetInitializationCompleted(); - extension_pref_store_->SetInitializationCompleted(); - command_line_pref_store_->SetInitializationCompleted(); - recommended_pref_store_->SetInitializationCompleted(); - default_pref_store_->SetInitializationCompleted(); - Mock::VerifyAndClearExpectations(&pref_notifier_); - - // The notification should only be triggered after the last store is done. - EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(1); - user_pref_store_->SetInitializationCompleted(); - Mock::VerifyAndClearExpectations(&pref_notifier_); -} - -TEST_F(PrefValueStoreTest, PrefValueInManagedStore) { - EXPECT_TRUE(pref_value_store_->PrefValueInManagedStore( - prefs::kManagedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kCommandLinePref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueInExtensionStore) { - EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore( - prefs::kManagedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( - prefs::kCommandLinePref)); - EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueInUserStore) { - EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( - prefs::kManagedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( - prefs::kExtensionPref)); - EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( - prefs::kCommandLinePref)); - EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueFromExtensionStore) { - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kManagedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kCommandLinePref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueFromUserStore) { - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kManagedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kCommandLinePref)); - EXPECT_TRUE(pref_value_store_->PrefValueFromUserStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueFromRecommendedStore) { - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kManagedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kCommandLinePref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kUserPref)); - EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kRecommendedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) { - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kManagedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kCommandLinePref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kUserPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kRecommendedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kDefaultPref)); - EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueUserModifiable) { - EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( - prefs::kManagedPref)); - EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( - prefs::kExtensionPref)); - EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( - prefs::kCommandLinePref)); - EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( - prefs::kUserPref)); - EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( - prefs::kRecommendedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( - prefs::kDefaultPref)); - EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( - prefs::kMissingPref)); -} - -TEST_F(PrefValueStoreTest, PrefValueExtensionModifiable) { - EXPECT_FALSE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kManagedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kExtensionPref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kCommandLinePref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kUserPref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kRecommendedPref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kDefaultPref)); - EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( - prefs::kMissingPref)); -} diff --git a/chrome/browser/prefs/scoped_user_pref_update.cc b/chrome/browser/prefs/scoped_user_pref_update.cc index 01a0d62..0030029 100644 --- a/chrome/browser/prefs/scoped_user_pref_update.cc +++ b/chrome/browser/prefs/scoped_user_pref_update.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/prefs/pref_notifier.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" namespace subtle { diff --git a/chrome/browser/prefs/scoped_user_pref_update.h b/chrome/browser/prefs/scoped_user_pref_update.h index 5842334..24942f1 100644 --- a/chrome/browser/prefs/scoped_user_pref_update.h +++ b/chrome/browser/prefs/scoped_user_pref_update.h @@ -11,9 +11,9 @@ #include <string> #include "base/basictypes.h" +#include "base/prefs/pref_service.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" class PrefService; diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc index fdb58a5..1f58654 100644 --- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc +++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/mock_pref_change_callback.h" #include "base/prefs/public/pref_change_registrar.h" -#include "chrome/browser/prefs/mock_pref_change_callback.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 508131f..decc622 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -6,11 +6,11 @@ #include <string> +#include "base/prefs/pref_service.h" #include "base/values.h" #include "base/version.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 5589d12..da7bd56 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/test/test_timeouts.h" @@ -18,7 +19,6 @@ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_handle.h" #include "chrome/browser/prerender/prerender_link_manager.h" diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc index 7e903b2..75e0367 100644 --- a/chrome/browser/prerender/prerender_field_trial.cc +++ b/chrome/browser/prerender/prerender_field_trial.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/predictors/autocomplete_action_predictor.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 197f649..5562de2 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -21,7 +22,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_condition.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_field_trial.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index 412761e..62ca666 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -10,13 +10,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/service/service_process_control.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index cbfe29f..b3e87f3 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -6,10 +6,10 @@ #include "base/json/json_writer.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_url.cc b/chrome/browser/printing/cloud_print/cloud_print_url.cc index e6aed23..5cb8615 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_url.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_url.cc @@ -6,10 +6,10 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index dd80001..89bb730 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -11,12 +11,12 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/printing/print_preview_test.cc b/chrome/browser/printing/print_preview_test.cc index 9a6a570..a044726 100644 --- a/chrome/browser/printing/print_preview_test.cc +++ b/chrome/browser/printing/print_preview_test.cc @@ -4,7 +4,7 @@ #include "chrome/browser/printing/print_preview_test.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/plugin_service.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 2921be3..b9b2497 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -11,10 +11,10 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/timer.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_error_dialog.h" #include "chrome/browser/printing/print_job.h" #include "chrome/browser/printing/print_job_manager.h" diff --git a/chrome/browser/profiles/chrome_version_service.cc b/chrome/browser/profiles/chrome_version_service.cc index 68d1708..7133139 100644 --- a/chrome/browser/profiles/chrome_version_service.cc +++ b/chrome/browser/profiles/chrome_version_service.cc @@ -4,9 +4,9 @@ #include "chrome/browser/profiles/chrome_version_service.h" +#include "base/prefs/pref_service.h" #include "base/version.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profiles/gaia_info_update_service.cc b/chrome/browser/profiles/gaia_info_update_service.cc index bb0e408..e95566f 100644 --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc @@ -5,8 +5,8 @@ #include "chrome/browser/profiles/gaia_info_update_service.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index bb380b1..dd85970 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -4,16 +4,16 @@ #include "chrome/browser/profiles/gaia_info_update_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" +#include "chrome/browser/profiles/profile_downloader.h" +#include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_info_cache_unittest.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" -#include "chrome/browser/profiles/profile_downloader.h" -#include "chrome/browser/profiles/profile_info_cache.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_unittest_util.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc index ba0a215..3140e32 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc @@ -4,10 +4,10 @@ #include "chrome/browser/profiles/off_the_record_profile_impl.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 1249136..dfe2a8b 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" @@ -18,7 +19,6 @@ #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index 9ca292a..923aa4e 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -6,9 +6,9 @@ #include <string> +#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_prefs.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 7ce8d51..a12f518 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" +#include "base/prefs/pref_service.h" #include "base/version.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/chrome_version_service.h" #include "chrome/browser/profiles/profile_impl.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 7f2e77c..ac66d6a 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/stl_util.h" #include "base/threading/worker_pool.h" @@ -22,7 +23,6 @@ #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/browser/net/sqlite_server_bound_cert_store.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index c97c3ba..bccb8e6 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -10,6 +10,8 @@ #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/pref_service.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/string_piece.h" @@ -18,8 +20,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 97df542..44a4c03 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -43,7 +44,6 @@ #include "chrome/browser/policy/url_blacklist_manager.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_names_io_thread.h" diff --git a/chrome/browser/profiles/profile_keyed_base_factory.cc b/chrome/browser/profiles/profile_keyed_base_factory.cc index 858cdad..8cb29b5 100644 --- a/chrome/browser/profiles/profile_keyed_base_factory.cc +++ b/chrome/browser/profiles/profile_keyed_base_factory.cc @@ -4,8 +4,8 @@ #include "chrome/browser/profiles/profile_keyed_base_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 1084978..4eab097 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -11,6 +11,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -18,8 +20,6 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/bookmark_model_loaded_observer.h" #include "chrome/browser/profiles/profile_destroyer.h" diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm index 0a0adcc..389e8e4 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm @@ -6,9 +6,9 @@ #include <cmath> +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/renderer_host/web_cache_manager.cc b/chrome/browser/renderer_host/web_cache_manager.cc index 75332be..9374a5d 100644 --- a/chrome/browser/renderer_host/web_cache_manager.cc +++ b/chrome/browser/renderer_host/web_cache_manager.cc @@ -11,11 +11,11 @@ #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/time.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index cfedf22..6dd2972 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -4,7 +4,7 @@ #include "chrome/browser/renderer_preferences_util.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/common/renderer_preferences.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index bad1e29..de2f78f 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -14,11 +14,11 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index ec43288..2529937 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -10,9 +10,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/browser_feature_extractor.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 239c402..f8d6067 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -10,11 +10,11 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/time.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/safe_browsing/client_model.pb.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index bb1aafb..c372c85 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -13,6 +13,7 @@ #include "base/lazy_instance.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -21,7 +22,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/safe_browsing/malware_details.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 2957fa3e..516708dd 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -8,10 +8,10 @@ // they work. #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/database_manager.h" #include "chrome/browser/safe_browsing/malware_details.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 21b3999..4200984 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index a4998d0..24b8453 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -11,6 +11,7 @@ #include "base/debug/leak_tracker.h" #include "base/lazy_instance.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/string_util.h" @@ -19,7 +20,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index bf371aa..75739ad 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -14,11 +14,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/test/thread_test_helper.h" #include "base/time.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc b/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc index 51c15e8..b6cb350 100644 --- a/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc +++ b/chrome/browser/safe_browsing/safe_browsing_tab_observer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index 8bfba72..09617c6 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string16.h" #include "base/string_piece.h" @@ -18,7 +19,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/prepopulated_engines.h" #include "chrome/browser/search_engines/search_engine_type.h" diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 5bbd669..4a82103 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -12,6 +12,7 @@ #include "base/i18n/case_conversion.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/string_util.h" @@ -23,7 +24,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index a18ecce..f5355ae 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -4,10 +4,10 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/webdata/web_data_service_factory.h" diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc index 1fb4f9a..581f513 100644 --- a/chrome/browser/search_engines/util.cc +++ b/chrome/browser/search_engines/util.cc @@ -4,15 +4,15 @@ #include "chrome/browser/search_engines/util.h" +#include <map> #include <set> #include <string> -#include <map> #include <vector> #include "base/logging.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_service.h" #include "base/time.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index c3add84..7d0ef4e 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -7,13 +7,13 @@ #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/enterprise_extension_observer.h" #include "chrome/browser/content_settings/cookie_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 08a8917..674e12f 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/signin/about_signin_internals.cc b/chrome/browser/signin/about_signin_internals.cc index e75d3ef..ad83b0d 100644 --- a/chrome/browser/signin/about_signin_internals.cc +++ b/chrome/browser/signin/about_signin_internals.cc @@ -8,8 +8,8 @@ #include "base/hash.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_internals_util.h" #include "chrome/browser/signin/signin_manager.h" diff --git a/chrome/browser/signin/about_signin_internals_factory.cc b/chrome/browser/signin/about_signin_internals_factory.cc index 2628042..6f9bd88 100644 --- a/chrome/browser/signin/about_signin_internals_factory.cc +++ b/chrome/browser/signin/about_signin_internals_factory.cc @@ -4,8 +4,8 @@ #include "chrome/browser/signin/about_signin_internals_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/signin_internals_util.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 8e36efd..c60ddf8 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -10,13 +10,13 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/about_signin_internals.h" diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc index b4349b0..1db6aae 100644 --- a/chrome/browser/signin/signin_manager_factory.cc +++ b/chrome/browser/signin/signin_manager_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/browser/prefs/pref_registry_simple.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/signin_manager.h" diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index beaed42..8dc20b2 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_unittest.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/browser/signin/token_service.cc b/chrome/browser/signin/token_service.cc index 01494fe..bd0ca38 100644 --- a/chrome/browser/signin/token_service.cc +++ b/chrome/browser/signin/token_service.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index 18537b2..05b435d 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc @@ -8,12 +8,12 @@ #include <string> #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/synchronization/lock.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" #include "chrome/browser/tab_contents/tab_util.h" diff --git a/chrome/browser/speech/chrome_speech_recognition_preferences.cc b/chrome/browser/speech/chrome_speech_recognition_preferences.cc index 58df99f..0954a9a 100644 --- a/chrome/browser/speech/chrome_speech_recognition_preferences.cc +++ b/chrome/browser/speech/chrome_speech_recognition_preferences.cc @@ -5,9 +5,9 @@ #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc index 897c8a4..cf95260 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.cc +++ b/chrome/browser/spellchecker/spellcheck_factory.cc @@ -4,9 +4,9 @@ #include "chrome/browser/spellchecker/spellcheck_factory.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/spellchecker/spellcheck_service.h" diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc index 88a06d0..4cb88bf 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc @@ -5,7 +5,7 @@ #include "chrome/browser/spellchecker/spellcheck_message_filter.h" #include "base/bind.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index 7192a06..f3f5e61 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc @@ -5,10 +5,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #include "base/platform_file.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/string_split.h" #include "base/synchronization/waitable_event.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc index e7c6074..c38b666 100644 --- a/chrome/browser/spellchecker/spelling_service_client.cc +++ b/chrome/browser/spellchecker/spelling_service_client.cc @@ -9,11 +9,11 @@ #include "base/json/string_escape.h" #include "base/logging.h" #include "base/metrics/field_trial.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index 54bba5c..3e3e916 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -8,10 +8,10 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/spellchecker/spelling_service_client.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index ad82fad..ef253aa 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -4,13 +4,13 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc index 5cc27bb..f5bea83 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/callback.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/sync/invalidations/invalidator_storage.cc b/chrome/browser/sync/invalidations/invalidator_storage.cc index 207c61f..b75d4ff 100644 --- a/chrome/browser/sync/invalidations/invalidator_storage.cc +++ b/chrome/browser/sync/invalidations/invalidator_storage.cc @@ -10,11 +10,11 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/task_runner.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc index 440c990..1f7e6b4 100644 --- a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc +++ b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "sync/internal_api/public/base/invalidation_test_util.h" diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index a1966f1..0000819 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -6,13 +6,13 @@ #include "base/command_line.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index 78c6d40..ce20e93 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_store.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc index a7c872d..cc26c7a 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/prefs/pref_service.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/time.h" @@ -15,7 +16,6 @@ #include "chrome/browser/password_manager/mock_password_store.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 8987e8b..1a00308 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_manager_fake.h" diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc index 34ed7c8..9c53203 100644 --- a/chrome/browser/sync/sync_prefs.cc +++ b/chrome/browser/sync/sync_prefs.cc @@ -5,12 +5,12 @@ #include "chrome/browser/sync/sync_prefs.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index aee495c..c9f0115 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -6,9 +6,9 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_global_error.h" diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc index bf6f89e..f649ab1 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.cc +++ b/chrome/browser/sync/test/integration/preferences_helper.cc @@ -4,13 +4,13 @@ #include "chrome/browser/sync/test/integration/preferences_helper.h" +#include "base/prefs/pref_service.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_harness.h" -#include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" +#include "chrome/browser/sync/test/integration/sync_test.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index fb8b16b..e572a4b 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index afebf4a..fdc406f 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/stl_util.h" #include "base/string_util.h" @@ -31,7 +32,6 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_context_menu_observer.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/printing/print_view_manager.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_unittest.cc b/chrome/browser/tab_contents/render_view_context_menu_unittest.cc index 2409010..d1ba6cd 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_unittest.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_unittest.cc @@ -4,11 +4,11 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/render_view_context_menu_test_util.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_browsertest.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_browsertest.cc index cc9c0e4..3a05449 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_browsertest.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/tab_contents/render_view_context_menu_observer.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc index 7a59632..038b451 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc @@ -6,10 +6,10 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc index 44b06a8..038a20f 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_mac.cc @@ -5,8 +5,8 @@ #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/tab_contents/spelling_bubble_model.h" diff --git a/chrome/browser/tab_contents/spelling_bubble_model.cc b/chrome/browser/tab_contents/spelling_bubble_model.cc index 9693c1c..7db4ade 100644 --- a/chrome/browser/tab_contents/spelling_bubble_model.cc +++ b/chrome/browser/tab_contents/spelling_bubble_model.cc @@ -5,7 +5,7 @@ #include "chrome/browser/tab_contents/spelling_bubble_model.h" #include "base/logging.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/tab_contents/spelling_menu_observer.cc b/chrome/browser/tab_contents/spelling_menu_observer.cc index 229c373..4481aca 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.cc +++ b/chrome/browser/tab_contents/spelling_menu_observer.cc @@ -7,14 +7,14 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/case_conversion.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" -#include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" +#include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/browser/spellchecker/spelling_service_client.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/tab_contents/spelling_bubble_model.h" diff --git a/chrome/browser/tab_contents/spelling_menu_observer_browsertest.cc b/chrome/browser/tab_contents/spelling_menu_observer_browsertest.cc index 79004fc..0474928 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer_browsertest.cc +++ b/chrome/browser/tab_contents/spelling_menu_observer_browsertest.cc @@ -7,9 +7,9 @@ #include <vector> #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/spellchecker/spelling_service_client.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/tab_contents/render_view_context_menu_observer.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 6079119..80a8ed4 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_registry_simple.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/stl_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "chrome/browser/task_manager/task_manager_worker_resource_provider.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index b4cf76c..47929e9 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/memory/ref_counted_memory.h" +#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_pack.h" #include "chrome/browser/themes/theme_syncable_service.h" diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc index 9f802e1..003d8b3 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc @@ -5,9 +5,9 @@ #include "chrome/browser/themes/theme_service_factory.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 64c3e91..ddbc04d 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -11,13 +11,13 @@ #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/language_state.h" #include "chrome/browser/tab_contents/tab_util.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 462707b..7565ff9 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -9,6 +9,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -17,7 +18,6 @@ #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/translate/translate_prefs.cc b/chrome/browser/translate/translate_prefs.cc index 36a900b..e80e9fb 100644 --- a/chrome/browser/translate/translate_prefs.cc +++ b/chrome/browser/translate/translate_prefs.cc @@ -4,9 +4,9 @@ #include "chrome/browser/translate/translate_prefs.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] = diff --git a/chrome/browser/ui/alternate_error_tab_observer.cc b/chrome/browser/ui/alternate_error_tab_observer.cc index ed4ac3f..b18eb92 100644 --- a/chrome/browser/ui/alternate_error_tab_observer.cc +++ b/chrome/browser/ui/alternate_error_tab_observer.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/alternate_error_tab_observer.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc index 9284163..7e8412c 100644 --- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc +++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc @@ -5,8 +5,8 @@ #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/app_list/app_list_util.cc b/chrome/browser/ui/app_list/app_list_util.cc index 098718c..12af44e 100644 --- a/chrome/browser/ui/app_list/app_list_util.cc +++ b/chrome/browser/ui/app_list/app_list_util.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/app_list/app_list_util.h" #include "base/file_util.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc index 8af3d3e..57df0f8 100644 --- a/chrome/browser/ui/app_list/apps_model_builder.cc +++ b/chrome/browser/ui/app_list/apps_model_builder.cc @@ -7,10 +7,10 @@ #include <algorithm> #include "base/auto_reset.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/extension_app_item.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc index a1f9516..2dd17b7 100644 --- a/chrome/browser/ui/app_list/extension_app_item.cc +++ b/chrome/browser/ui/app_list/extension_app_item.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/app_list/extension_app_item.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_prefs.h" @@ -13,7 +14,6 @@ #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc index 25e44d7..bf6417e 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state.cc +++ b/chrome/browser/ui/ash/app_sync_ui_state.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/ash/app_sync_ui_state.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/pending_extension_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 03bf778..f2333c9 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -13,12 +13,12 @@ #include "ash/wm/window_util.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc index 35a2720..e15ae68 100644 --- a/chrome/browser/ui/ash/event_rewriter.cc +++ b/chrome/browser/ui/ash/event_rewriter.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "ui/aura/root_window.h" #include "ui/base/events/event.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc index 7187988..d8ea96a 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc @@ -12,10 +12,10 @@ #include "ash/wm/property_util.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc index 3f6fd3d..fa86ab1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc @@ -7,9 +7,9 @@ #include "ash/launcher/launcher.h" #include "ash/launcher/launcher_model.h" #include "ash/launcher/launcher_types.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h" diff --git a/chrome/browser/ui/auto_login_info_bar_delegate.cc b/chrome/browser/ui/auto_login_info_bar_delegate.cc index 8c33395..7261548 100644 --- a/chrome/browser/ui/auto_login_info_bar_delegate.cc +++ b/chrome/browser/ui/auto_login_info_bar_delegate.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/ubertoken_fetcher.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 2b1fe23..58d60dc 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/google/google_url_tracker.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc index be0eac6..0058fac 100644 --- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc +++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/autofill/password_generator.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index e32ead2..d99b592 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_service_base.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_editor.h" @@ -12,7 +13,6 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc index 93a64c2..a35c5ba 100644 --- a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" @@ -14,7 +15,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc index f51b0db..8d84cb2 100644 --- a/chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc @@ -6,15 +6,15 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/browser_with_test_window_test.h" -#include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/test_browser_window.h" +#include "chrome/test/base/testing_browser_process.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 1572543..8a3841f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -18,6 +18,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/process_info.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -63,7 +64,6 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/pepper_broker_infobar_delegate.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_destroyer.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index d75c2b2..5823298 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_path.h" +#include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -19,7 +20,6 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sessions/session_backend.h" diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index 5d5af9b..431440c 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -5,13 +5,13 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_test_file_activity_observer.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 07a2b65..6559129 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/browser_command_controller.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 492d8c3..48127d9 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" @@ -25,7 +26,6 @@ #include "chrome/browser/managed_mode/managed_user_service_factory.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 40d75cd..4cdc6d4 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/browser_instant_controller.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/browser_list_impl.cc b/chrome/browser/ui/browser_list_impl.cc index 071ca95..3dd9280 100644 --- a/chrome/browser/ui/browser_list_impl.cc +++ b/chrome/browser/ui/browser_list_impl.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_service.h" // #include "build/build_config.h" -// #include "chrome/browser/prefs/pref_service.h" +// #include "base/prefs/pref_service.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 5b290b0..b0c1529 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_about_handler.h" @@ -14,7 +15,6 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 3203cd8..e0562b2 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/browser_navigator_browsertest.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc index d41dd7c..594577e 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/browser_ui_prefs.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/browser_view_prefs.cc b/chrome/browser/ui/browser_view_prefs.cc index 399f0a6..0f6ea94 100644 --- a/chrome/browser/ui/browser_view_prefs.cc +++ b/chrome/browser/ui/browser_view_prefs.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser_view_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/common/pref_names.h" namespace { diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc index a0e6e0a..409ef03 100644 --- a/chrome/browser/ui/browser_window_state.cc +++ b/chrome/browser/ui/browser_window_state.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/browser_window_state.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_factory.h" diff --git a/chrome/browser/ui/chrome_select_file_policy.cc b/chrome/browser/ui/chrome_select_file_policy.cc index a50cc74..62a6ce8 100644 --- a/chrome/browser/ui/chrome_select_file_policy.cc +++ b/chrome/browser/ui/chrome_select_file_policy.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 49a3ddf..18fe2d7 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc @@ -7,11 +7,11 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 4a19e65..adbeede 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -7,6 +7,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -14,7 +15,6 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index f2da8b5..15fbdea 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -9,12 +9,12 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index 39082bf..0897b26 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -8,15 +8,14 @@ #include "base/command_line.h" #import "base/memory/scoped_nsobject.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window_state.h" -#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" #import "chrome/browser/ui/cocoa/dev_tools_controller.h" #import "chrome/browser/ui/cocoa/fast_resize_view.h" @@ -25,6 +24,7 @@ #import "chrome/browser/ui/cocoa/framed_browser_window.h" #import "chrome/browser/ui/cocoa/fullscreen_window.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" +#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" #import "chrome/browser/ui/cocoa/status_bubble_mac.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 9c5fd8a..6370179 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -7,17 +7,17 @@ #include "base/mac/mac_util.h" #import "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/signin_global_error.h" #include "chrome/browser/signin/signin_manager.h" -#include "chrome/browser/signin/signin_manager_fake.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "chrome/browser/signin/signin_manager_fake.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/sync_global_error.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index d994d539..bd8f350 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/memory/scoped_nsobject.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_registry_simple.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/cocoa/confirm_quit.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 7f8e8a5..021ee02 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -9,6 +9,7 @@ #include "base/mac/bundle_locations.h" #import "base/mac/mac_util.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" @@ -21,7 +22,6 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h" diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.mm b/chrome/browser/ui/cocoa/dev_tools_controller.mm index ba97641..63bc637 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller.mm +++ b/chrome/browser/ui/cocoa/dev_tools_controller.mm @@ -9,8 +9,8 @@ #include <Cocoa/Cocoa.h> #import "base/mac/foundation_util.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/view_id_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 96f5bbc..aa06434 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -7,6 +7,7 @@ #include <cmath> #include <string> +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" @@ -14,7 +15,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index 72c50ff..de496c2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" @@ -12,7 +13,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm index 214b410..d9a3a1b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm @@ -8,12 +8,12 @@ #include "base/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 251f505..a3d5db9 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -25,9 +25,9 @@ #include "ui/base/l10n/l10n_util_mac.h" #if defined(GOOGLE_CHROME_BUILD) +#include "base/prefs/pref_service.h" #import "chrome/app/breakpad_mac.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" #endif diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index ee37235..5b5812b 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm @@ -12,11 +12,11 @@ #include "base/command_line.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/first_run/first_run.h" #import "chrome/browser/mac/keystone_glue.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 02656a3..dc60b32 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -6,10 +6,10 @@ #include <algorithm> +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 77b7b2b..d9af628 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -20,7 +21,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/location_bar_controller.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index f9adc9f..2d1f3ec 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -11,12 +11,12 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 07c9224..2b31288 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -14,6 +14,7 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" @@ -23,7 +24,6 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" @@ -38,12 +38,12 @@ #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" +#import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" -#import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h" #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" #import "chrome/browser/ui/cocoa/tracking_area.h" #include "chrome/browser/ui/find_bar/find_bar.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index d527af4..7b63972 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -9,9 +9,9 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #import "chrome/browser/ui/cocoa/window_size_autosaver.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index f55ddeb..2c02e5b 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -9,6 +9,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -18,7 +19,6 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm index 6b021d3..7491229 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm @@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #import "base/memory/scoped_nsobject.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/ui/browser_command_controller.h" @@ -13,7 +14,6 @@ #import "chrome/browser/ui/cocoa/gradient_button_cell.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 81652ae..3cef6bb 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -4,12 +4,12 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/download/download_shelf.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/cocoa/window_size_autosaver.mm b/chrome/browser/ui/cocoa/window_size_autosaver.mm index 267a830..673320e 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/window_size_autosaver.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" // If the window width stored in the prefs is smaller than this, the size is diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index 3ff7a7f..0081895 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm @@ -7,8 +7,8 @@ #import "chrome/browser/ui/cocoa/window_size_autosaver.h" #include "base/memory/scoped_nsobject.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 9823875..2cb2f0a 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/content_settings/content_settings_utils.h" @@ -13,7 +14,6 @@ #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h" diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc index 93c829b..4d79c02 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index 7428bbe744..c170c74 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -10,6 +10,7 @@ #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "base/pickle.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" @@ -17,7 +18,6 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index c7fcb79..0c71dc0 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -13,13 +13,13 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/strings/string_tokenizer.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 45b4581..06d35c4 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -15,9 +15,9 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index cd11e1e..50f8548 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -21,6 +21,7 @@ #include "base/message_loop.h" #include "base/nix/xdg_util.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -30,7 +31,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc index c622ffa..1ec9902 100644 --- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc +++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/gtk/collected_cookies_gtk.h" #include <string> +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" @@ -18,7 +19,6 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 1416f28..4fe2cdd 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -33,8 +33,8 @@ #endif #if defined(GOOGLE_CHROME_BUILD) +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #endif namespace { diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc index 1e3add7..3d6aafd 100644 --- a/chrome/browser/ui/gtk/global_menu_bar.cc +++ b/chrome/browser/ui/gtk/global_menu_bar.cc @@ -7,8 +7,8 @@ #include <gtk/gtk.h> #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index d36a762..1c18aeb 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -12,8 +12,8 @@ #include "base/debug/trace_event.h" #include "base/environment.h" #include "base/nix/xdg_util.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service_unittest.cc b/chrome/browser/ui/gtk/gtk_theme_service_unittest.cc index 6802f5f..05ae685 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service_unittest.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service_unittest.cc @@ -4,7 +4,7 @@ #include <gtk/gtk.h> -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index f5019da..e578470 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -15,6 +15,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -32,7 +33,6 @@ #include "chrome/browser/extensions/script_bubble_controller.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index bd86a8b..d52863e 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -14,11 +14,11 @@ #include "base/auto_reset.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/memory_purger.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" diff --git a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc index 2635026..625ef25 100644 --- a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/gtk/zoom_bubble_gtk.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index 88e2955..d59920b 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc @@ -16,10 +16,10 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 1e1c3fc..5de37c2 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -9,6 +9,7 @@ #include "base/auto_reset.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -30,7 +31,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/predictors/autocomplete_action_predictor.h" #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_field_trial.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" diff --git a/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc b/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc index f03c91d..e3c9b55 100644 --- a/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc +++ b/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/balloon.h" @@ -9,7 +10,6 @@ #include "chrome/browser/notifications/balloon_notification_ui_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/panels/base_panel_browser_test.h" #include "chrome/browser/ui/panels/detached_panel_collection.h" diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index b8a26f1..47fb654 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/net/url_request_mock_util.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index b97b588..651f7b8 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" @@ -14,7 +15,6 @@ #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_metadata.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 5271675..b9da3e8 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -7,12 +7,12 @@ #include <string> #include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc index ead3aa8..16478f5 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc index 30d91e9..132ce86 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" +#include "base/prefs/pref_registry_simple.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc index 5a34dbe..e12288a 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc @@ -6,13 +6,13 @@ #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc index 8f0f5e0..e0bda62 100644 --- a/chrome/browser/ui/startup/default_browser_prompt.cc +++ b/chrome/browser/ui/startup/default_browser_prompt.cc @@ -7,11 +7,11 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/startup/default_browser_prompt_win.cc b/chrome/browser/ui/startup/default_browser_prompt_win.cc index d233351..f23e14d 100644 --- a/chrome/browser/ui/startup/default_browser_prompt_win.cc +++ b/chrome/browser/ui/startup/default_browser_prompt_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/startup/default_browser_prompt.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 9342df8..bdd7284 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -18,6 +18,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" @@ -36,7 +37,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 77e9056..f21d544 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -4,13 +4,13 @@ #include "base/command_line.h" #include "base/file_path.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 89e2a0c..193bd31 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -19,6 +19,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" @@ -38,7 +39,6 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/performance_monitor/startup_timer.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_io_data.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 3ace6dd..6db05b1 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -15,6 +15,7 @@ #include "base/compiler_specific.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/supports_user_data.h" @@ -24,7 +25,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" @@ -45,11 +45,11 @@ #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" -#include "chrome/common/one_click_signin_messages.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/net/url_util.h" +#include "chrome/common/one_click_signin_messages.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc index bfbda7d..c36b510 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index 6e3154c..e0fbfac 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc index b6307b7..40c9c11 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list_impl.h" diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc index 49ea142..2c406fc 100644 --- a/chrome/browser/ui/tabs/pinned_tab_codec.cc +++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/tabs/pinned_tab_codec.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/tabs/tab_strip_layout_type_prefs.cc b/chrome/browser/ui/tabs/tab_strip_layout_type_prefs.cc index da69e8d..4420790 100644 --- a/chrome/browser/ui/tabs/tab_strip_layout_type_prefs.cc +++ b/chrome/browser/ui/tabs/tab_strip_layout_type_prefs.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/ui/tabs/tab_strip_layout_type.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 2f57970..ff12684 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/favicon/favicon_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc index 5b40b6d..05d8761 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc index d8e6804..f71bf99 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index 5c4c475..4934114 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 8244e05..2b3d7aa 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -9,13 +9,13 @@ #include "base/command_line.h" #include "base/i18n/number_formatting.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_ui_util.h" diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc index 7876915..dc120bb 100644 --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc index 26e373b..9fb4418f 100644 --- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc +++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/time.h" #include "base/timer.h" #include "base/utf_string_conversions.h" @@ -19,7 +20,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/ui/views/avatar_menu_button.cc b/chrome/browser/ui/views/avatar_menu_button.cc index bd3cb1c..a7f83e2 100644 --- a/chrome/browser/ui/views/avatar_menu_button.cc +++ b/chrome/browser/ui/views/avatar_menu_button.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/avatar_menu_button.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/managed_mode/managed_mode.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/profiles/profile_metrics.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 114a07e..93bf11e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -12,6 +12,7 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -20,7 +21,6 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 1f271fb..abafb25 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -5,13 +5,13 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index bc38ad6..271a9b9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -5,13 +5,13 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index e94cd93..5c92278 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 3d2f048..df2a249 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index e440ecb..0d84413 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/views/browser_actions_container.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index c886e17..fe6776f 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -6,10 +6,10 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h" diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index 1db6e16..93bfc29 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/collected_cookies_views.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" @@ -16,7 +17,6 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" #include "chrome/browser/ui/views/constrained_window_views.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index ad8d8ce..d690e33 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -8,13 +8,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/history/select_favicon_frames.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index e923a43..da13514 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/critical_notification_bubble_view.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/pref_names.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/views/extensions/disabled_extensions_view.cc b/chrome/browser/ui/views/extensions/disabled_extensions_view.cc index 4784ac0..d333e3b 100644 --- a/chrome/browser/ui/views/extensions/disabled_extensions_view.cc +++ b/chrome/browser/ui/views/extensions/disabled_extensions_view.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/views/extensions/disabled_extensions_view.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/singleton_tabs.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 552df0f..e30aba9 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -22,7 +23,6 @@ #include "chrome/browser/managed_mode/managed_mode.h" #include "chrome/browser/native_window_notification_source.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index b154846..bda5866 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/views/avatar_menu_button.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index a05c927..55df8ed 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/views/avatar_menu_button.h" #include "chrome/browser/ui/views/frame/browser_frame.h" diff --git a/chrome/browser/ui/views/home_button.cc b/chrome/browser/ui/views/home_button.cc index 501bd1e..d2f2610 100644 --- a/chrome/browser/ui/views/home_button.cc +++ b/chrome/browser/ui/views/home_button.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/home_button.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 524d5b0..cb8ae20 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -19,7 +20,6 @@ #include "chrome/browser/extensions/script_bubble_controller.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc index ab9d9d7..57681d7 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/network_profile_bubble_view.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/network_profile_bubble.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index f8b5593..d994584 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -6,10 +6,10 @@ #include "base/auto_reset.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 773fd98..b9e733d 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -7,11 +7,11 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/metrics/stats_table.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/memory_purger.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index d9d7f8c..b74a9b5 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "base/i18n/number_formatting.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc index 86995cf..cf8c1f3 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc @@ -8,6 +8,7 @@ #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/time.h" @@ -19,7 +20,6 @@ #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 8aa5eef..00a40a0 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -8,11 +8,11 @@ #include "base/command_line.h" #include "base/location.h" #include "base/message_loop_proxy.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/about_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 1c5fe67..781c981 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -11,6 +11,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/drive/drive.pb.h" @@ -27,7 +28,6 @@ #include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/google_apis/time_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 89ba5f0..e0b10bf 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -8,12 +8,12 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc index 5102b2a..fac1fbf 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chromeos/dbus/dbus_thread_manager.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index cd0b3b5..f5cdc76 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -32,7 +33,6 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 73a0bff..706cc946 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -10,11 +10,11 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted_memory.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/crash_upload_list.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index e6c981e..0bfa286 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -5,9 +5,9 @@ #include "base/auto_reset.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/history/download_row.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/downloads_dom_handler.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 5416b3e..323a36b 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/file_util.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -33,7 +34,6 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/managed_mode/managed_mode.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc index 9199d8e..1198342 100644 --- a/chrome/browser/ui/webui/feedback_ui.cc +++ b/chrome/browser/ui/webui/feedback_ui.cc @@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" @@ -22,7 +23,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/feedback/feedback_data.h" #include "chrome/browser/feedback/feedback_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_manager.h" diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index cb212ac..cb7467e 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -9,12 +9,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h" +#include "base/prefs/pref_registry_simple.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/gesture_config_ui.cc b/chrome/browser/ui/webui/gesture_config_ui.cc index 6589f33..2446e37 100644 --- a/chrome/browser/ui/webui/gesture_config_ui.cc +++ b/chrome/browser/ui/webui/gesture_config_ui.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/webui/gesture_config_ui.h" -#include "base/values.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" +#include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 4823c82..9f5dce9 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -40,10 +40,10 @@ #if defined(OS_CHROMEOS) #include "base/files/file_util_proxy.h" #include "base/i18n/time_formatting.h" +#include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #endif diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc index 05e6c8b..8a60920 100644 --- a/chrome/browser/ui/webui/instant_ui.cc +++ b/chrome/browser/ui/webui/instant_ui.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/instant_ui.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/time.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/webui/ntp/android/promo_handler.cc b/chrome/browser/ui/webui/ntp/android/promo_handler.cc index 535e4f5..7ed576a 100644 --- a/chrome/browser/ui/webui/ntp/android/promo_handler.cc +++ b/chrome/browser/ui/webui/ntp/android/promo_handler.cc @@ -7,12 +7,12 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/android/intent_helper.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_manager.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index a2fd36c..a06eab3 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -12,6 +12,7 @@ #include "base/i18n/rtl.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/app_notification.h" @@ -24,7 +25,6 @@ #include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index 7c5624b..d924246 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -12,11 +12,11 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_restore.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 7a54256..305613b 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" @@ -21,7 +22,6 @@ #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/favicon_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 70b72a8..31f18cb 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -8,9 +8,9 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/extensions/app_launcher.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index b4b62ed..6c6bf36 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -8,12 +8,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 47d1a76..0808c47 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -15,13 +15,13 @@ #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/app_launcher.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index ab788a1..7062aad3 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -10,12 +10,12 @@ #include "base/bind_helpers.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_notifier.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 277b44de..3718bf3 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/memory/ref_counted_memory.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -20,7 +21,6 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index ed4503e..042191f 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/memory/singleton.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/utf_string_conversions.h" @@ -26,7 +27,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/policy/user_cloud_policy_manager.h" #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index e924ef7..f906915 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc @@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -17,7 +18,6 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" #include "content/public/browser/web_ui.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc index eb793c7..d3b9621 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc @@ -7,13 +7,13 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 744d7f6..04cee71 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -21,15 +22,14 @@ #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/extension_set.h" +#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index c307a11..ea32445 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -9,10 +9,10 @@ #include <string> #include "base/callback.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" #include "chrome/browser/plugins/plugin_status_pref_setter.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace options { diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index f415f60..61f1524 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -10,12 +10,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/options/font_settings_utils.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm index bf505b3..aadef16 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm +++ b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm @@ -7,9 +7,9 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsautorelease_pool.h" +#include "base/prefs/pref_service.h" #include "base/sys_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" namespace options { diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index b40ab9a..adbf8c8 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index 020cd99..5585424 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc @@ -13,11 +13,11 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/rtl.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc index 0ce87c5..af94af1 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc @@ -12,11 +12,11 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_service.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index 623ae96..b19cb7e 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/gaia_info_update_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc index 7be608d..8858191 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" #include "base/bind.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/options/media_galleries_handler.cc b/chrome/browser/ui/webui/options/media_galleries_handler.cc index 2ad7c46..73da395 100644 --- a/chrome/browser/ui/webui/options/media_galleries_handler.cc +++ b/chrome/browser/ui/webui/options/media_galleries_handler.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/options/media_galleries_handler.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media_gallery/media_file_system_registry.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index 1f5911c..506d330 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/options/password_manager_handler.h" #include "base/bind.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/password_manager/password_store_factory.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index fe0841a..e118056 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h @@ -10,10 +10,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_types.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/notification_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index c3f1998..c0b208e 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" @@ -13,7 +14,6 @@ #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/custom_home_pages_table_model.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 28f75f4..2f34c8c 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -24,7 +25,6 @@ #include "chrome/browser/plugins/plugin_metadata.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 2102114..397c10e 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -19,13 +19,13 @@ #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" #include "chrome/browser/printing/print_dialog_cloud.h" #include "chrome/browser/printing/print_error_dialog.h" @@ -50,8 +50,8 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "printing/backend/print_backend.h" #include "printing/metafile.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index d4504c0..b85f9fc 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/memory/ref_counted_memory.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/printing/print_preview_test.h" #include "chrome/browser/printing/print_view_manager.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index a5a3ce8..1203db6 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/file_path.h" +#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index d72ead5..53284cc 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -12,12 +12,12 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/string16.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index 9a53766..1177485 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc @@ -8,10 +8,10 @@ #include "base/bind_helpers.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_service.h" #include "base/win/win_util.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc index a86edec..3da029f 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc index 761d72d..9e3e4f7 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_service.h" #include "base/time.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc index c0ddd03..4c0920d 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "base/command_line.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" @@ -13,7 +14,6 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 2d8b3fe..c2e7d98 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -12,6 +12,7 @@ #include "base/i18n/time_formatting.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" @@ -21,7 +22,6 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_metrics.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc index 5ad9690..abea6a3 100644 --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc @@ -10,9 +10,9 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_manager_fake.h" @@ -27,8 +27,8 @@ #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/layout.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/layout.h" using ::testing::_; using ::testing::Mock; diff --git a/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc index e7a95da..91651a5 100644 --- a/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc @@ -11,11 +11,11 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 4903e5d..d4c1682 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_service.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/common/url_constants.h" -#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" +#include "chrome/test/base/testing_profile.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index 22319cd..da1f2d4 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc @@ -4,18 +4,18 @@ #include "chrome/browser/ui/window_sizer/window_sizer.h" -#include "base/compiler_specific.h" #include "base/command_line.h" +#include "base/compiler_specific.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_window_state.h" -#include "chrome/common/pref_names.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/pref_names.h" #include "ui/gfx/screen.h" // Minimum height of the visible part of a window. diff --git a/chrome/browser/ui/window_snapshot/window_snapshot.cc b/chrome/browser/ui/window_snapshot/window_snapshot.cc index b7206de..889d97d 100644 --- a/chrome/browser/ui/window_snapshot/window_snapshot.cc +++ b/chrome/browser/ui/window_snapshot/window_snapshot.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/window_snapshot/window_snapshot.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "ui/snapshot/snapshot.h" diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc index 4b9c041..237509e 100644 --- a/chrome/browser/ui/zoom/zoom_controller.cc +++ b/chrome/browser/ui/zoom/zoom_controller.cc @@ -4,16 +4,16 @@ #include "chrome/browser/ui/zoom/zoom_controller.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/navigation_entry.h" -#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_zoom.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc index f96cfb7..1d85c7e 100644 --- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc +++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "chrome/browser/prefs/pref_service.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/zoom/zoom_controller.h" diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index 0f6d8e1..6f172f1 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/prefs/pref_registry_simple.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/ui/browser_otr_state.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index d772d13..a6dc074 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -8,6 +8,8 @@ #include <vector> #include "base/bind.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" @@ -16,9 +18,7 @@ #include "base/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/web_resource/plugins_resource_service.cc b/chrome/browser/web_resource/plugins_resource_service.cc index e6df0fd..780e1e1 100644 --- a/chrome/browser/web_resource/plugins_resource_service.cc +++ b/chrome/browser/web_resource/plugins_resource_service.cc @@ -5,9 +5,9 @@ #include "chrome/browser/web_resource/plugins_resource_service.h" #include "base/command_line.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "chrome/browser/plugins/plugin_finder.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index e9f7bb3..b6a3153 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_registry_simple.h" #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 65b0f2c..8638fc24 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -7,6 +7,7 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" @@ -14,7 +15,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index c37f1cd..687f745 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" @@ -13,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/prefs/pref_service.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" |