Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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: http://src.chromium.org/svn/trunk/src/chrome/browser@181707 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 9030b734f1207f071ec8fce6a1d6371312a9d4b1 1 parent 075ad83
joi@chromium.org authored
Showing with 339 additions and 3,085 deletions.
  1. +1 −1  about_flags.cc
  2. +1 −1  about_flags_unittest.cc
  3. +1 −1  app_controller_mac.mm
  4. +1 −1  autocomplete/autocomplete_provider.cc
  5. +1 −1  autocomplete/bookmark_provider.cc
  6. +1 −1  autocomplete/history_quick_provider.cc
  7. +1 −1  autocomplete/history_quick_provider_unittest.cc
  8. +1 −1  autocomplete/history_url_provider.cc
  9. +1 −1  autocomplete/search_provider.cc
  10. +1 −1  autocomplete/search_provider_unittest.cc
  11. +1 −1  autocomplete/shortcuts_provider.cc
  12. +1 −1  autocomplete/shortcuts_provider_unittest.cc
  13. +1 −1  autocomplete/zero_suggest_provider.cc
  14. +1 −1  autofill/autofill_manager.cc
  15. +1 −1  autofill/risk/fingerprint.cc
  16. +1 −1  autofill/risk/fingerprint_browsertest.cc
  17. +1 −1  automation/automation_provider.cc
  18. +1 −1  automation/testing_automation_provider.cc
  19. +1 −1  automation/testing_automation_provider_chromeos.cc
  20. +2 −2 background/background_contents_service.cc
  21. +1 −1  background/background_contents_service_factory.cc
  22. +1 −1  background/background_contents_service_unittest.cc
  23. +2 −2 background/background_mode_manager.cc
  24. +1 −1  background/background_mode_manager_mac.mm
  25. +1 −1  bookmarks/bookmark_prompt_prefs.cc
  26. +1 −1  bookmarks/bookmark_utils.cc
  27. +1 −1  browser_encoding_browsertest.cc
  28. +2 −2 browser_process_impl.cc
  29. +2 −2 browser_shutdown.cc
  30. +1 −1  browsing_data/browsing_data_remover_browsertest.cc
  31. +1 −1  browsing_data/cookies_tree_model_unittest.cc
  32. +1 −1  captive_portal/captive_portal_browsertest.cc
  33. +1 −1  captive_portal/captive_portal_service.cc
  34. +1 −1  captive_portal/captive_portal_service_unittest.cc
  35. +3 −3 chrome_browser_main.cc
  36. +1 −1  chrome_browser_main_linux.cc
  37. +1 −1  chrome_content_browser_client.cc
  38. +1 −1  chrome_page_zoom.cc
  39. +1 −1  chrome_quota_permission_context.cc
  40. +1 −1  chrome_to_mobile_service.cc
  41. +2 −2 chrome_to_mobile_service_unittest.cc
  42. +1 −1  chromeos/accessibility/accessibility_util.cc
  43. +1 −1  chromeos/accessibility/magnification_manager.cc
  44. +1 −1  chromeos/accessibility/magnification_manager_browsertest.cc
  45. +1 −1  chromeos/accessibility/magnification_manager_unittest.cc
  46. +2 −2 chromeos/audio/audio_handler.cc
  47. +1 −1  chromeos/chrome_browser_main_chromeos.cc
  48. +2 −2 chromeos/customization_document.cc
  49. +2 −2 chromeos/display/display_preferences.cc
  50. +1 −1  chromeos/drive/drive_file_system.cc
  51. +1 −1  chromeos/drive/drive_scheduler.cc
  52. +1 −1  chromeos/drive/drive_scheduler_unittest.cc
  53. +1 −1  chromeos/drive/drive_sync_client.cc
  54. +1 −1  chromeos/drive/drive_sync_client_unittest.cc
  55. +1 −1  chromeos/drive/drive_system_service.cc
  56. +1 −1  chromeos/drive/drive_system_service_browsertest.cc
  57. +1 −1  chromeos/drive/search_metadata_unittest.cc
  58. +1 −1  chromeos/extensions/file_browser_event_router.cc
  59. +1 −1  chromeos/extensions/file_browser_event_router_browsertest.cc
  60. +1 −1  chromeos/extensions/file_browser_private_api.h
  61. +1 −1  chromeos/extensions/file_browser_resource_throttle_browsertest.cc
  62. +1 −1  chromeos/input_method/input_method_delegate_impl.cc
  63. +1 −1  chromeos/input_method/input_method_persistence.cc
  64. +1 −1  chromeos/input_method/input_method_persistence_unittest.cc
  65. +1 −1  chromeos/language_preferences.cc
  66. +1 −1  chromeos/locale_change_guard.cc
  67. +1 −1  chromeos/login/base_login_display_host.cc
  68. +1 −1  chromeos/login/existing_user_controller.cc
  69. +1 −1  chromeos/login/language_switch_menu.cc
  70. +1 −1  chromeos/login/login_performer.cc
  71. +1 −1  chromeos/login/login_utils.cc
  72. +1 −1  chromeos/login/login_utils_browsertest.cc
  73. +1 −1  chromeos/login/oauth2_login_manager.cc
  74. +1 −1  chromeos/login/terms_of_service_screen.cc
  75. +1 −1  chromeos/login/user_image_manager_browsertest.cc
  76. +2 −2 chromeos/login/user_image_manager_impl.cc
  77. +2 −2 chromeos/login/user_manager_impl.cc
  78. +1 −1  chromeos/login/user_manager_unittest.cc
  79. +2 −2 chromeos/login/wallpaper_manager.cc
  80. +2 −2 chromeos/login/wizard_controller.cc
  81. +1 −1  chromeos/mobile/mobile_activator.cc
  82. +1 −1  chromeos/network_message_observer.cc
  83. +2 −2 chromeos/power/session_length_limiter.cc
  84. +1 −1  chromeos/power/suspend_observer.cc
  85. +2 −2 chromeos/proxy_config_service_impl.cc
  86. +2 −2 chromeos/settings/device_settings_cache.cc
  87. +1 −1  chromeos/settings/device_settings_provider.cc
  88. +2 −2 chromeos/status/data_promo_notification.cc
  89. +1 −1  chromeos/system/ash_system_tray_delegate.cc
  90. +1 −1  chromeos/system/tray_accessibility_browsertest.cc
  91. +2 −2 component_updater/recovery_component_installer.cc
  92. +1 −1  content_settings/content_settings_default_provider.cc
  93. +1 −1  content_settings/content_settings_default_provider_unittest.cc
  94. +1 −1  content_settings/content_settings_policy_provider.cc
  95. +1 −1  content_settings/content_settings_policy_provider_unittest.cc
  96. +1 −1  content_settings/content_settings_pref_provider.cc
  97. +1 −1  content_settings/content_settings_pref_provider_unittest.cc
  98. +1 −1  content_settings/cookie_settings.cc
  99. +1 −1  content_settings/cookie_settings_unittest.cc
  100. +1 −1  content_settings/host_content_settings_map.cc
  101. +1 −1  content_settings/host_content_settings_map_unittest.cc
  102. +1 −1  custom_handlers/protocol_handler_registry.cc
  103. +1 −1  custom_home_pages_table_model.cc
  104. +1 −1  devtools/devtools_file_helper.cc
  105. +1 −1  do_not_track_browsertest.cc
  106. +1 −1  download/chrome_download_manager_delegate.cc
  107. +1 −1  download/chrome_download_manager_delegate_unittest.cc
  108. +1 −1  download/download_browsertest.cc
  109. +1 −1  download/download_prefs.cc
  110. +1 −1  download/save_package_file_picker.cc
  111. +1 −1  download/save_page_browsertest.cc
  112. +1 −1  extensions/api/browsing_data/browsing_data_test.cc
  113. +1 −1  extensions/api/content_settings/content_settings_api.cc
  114. +1 −1  extensions/api/content_settings/content_settings_apitest.cc
  115. +1 −1  extensions/api/downloads/downloads_api_unittest.cc
  116. +1 −1  extensions/api/font_settings/font_settings_api.cc
  117. +1 −1  extensions/api/font_settings/font_settings_api.h
  118. +1 −1  extensions/api/font_settings/font_settings_apitest.cc
  119. +1 −1  extensions/api/i18n/i18n_api.cc
  120. +1 −1  extensions/api/managed_mode/managed_mode_api.cc
  121. +1 −1  extensions/api/management/management_browsertest.cc
  122. +1 −1  extensions/api/preference/preference_api.cc
  123. +1 −1  extensions/api/preference/preference_apitest.cc
  124. +1 −1  extensions/api/preference/preference_helpers.cc
  125. +1 −1  extensions/api/proxy/proxy_apitest.cc
  126. +1 −1  extensions/api/tabs/tabs_api.cc
  127. +1 −1  extensions/api/tabs/tabs_test.cc
  128. +1 −1  extensions/api/webstore_private/webstore_private_api.cc
  129. +2 −2 extensions/app_launcher.cc
  130. +1 −1  extensions/app_notify_channel_setup.cc
  131. +1 −1  extensions/blacklist.cc
  132. +1 −1  extensions/component_loader.cc
  133. +1 −1  extensions/component_loader_unittest.cc
  134. +1 −1  extensions/default_apps.cc
  135. +1 −1  extensions/default_apps_unittest.cc
  136. +1 −1  extensions/extension_context_menu_model.cc
  137. +1 −1  extensions/extension_install_prompt.cc
  138. +1 −1  extensions/extension_nacl_browsertest.cc
  139. +1 −1  extensions/extension_override_apitest.cc
  140. +1 −1  extensions/extension_prefs.cc
  141. +1 −1  extensions/extension_prefs_unittest.cc
  142. +1 −1  extensions/extension_service.cc
  143. +1 −1  extensions/extension_sorting.cc
  144. +1 −1  extensions/extension_system.cc
  145. +1 −1  extensions/extension_tabs_apitest.cc
  146. +1 −1  extensions/extension_toolbar_model.cc
  147. +1 −1  extensions/extension_web_ui.cc
  148. +1 −1  extensions/external_policy_loader.cc
  149. +1 −1  extensions/menu_manager_unittest.cc
  150. +1 −1  extensions/platform_app_browsertest.cc
  151. +1 −1  extensions/plugin_apitest.cc
  152. +1 −1  extensions/shell_window_geometry_cache_unittest.cc
  153. +1 −1  extensions/standard_management_policy_provider.cc
  154. +1 −1  extensions/system/system_api.cc
  155. +1 −1  extensions/system/system_apitest.cc
  156. +1 −1  extensions/test_extension_prefs.cc
  157. +1 −1  extensions/test_extension_system.cc
  158. +1 −1  extensions/updater/extension_updater.cc
  159. +2 −2 external_protocol/external_protocol_handler.cc
  160. +1 −1  favicon/favicon_service_factory.cc
  161. +2 −2 first_run/first_run.cc
  162. +1 −1  first_run/first_run_browsertest.cc
  163. +1 −1  first_run/first_run_posix.cc
  164. +1 −1  first_run/first_run_win.cc
  165. +2 −2 geolocation/chrome_access_token_store.cc
  166. +1 −1  geolocation/chrome_geolocation_permission_context_android.cc
  167. +1 −1  geolocation/chrome_geolocation_permission_context_factory.h
  168. +2 −2 geolocation/chrome_geolocation_permission_context_unittest.cc
  169. +1 −1  geolocation/geolocation_infobar_queue_controller.cc
  170. +1 −1  geolocation/geolocation_settings_state.cc
  171. +1 −1  google/google_url_tracker.cc
  172. +1 −1  google/google_url_tracker_factory.cc
  173. +1 −1  google/google_url_tracker_unittest.cc
  174. +1 −1  google/google_util_chromeos.cc
  175. +2 −2 gpu/gl_string_manager.cc
  176. +1 −1  history/history_browsertest.cc
  177. +1 −1  history/history_service.cc
  178. +1 −1  history/history_service_factory.cc
  179. +1 −1  history/shortcuts_backend_factory.cc
  180. +1 −1  history/top_sites.cc
  181. +1 −1  importer/importer_host.cc
  182. +1 −1  importer/profile_writer.cc
  183. +1 −1  instant/instant_test_utils.cc
  184. +2 −2 intranet_redirect_detector.cc
  185. +2 −2 io_thread.cc
  186. +1 −1  lifetime/application_lifetime.cc
  187. +1 −1  lifetime/application_lifetime_android.cc
  188. +2 −2 managed_mode/managed_mode.cc
  189. +1 −1  managed_mode/managed_mode_browsertest.cc
  190. +1 −1  managed_mode/managed_mode_interstitial.cc
  191. +1 −1  managed_mode/managed_mode_navigation_observer.cc
  192. +1 −1  managed_mode/managed_user_service.cc
  193. +1 −1  managed_mode/managed_user_service_unittest.cc
  194. +1 −1  media/media_capture_devices_dispatcher.cc
  195. +1 −1  media/media_stream_devices_controller.cc
  196. +1 −1  media_gallery/media_file_system_registry.cc
  197. +1 −1  media_gallery/media_galleries_preferences.cc
  198. +2 −2 metrics/metrics_log.cc
  199. +1 −1  metrics/metrics_log_serializer.cc
  200. +1 −1  metrics/metrics_log_unittest.cc
  201. +2 −2 metrics/metrics_service.cc
  202. +1 −1  metrics/metrics_service_browsertest.cc
  203. +2 −2 metrics/variations/variations_service.cc
  204. +1 −1  net/chrome_http_user_agent_settings.cc
  205. +1 −1  net/chrome_network_delegate.cc
  206. +1 −1  net/cookie_policy_browsertest.cc
  207. +1 −1  net/http_server_properties_manager.cc
  208. +1 −1  net/http_server_properties_manager_unittest.cc
  209. +1 −1  net/net_error_tab_helper.cc
  210. +1 −1  net/net_pref_observer.cc
  211. +1 −1  net/predictor.cc
  212. +1 −1  net/predictor_browsertest.cc
  213. +2 −2 net/pref_proxy_config_tracker_impl.cc
  214. +1 −1  net/pref_proxy_config_tracker_impl_unittest.cc
  215. +2 −2 net/ssl_config_service_manager_pref.cc
  216. +1 −1  net/ssl_config_service_manager_pref_unittest.cc
  217. +1 −1  notifications/balloon_notification_ui_manager.cc
  218. +1 −1  notifications/message_center_notification_manager.cc
  219. +2 −2 notifications/notification_prefs_manager.cc
  220. +1 −1  notifications/notification_ui_manager_impl.cc
  221. +1 −1  omnibox_search_hint.cc
  222. +1 −1  password_manager/native_backend_gnome_x_unittest.cc
  223. +1 −1  password_manager/native_backend_kwallet_x_unittest.cc
  224. +1 −1  password_manager/password_manager.cc
  225. +1 −1  password_manager/password_store_default.cc
  226. +1 −1  password_manager/password_store_default_unittest.cc
  227. +1 −1  password_manager/password_store_factory.cc
  228. +1 −1  password_manager/password_store_win_unittest.cc
  229. +1 −1  password_manager/password_store_x.cc
  230. +1 −1  password_manager/password_store_x_unittest.cc
  231. +1 −1  pepper_broker_infobar_delegate.cc
  232. +1 −1  pepper_flash_settings_manager.cc
  233. +2 −2 plugins/plugin_finder.cc
  234. +1 −1  plugins/plugin_info_message_filter.cc
  235. +1 −1  plugins/plugin_prefs.h
  236. +1 −1  plugins/plugin_prefs_factory.cc
  237. +1 −1  plugins/plugin_status_pref_setter.cc
  238. +2 −2 policy/auto_enrollment_client.cc
  239. +1 −1  policy/auto_enrollment_client_unittest.cc
  240. +2 −2 policy/browser_policy_connector.cc
  241. +1 −1  policy/cloud_policy_browsertest.cc
  242. +1 −1  policy/cloud_policy_core.cc
  243. +1 −1  policy/cloud_policy_manager.cc
  244. +1 −1  policy/device_cloud_policy_manager_chromeos_unittest.cc
  245. +2 −2 policy/device_status_collector.cc
  246. +1 −1  policy/device_status_collector_browsertest.cc
  247. +1 −1  policy/policy_browsertest.cc
  248. +1 −1  policy/policy_prefs_browsertest.cc
  249. +2 −2 policy/policy_statistics_collector.cc
  250. +1 −1  policy/url_blacklist_manager.cc
  251. +1 −1  policy/url_blacklist_manager_unittest.cc
  252. +1 −1  policy/user_cloud_policy_manager_chromeos_unittest.cc
  253. +1 −1  policy/user_policy_signin_service.cc
  254. +1 −1  policy/user_policy_signin_service_factory.cc
  255. +1 −1  policy/user_policy_signin_service_unittest.cc
  256. +1 −1  predictors/resource_prefetch_common.cc
  257. +2 −2 prefs/browser_prefs.cc
  258. +4 −4 prefs/chrome_pref_service_factory.cc
  259. +1 −1  prefs/incognito_mode_prefs.cc
  260. +0 −25 prefs/mock_pref_change_callback.cc
  261. +0 −52 prefs/mock_pref_change_callback.h
  262. +1 −1  prefs/pref_model_associator.cc
  263. +0 −117 prefs/pref_notifier_impl.cc
  264. +0 −69 prefs/pref_notifier_impl.h
  265. +5 −5 prefs/pref_notifier_impl_unittest.cc
  266. +0 −64 prefs/pref_registry.cc
  267. +0 −73 prefs/pref_registry.h
  268. +0 −67 prefs/pref_registry_simple.cc
  269. +0 −43 prefs/pref_registry_simple.h
  270. +1 −1  prefs/pref_registry_syncable.h
  271. +0 −597 prefs/pref_service.cc
  272. +0 −259 prefs/pref_service.h
  273. +0 −103 prefs/pref_service_builder.cc
  274. +0 −71 prefs/pref_service_builder.h
  275. +0 −77 prefs/pref_service_simple.cc
  276. +3 −3 prefs/pref_service_syncable.cc
  277. +1 −1  prefs/pref_service_syncable.h
  278. +2 −2 prefs/pref_service_syncable_builder.cc
  279. +1 −1  prefs/pref_service_syncable_builder.h
  280. +3 −3 prefs/pref_service_unittest.cc
  281. +0 −276 prefs/pref_value_store.cc
  282. +0 −259 prefs/pref_value_store.h
  283. +0 −594 prefs/pref_value_store_unittest.cc
  284. +1 −1  prefs/scoped_user_pref_update.cc
  285. +1 −1  prefs/scoped_user_pref_update.h
  286. +1 −1  prefs/scoped_user_pref_update_unittest.cc
  287. +1 −1  prefs/session_startup_pref.cc
  288. +1 −1  prerender/prerender_browsertest.cc
  289. +1 −1  prerender/prerender_field_trial.cc
  290. +1 −1  prerender/prerender_manager.cc
  291. +1 −1  printing/cloud_print/cloud_print_proxy_service.cc
  292. +1 −1  printing/cloud_print/cloud_print_setup_flow.cc
  293. +1 −1  printing/cloud_print/cloud_print_url.cc
  294. +1 −1  printing/print_dialog_cloud.cc
  295. +1 −1  printing/print_preview_test.cc
  296. +1 −1  printing/print_view_manager.cc
  297. +1 −1  profiles/chrome_version_service.cc
  298. +1 −1  profiles/gaia_info_update_service.cc
  299. +3 −3 profiles/gaia_info_update_service_unittest.cc
  300. +2 −2 profiles/off_the_record_profile_impl_unittest.cc
Sorry, we could not display the entire diff because too many files (541) changed.
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
4 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"
View
2  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"
View
2  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"
View
4 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"
View
2  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"
View
2  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)
View
2  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"
View
2  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"
View
4 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"
View
4 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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
6 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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
4 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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
4 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"
View
2  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"
View
4 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"
View
4 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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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 {
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
4 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"
View
4 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"
View
2  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"
View
4 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"
View
4 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"
View
2  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"
View
2  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"
View