Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

base/prefs: Remove the public/ directory and move the files to //base…

…/prefs.

BUG=155525
R=joi@chromium.org
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/12789006

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser@189513 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 10924549f1c4c1191e02b613c064de06475f45c6 1 parent e0e26e2
authored March 21, 2013

Showing 131 changed files with 138 additions and 138 deletions. Show diff stats Hide diff stats

  1. 2  app_controller_mac.h
  2. 2  background/background_mode_manager.h
  3. 2  browser_process_impl.h
  4. 2  browsing_data/browsing_data_remover.h
  5. 2  captive_portal/captive_portal_service.h
  6. 2  chromeos/accessibility/magnification_manager.cc
  7. 2  chromeos/audio/audio_handler.h
  8. 2  chromeos/drive/drive_file_system.cc
  9. 2  chromeos/drive/drive_sync_client.cc
  10. 2  chromeos/extensions/file_browser_event_router.cc
  11. 2  chromeos/login/login_utils.cc
  12. 2  chromeos/power/session_length_limiter.h
  13. 2  chromeos/preferences.cc
  14. 2  chromeos/preferences.h
  15. 2  chromeos/preferences_unittest.cc
  16. 2  chromeos/proxy_config_service_impl.h
  17. 2  chromeos/system/automatic_reboot_manager.h
  18. 2  content_settings/content_settings_default_provider.h
  19. 2  content_settings/content_settings_policy_provider.h
  20. 2  content_settings/content_settings_pref_provider.h
  21. 2  content_settings/content_settings_pref_provider_unittest.cc
  22. 2  content_settings/cookie_settings.h
  23. 2  content_settings/host_content_settings_map.h
  24. 2  download/chrome_download_manager_delegate.cc
  25. 2  download/download_prefs.h
  26. 2  download/save_package_file_picker.cc
  27. 2  download/save_page_browsertest.cc
  28. 2  extensions/api/font_settings/font_settings_api.h
  29. 2  extensions/api/managed_mode_private/managed_mode_private_api.h
  30. 2  extensions/api/preference/preference_api.h
  31. 2  extensions/api/web_request/web_request_api_unittest.cc
  32. 2  extensions/component_loader.cc
  33. 2  extensions/component_loader.h
  34. 2  extensions/extension_prefs_unittest.cc
  35. 2  extensions/extension_service.h
  36. 2  extensions/external_policy_loader.h
  37. 2  extensions/install_tracker.h
  38. 2  gpu/gpu_mode_manager.h
  39. 2  io_thread.h
  40. 2  managed_mode/managed_mode.cc
  41. 2  managed_mode/managed_user_service.h
  42. 2  media_galleries/media_file_system_registry.h
  43. 2  net/chrome_http_user_agent_settings.h
  44. 2  net/chrome_network_delegate.cc
  45. 2  net/chrome_network_delegate_unittest.cc
  46. 2  net/http_server_properties_manager.h
  47. 2  net/net_error_tab_helper.h
  48. 2  net/net_pref_observer.h
  49. 2  net/pref_proxy_config_tracker_impl.h
  50. 4  net/ssl_config_service_manager_pref.cc
  51. 2  notifications/balloon_notification_ui_manager.h
  52. 2  notifications/desktop_notification_service.h
  53. 2  notifications/notification_ui_manager_impl.h
  54. 2  password_manager/password_manager.h
  55. 2  plugins/plugin_info_message_filter.h
  56. 2  plugins/plugin_prefs.h
  57. 2  plugins/plugin_status_pref_setter.h
  58. 2  policy/cloud/cloud_policy_core.h
  59. 2  policy/cloud/cloud_policy_manager.h
  60. 2  policy/url_blacklist_manager.h
  61. 2  prefs/scoped_user_pref_update_unittest.cc
  62. 2  printing/cloud_print/cloud_print_proxy_service.h
  63. 2  printing/print_view_manager.h
  64. 2  profiles/gaia_info_update_service.h
  65. 2  profiles/profile_impl.h
  66. 2  profiles/profile_impl_io_data.cc
  67. 2  profiles/profile_io_data.h
  68. 2  safe_browsing/safe_browsing_service.cc
  69. 2  safe_browsing/safe_browsing_tab_observer.h
  70. 2  search_engines/template_url_service.h
  71. 4  signin/signin_manager.h
  72. 2  speech/chrome_speech_recognition_preferences.h
  73. 2  spellchecker/spellcheck_service.cc
  74. 4  spellchecker/spellcheck_service.h
  75. 2  sync/glue/typed_url_data_type_controller.h
  76. 2  sync/sync_prefs.cc
  77. 2  sync/sync_prefs.h
  78. 2  sync/test/integration/sync_errors_test.cc
  79. 2  tab_contents/render_view_context_menu.cc
  80. 2  tab_contents/spellchecker_submenu_observer_hunspell.cc
  81. 2  tab_contents/spelling_menu_observer.h
  82. 2  translate/translate_manager.h
  83. 2  translate/translate_manager_browsertest.cc
  84. 2  ui/alternate_error_tab_observer.h
  85. 2  ui/ash/event_rewriter_unittest.cc
  86. 2  ui/ash/launcher/chrome_launcher_controller_per_app.h
  87. 2  ui/ash/launcher/chrome_launcher_controller_per_browser.h
  88. 2  ui/autofill/autofill_dialog_models.h
  89. 4  ui/browser.h
  90. 4  ui/browser_command_controller.h
  91. 2  ui/browser_instant_controller.h
  92. 2  ui/cocoa/bookmarks/bookmark_bar_bridge.h
  93. 2  ui/cocoa/extensions/extension_action_context_menu.mm
  94. 2  ui/cocoa/location_bar/location_bar_view_mac.h
  95. 2  ui/cocoa/toolbar/toolbar_controller.h
  96. 2  ui/gesture_prefs_observer_factory_aura.cc
  97. 2  ui/gtk/bookmarks/bookmark_bar_gtk.h
  98. 2  ui/gtk/browser_titlebar.h
  99. 2  ui/gtk/browser_toolbar_gtk.h
  100. 2  ui/gtk/browser_window_gtk.h
  101. 2  ui/gtk/global_menu_bar.h
  102. 2  ui/gtk/gtk_theme_service.h
  103. 2  ui/gtk/location_bar_view_gtk.h
  104. 2  ui/prefs/prefs_tab_helper.h
  105. 2  ui/views/bookmarks/bookmark_bar_view.h
  106. 2  ui/views/location_bar/location_bar_view.h
  107. 2  ui/views/tabs/browser_tab_strip_controller.h
  108. 2  ui/views/toolbar_view.h
  109. 2  ui/webui/extensions/extension_settings_handler.h
  110. 2  ui/webui/net_internals/net_internals_ui.cc
  111. 2  ui/webui/ntp/app_launcher_handler.h
  112. 2  ui/webui/ntp/new_tab_page_sync_handler.h
  113. 2  ui/webui/ntp/new_tab_ui.h
  114. 2  ui/webui/ntp/ntp_login_handler.h
  115. 2  ui/webui/ntp/ntp_resource_cache.h
  116. 4  ui/webui/options/browser_options_handler.h
  117. 2  ui/webui/options/chromeos/core_chromeos_options_handler.cc
  118. 2  ui/webui/options/chromeos/core_chromeos_options_handler.h
  119. 2  ui/webui/options/chromeos/keyboard_handler.h
  120. 2  ui/webui/options/chromeos/pointer_handler.h
  121. 2  ui/webui/options/clear_browser_data_handler.h
  122. 2  ui/webui/options/content_settings_handler.h
  123. 2  ui/webui/options/core_options_handler.h
  124. 2  ui/webui/options/font_settings_handler.h
  125. 2  ui/webui/options/managed_user_settings_handler.h
  126. 2  ui/webui/options/media_galleries_handler.h
  127. 2  ui/webui/options/password_manager_handler.h
  128. 2  ui/webui/options/preferences_browsertest.h
  129. 4  ui/webui/options/startup_pages_handler.h
  130. 2  ui/webui/plugins_ui.cc
  131. 2  ui/zoom/zoom_controller.h
2  app_controller_mac.h
@@ -13,7 +13,7 @@
13 13
 #include "base/memory/scoped_nsobject.h"
14 14
 #include "base/memory/scoped_ptr.h"
15 15
 #include "base/observer_list.h"
16  
-#include "base/prefs/public/pref_change_registrar.h"
  16
+#include "base/prefs/pref_change_registrar.h"
17 17
 #include "ui/base/work_area_watcher_observer.h"
18 18
 
19 19
 class BookmarkMenuBridge;
2  background/background_mode_manager.h
@@ -8,7 +8,7 @@
8 8
 #include <map>
9 9
 
10 10
 #include "base/gtest_prod_util.h"
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "chrome/browser/background/background_application_list_model.h"
13 13
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
14 14
 #include "chrome/browser/profiles/profile_keyed_service.h"
2  browser_process_impl.h
@@ -16,7 +16,7 @@
16 16
 #include "base/debug/stack_trace.h"
17 17
 #include "base/memory/ref_counted.h"
18 18
 #include "base/memory/scoped_ptr.h"
19  
-#include "base/prefs/public/pref_change_registrar.h"
  19
+#include "base/prefs/pref_change_registrar.h"
20 20
 #include "base/threading/non_thread_safe.h"
21 21
 #include "base/timer.h"
22 22
 #include "chrome/browser/browser_process.h"
2  browsing_data/browsing_data_remover.h
@@ -10,7 +10,7 @@
10 10
 #include "base/gtest_prod_util.h"
11 11
 #include "base/memory/ref_counted.h"
12 12
 #include "base/observer_list.h"
13  
-#include "base/prefs/public/pref_member.h"
  13
+#include "base/prefs/pref_member.h"
14 14
 #include "base/sequenced_task_runner_helpers.h"
15 15
 #include "base/synchronization/waitable_event_watcher.h"
16 16
 #include "base/time.h"
2  captive_portal/captive_portal_service.h
@@ -7,7 +7,7 @@
7 7
 
8 8
 #include "base/basictypes.h"
9 9
 #include "base/memory/scoped_ptr.h"
10  
-#include "base/prefs/public/pref_member.h"
  10
+#include "base/prefs/pref_member.h"
11 11
 #include "base/threading/non_thread_safe.h"
12 12
 #include "base/time.h"
13 13
 #include "base/timer.h"
2  chromeos/accessibility/magnification_manager.cc
@@ -10,8 +10,8 @@
10 10
 #include "ash/system/tray/system_tray_notifier.h"
11 11
 #include "base/memory/scoped_ptr.h"
12 12
 #include "base/memory/singleton.h"
  13
+#include "base/prefs/pref_member.h"
13 14
 #include "base/prefs/pref_service.h"
14  
-#include "base/prefs/public/pref_member.h"
15 15
 #include "chrome/browser/chromeos/login/user_manager.h"
16 16
 #include "chrome/browser/profiles/profile.h"
17 17
 #include "chrome/browser/profiles/profile_manager.h"
2  chromeos/audio/audio_handler.h
@@ -8,7 +8,7 @@
8 8
 #include "base/basictypes.h"
9 9
 #include "base/memory/scoped_ptr.h"
10 10
 #include "base/observer_list.h"
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "base/threading/thread.h"
13 13
 
14 14
 template <typename T> struct DefaultSingletonTraits;
2  chromeos/drive/drive_file_system.cc
@@ -10,8 +10,8 @@
10 10
 #include "base/message_loop_proxy.h"
11 11
 #include "base/metrics/histogram.h"
12 12
 #include "base/platform_file.h"
  13
+#include "base/prefs/pref_change_registrar.h"
13 14
 #include "base/prefs/pref_service.h"
14  
-#include "base/prefs/public/pref_change_registrar.h"
15 15
 #include "base/stringprintf.h"
16 16
 #include "base/threading/sequenced_worker_pool.h"
17 17
 #include "base/values.h"
2  chromeos/drive/drive_sync_client.cc
@@ -9,8 +9,8 @@
9 9
 
10 10
 #include "base/bind.h"
11 11
 #include "base/message_loop_proxy.h"
  12
+#include "base/prefs/pref_change_registrar.h"
12 13
 #include "base/prefs/pref_service.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
14 14
 #include "chrome/browser/chromeos/drive/drive.pb.h"
15 15
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
16 16
 #include "chrome/browser/profiles/profile.h"
2  chromeos/extensions/file_browser_event_router.cc
@@ -8,8 +8,8 @@
8 8
 #include "base/file_util.h"
9 9
 #include "base/json/json_writer.h"
10 10
 #include "base/message_loop.h"
  11
+#include "base/prefs/pref_change_registrar.h"
11 12
 #include "base/prefs/pref_service.h"
12  
-#include "base/prefs/public/pref_change_registrar.h"
13 13
 #include "base/stl_util.h"
14 14
 #include "base/values.h"
15 15
 #include "chrome/browser/chromeos/drive/drive_cache.h"
2  chromeos/login/login_utils.cc
@@ -17,9 +17,9 @@
17 17
 #include "base/memory/scoped_ptr.h"
18 18
 #include "base/memory/singleton.h"
19 19
 #include "base/path_service.h"
  20
+#include "base/prefs/pref_member.h"
20 21
 #include "base/prefs/pref_registry_simple.h"
21 22
 #include "base/prefs/pref_service.h"
22  
-#include "base/prefs/public/pref_member.h"
23 23
 #include "base/string_util.h"
24 24
 #include "base/synchronization/lock.h"
25 25
 #include "base/task_runner_util.h"
2  chromeos/power/session_length_limiter.h
@@ -7,7 +7,7 @@
7 7
 
8 8
 #include "base/basictypes.h"
9 9
 #include "base/memory/scoped_ptr.h"
10  
-#include "base/prefs/public/pref_change_registrar.h"
  10
+#include "base/prefs/pref_change_registrar.h"
11 11
 #include "base/threading/thread_checker.h"
12 12
 #include "base/time.h"
13 13
 #include "base/timer.h"
2  chromeos/preferences.cc
@@ -9,8 +9,8 @@
9 9
 #include "base/command_line.h"
10 10
 #include "base/i18n/time_formatting.h"
11 11
 #include "base/metrics/histogram.h"
  12
+#include "base/prefs/pref_member.h"
12 13
 #include "base/prefs/pref_registry_simple.h"
13  
-#include "base/prefs/public/pref_member.h"
14 14
 #include "base/string_util.h"
15 15
 #include "base/strings/string_split.h"
16 16
 #include "base/utf_string_conversions.h"
2  chromeos/preferences.h
@@ -9,7 +9,7 @@
9 9
 #include <vector>
10 10
 
11 11
 #include "base/compiler_specific.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "chrome/browser/chromeos/language_preferences.h"
14 14
 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
15 15
 
2  chromeos/preferences_unittest.cc
@@ -4,7 +4,7 @@
4 4
 
5 5
 #include "chrome/browser/chromeos/preferences.h"
6 6
 
7  
-#include "base/prefs/public/pref_member.h"
  7
+#include "base/prefs/pref_member.h"
8 8
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
9 9
 #include "chrome/browser/download/download_prefs.h"
10 10
 #include "chrome/common/pref_names.h"
2  chromeos/proxy_config_service_impl.h
@@ -9,7 +9,7 @@
9 9
 #include <vector>
10 10
 
11 11
 #include "base/basictypes.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "base/values.h"
14 14
 #include "chrome/browser/chromeos/cros/network_library.h"
15 15
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
2  chromeos/system/automatic_reboot_manager.h
@@ -10,7 +10,7 @@
10 10
 #include "base/compiler_specific.h"
11 11
 #include "base/memory/scoped_ptr.h"
12 12
 #include "base/memory/weak_ptr.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
  13
+#include "base/prefs/pref_change_registrar.h"
14 14
 #include "base/time.h"
15 15
 #include "base/timer.h"
16 16
 #include "chromeos/dbus/power_manager_client.h"
2  content_settings/content_settings_default_provider.h
@@ -11,7 +11,7 @@
11 11
 
12 12
 #include "base/basictypes.h"
13 13
 #include "base/memory/linked_ptr.h"
14  
-#include "base/prefs/public/pref_change_registrar.h"
  14
+#include "base/prefs/pref_change_registrar.h"
15 15
 #include "base/synchronization/lock.h"
16 16
 #include "chrome/browser/content_settings/content_settings_observable_provider.h"
17 17
 
2  content_settings/content_settings_policy_provider.h
@@ -10,7 +10,7 @@
10 10
 #include <vector>
11 11
 
12 12
 #include "base/basictypes.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
  13
+#include "base/prefs/pref_change_registrar.h"
14 14
 #include "base/synchronization/lock.h"
15 15
 #include "chrome/browser/content_settings/content_settings_observable_provider.h"
16 16
 #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
2  content_settings/content_settings_pref_provider.h
@@ -10,7 +10,7 @@
10 10
 #include <vector>
11 11
 
12 12
 #include "base/basictypes.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
  13
+#include "base/prefs/pref_change_registrar.h"
14 14
 #include "base/synchronization/lock.h"
15 15
 #include "chrome/browser/content_settings/content_settings_observable_provider.h"
16 16
 #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
2  content_settings/content_settings_pref_provider_unittest.cc
@@ -10,8 +10,8 @@
10 10
 #include "base/message_loop.h"
11 11
 #include "base/prefs/default_pref_store.h"
12 12
 #include "base/prefs/overlay_user_pref_store.h"
  13
+#include "base/prefs/pref_change_registrar.h"
13 14
 #include "base/prefs/pref_service.h"
14  
-#include "base/prefs/public/pref_change_registrar.h"
15 15
 #include "base/prefs/testing_pref_store.h"
16 16
 #include "base/threading/platform_thread.h"
17 17
 #include "base/values.h"
2  content_settings/cookie_settings.h
@@ -10,7 +10,7 @@
2  content_settings/host_content_settings_map.h
@@ -14,7 +14,7 @@
14 14
 
15 15
 #include "base/basictypes.h"
16 16
 #include "base/memory/ref_counted.h"
17  
-#include "base/prefs/public/pref_change_registrar.h"
  17
+#include "base/prefs/pref_change_registrar.h"
18 18
 #include "base/threading/platform_thread.h"
19 19
 #include "base/tuple.h"
20 20
 #include "chrome/browser/content_settings/content_settings_observer.h"
2  download/chrome_download_manager_delegate.cc
@@ -10,8 +10,8 @@
10 10
 #include "base/bind_helpers.h"
11 11
 #include "base/callback.h"
12 12
 #include "base/file_util.h"
  13
+#include "base/prefs/pref_member.h"
13 14
 #include "base/prefs/pref_service.h"
14  
-#include "base/prefs/public/pref_member.h"
15 15
 #include "base/rand_util.h"
16 16
 #include "base/stringprintf.h"
17 17
 #include "base/time.h"
2  download/download_prefs.h
@@ -8,7 +8,7 @@
8 8
 #include <set>
9 9
 
10 10
 #include "base/files/file_path.h"
11  
-#include "base/prefs/public/pref_member.h"
  11
+#include "base/prefs/pref_member.h"
12 12
 
13 13
 class PrefRegistrySyncable;
14 14
 class PrefService;
2  download/save_package_file_picker.cc
@@ -6,8 +6,8 @@
6 6
 
7 7
 #include "base/command_line.h"
8 8
 #include "base/metrics/histogram.h"
  9
+#include "base/prefs/pref_member.h"
9 10
 #include "base/prefs/pref_service.h"
10  
-#include "base/prefs/public/pref_member.h"
11 11
 #include "base/utf_string_conversions.h"
12 12
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
13 13
 #include "chrome/browser/download/download_prefs.h"
2  download/save_page_browsertest.cc
@@ -9,8 +9,8 @@
9 9
 #include "base/files/file_path.h"
10 10
 #include "base/files/scoped_temp_dir.h"
11 11
 #include "base/path_service.h"
  12
+#include "base/prefs/pref_member.h"
12 13
 #include "base/prefs/pref_service.h"
13  
-#include "base/prefs/public/pref_member.h"
14 14
 #include "base/test/test_file_util.h"
15 15
 #include "chrome/app/chrome_command_ids.h"
16 16
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
2  extensions/api/font_settings/font_settings_api.h
@@ -11,8 +11,8 @@
11 11
 #include <string>
12 12
 
13 13
 #include "base/memory/scoped_ptr.h"
  14
+#include "base/prefs/pref_change_registrar.h"
14 15
 #include "base/prefs/pref_service.h"
15  
-#include "base/prefs/public/pref_change_registrar.h"
16 16
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
17 17
 #include "chrome/browser/extensions/event_router.h"
18 18
 #include "chrome/browser/extensions/extension_function.h"
2  extensions/api/managed_mode_private/managed_mode_private_api.h
@@ -8,7 +8,7 @@
8 8
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_PRIVATE_API_H_
9 9
 #define CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_PRIVATE_API_H_
10 10
 
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
13 13
 #include "chrome/browser/extensions/event_router.h"
14 14
 #include "chrome/browser/extensions/extension_function.h"
2  extensions/api/preference/preference_api.h
@@ -7,7 +7,7 @@
7 7
 
8 8
 #include <string>
9 9
 
10  
-#include "base/prefs/public/pref_change_registrar.h"
  10
+#include "base/prefs/pref_change_registrar.h"
11 11
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
12 12
 #include "chrome/browser/extensions/event_router.h"
13 13
 #include "chrome/browser/extensions/extension_function.h"
2  extensions/api/web_request/web_request_api_unittest.cc
@@ -15,7 +15,7 @@
15 15
 #include "base/memory/weak_ptr.h"
16 16
 #include "base/message_loop.h"
17 17
 #include "base/path_service.h"
18  
-#include "base/prefs/public/pref_member.h"
  18
+#include "base/prefs/pref_member.h"
19 19
 #include "base/stl_util.h"
20 20
 #include "base/string_piece.h"
21 21
 #include "base/stringprintf.h"
2  extensions/component_loader.cc
@@ -8,9 +8,9 @@
8 8
 #include "base/file_util.h"
9 9
 #include "base/json/json_string_value_serializer.h"
10 10
 #include "base/path_service.h"
  11
+#include "base/prefs/pref_change_registrar.h"
11 12
 #include "base/prefs/pref_notifier.h"
12 13
 #include "base/prefs/pref_service.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
14 14
 #include "chrome/browser/defaults.h"
15 15
 #include "chrome/browser/extensions/extension_service.h"
16 16
 #include "chrome/browser/profiles/profile.h"
2  extensions/component_loader.h
@@ -10,7 +10,7 @@
10 10
 
11 11
 #include "base/files/file_path.h"
12 12
 #include "base/gtest_prod_util.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
  13
+#include "base/prefs/pref_change_registrar.h"
14 14
 #include "base/values.h"
15 15
 
16 16
 class ExtensionServiceInterface;
2  extensions/extension_prefs_unittest.cc
@@ -8,7 +8,7 @@
8 8
 #include "base/files/scoped_temp_dir.h"
9 9
 #include "base/path_service.h"
10 10
 #include "base/prefs/mock_pref_change_callback.h"
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "base/stl_util.h"
13 13
 #include "base/stringprintf.h"
14 14
 #include "base/strings/string_number_conversions.h"
2  extensions/extension_service.h
@@ -16,7 +16,7 @@
16 16
 #include "base/gtest_prod_util.h"
17 17
 #include "base/memory/ref_counted.h"
18 18
 #include "base/memory/weak_ptr.h"
19  
-#include "base/prefs/public/pref_change_registrar.h"
  19
+#include "base/prefs/pref_change_registrar.h"
20 20
 #include "base/string16.h"
21 21
 #include "chrome/browser/extensions/app_sync_bundle.h"
22 22
 #include "chrome/browser/extensions/blacklist.h"
2  extensions/external_policy_loader.h
@@ -8,7 +8,7 @@
8 8
 #include <string>
9 9
 
10 10
 #include "base/compiler_specific.h"
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "chrome/browser/extensions/external_loader.h"
13 13
 #include "content/public/browser/notification_observer.h"
14 14
 #include "content/public/browser/notification_registrar.h"
2  extensions/install_tracker.h
@@ -6,7 +6,7 @@
6 6
 #define CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_H_
7 7
 
8 8
 #include "base/observer_list.h"
9  
-#include "base/prefs/public/pref_change_registrar.h"
  9
+#include "base/prefs/pref_change_registrar.h"
10 10
 #include "chrome/browser/extensions/install_observer.h"
11 11
 #include "chrome/browser/profiles/profile_keyed_service.h"
12 12
 #include "content/public/browser/notification_observer.h"
2  gpu/gpu_mode_manager.h
@@ -5,7 +5,7 @@
5 5
 #ifndef CHROME_BROWSER_GPU_GPU_MODE_MANAGER_H_
6 6
 #define CHROME_BROWSER_GPU_GPU_MODE_MANAGER_H_
7 7
 
8  
-#include "base/prefs/public/pref_change_registrar.h"
  8
+#include "base/prefs/pref_change_registrar.h"
9 9
 
10 10
 class PrefRegistrySimple;
11 11
 
2  io_thread.h
@@ -12,7 +12,7 @@
12 12
 #include "base/memory/ref_counted.h"
13 13
 #include "base/memory/scoped_ptr.h"
14 14
 #include "base/memory/weak_ptr.h"
15  
-#include "base/prefs/public/pref_member.h"
  15
+#include "base/prefs/pref_member.h"
16 16
 #include "chrome/browser/net/ssl_config_service_manager.h"
17 17
 #include "content/public/browser/browser_thread.h"
18 18
 #include "content/public/browser/browser_thread_delegate.h"
2  managed_mode/managed_mode.cc
@@ -5,9 +5,9 @@
5 5
 #include "chrome/browser/managed_mode/managed_mode.h"
6 6
 
7 7
 #include "base/command_line.h"
  8
+#include "base/prefs/pref_change_registrar.h"
8 9
 #include "base/prefs/pref_registry_simple.h"
9 10
 #include "base/prefs/pref_service.h"
10  
-#include "base/prefs/public/pref_change_registrar.h"
11 11
 #include "base/sequenced_task_runner.h"
12 12
 #include "chrome/browser/browser_process.h"
13 13
 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
2  managed_mode/managed_user_service.h
@@ -8,7 +8,7 @@
8 8
 #include <set>
9 9
 #include <vector>
10 10
 
11  
-#include "base/prefs/public/pref_change_registrar.h"
  11
+#include "base/prefs/pref_change_registrar.h"
12 12
 #include "base/string16.h"
13 13
 #include "chrome/browser/extensions/management_policy.h"
14 14
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
2  media_galleries/media_file_system_registry.h
@@ -16,7 +16,7 @@
16 16
 #include "base/basictypes.h"
17 17
 #include "base/files/file_path.h"
18 18
 #include "base/memory/ref_counted.h"
19  
-#include "base/prefs/public/pref_change_registrar.h"
  19
+#include "base/prefs/pref_change_registrar.h"
20 20
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
21 21
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
22 22
 #include "webkit/fileapi/media/mtp_device_file_system_config.h"
2  net/chrome_http_user_agent_settings.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/basictypes.h"
11 11
 #include "base/compiler_specific.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "net/url_request/http_user_agent_settings.h"
14 14
 
15 15
 class PrefService;
2  net/chrome_network_delegate.cc
@@ -12,8 +12,8 @@
12 12
 #include "base/logging.h"
13 13
 #include "base/metrics/histogram.h"
14 14
 #include "base/path_service.h"
  15
+#include "base/prefs/pref_member.h"
15 16
 #include "base/prefs/pref_service.h"
16  
-#include "base/prefs/public/pref_member.h"
17 17
 #include "base/strings/string_number_conversions.h"
18 18
 #include "base/strings/string_split.h"
19 19
 #include "chrome/browser/browser_process.h"
2  net/chrome_network_delegate_unittest.cc
@@ -7,7 +7,7 @@
7 7
 #include "base/memory/ref_counted.h"
8 8
 #include "base/memory/scoped_ptr.h"
9 9
 #include "base/message_loop.h"
10  
-#include "base/prefs/public/pref_member.h"
  10
+#include "base/prefs/pref_member.h"
11 11
 #include "chrome/browser/extensions/event_router_forwarder.h"
12 12
 #include "chrome/common/pref_names.h"
13 13
 #include "chrome/common/url_constants.h"
2  net/http_server_properties_manager.h
@@ -11,7 +11,7 @@
11 11
 #include "base/compiler_specific.h"
12 12
 #include "base/memory/scoped_ptr.h"
13 13
 #include "base/memory/weak_ptr.h"
14  
-#include "base/prefs/public/pref_change_registrar.h"
  14
+#include "base/prefs/pref_change_registrar.h"
15 15
 #include "base/timer.h"
16 16
 #include "base/values.h"
17 17
 #include "net/base/host_port_pair.h"
2  net/net_error_tab_helper.h
@@ -8,7 +8,7 @@
8 8
 #include "base/basictypes.h"
9 9
 #include "base/compiler_specific.h"
10 10
 #include "base/memory/weak_ptr.h"
11  
-#include "base/prefs/public/pref_member.h"
  11
+#include "base/prefs/pref_member.h"
12 12
 #include "chrome/browser/net/dns_probe_service.h"
13 13
 #include "chrome/common/net/net_error_info.h"
14 14
 #include "chrome/common/net/net_error_tracker.h"
2  net/net_pref_observer.h
@@ -6,7 +6,7 @@
6 6
 #define CHROME_BROWSER_NET_NET_PREF_OBSERVER_H_
7 7
 
8 8
 #include "base/basictypes.h"
9  
-#include "base/prefs/public/pref_member.h"
  9
+#include "base/prefs/pref_member.h"
10 10
 
11 11
 namespace chrome_browser_net {
12 12
 class Predictor;
2  net/pref_proxy_config_tracker_impl.h
@@ -9,7 +9,7 @@
9 9
 #include "base/memory/ref_counted.h"
10 10
 #include "base/memory/scoped_ptr.h"
11 11
 #include "base/observer_list.h"
12  
-#include "base/prefs/public/pref_change_registrar.h"
  12
+#include "base/prefs/pref_change_registrar.h"
13 13
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
14 14
 #include "net/proxy/proxy_config.h"
15 15
 #include "net/proxy/proxy_config_service.h"
4  net/ssl_config_service_manager_pref.cc
@@ -9,10 +9,10 @@
9 9
 
10 10
 #include "base/basictypes.h"
11 11
 #include "base/bind.h"
  12
+#include "base/prefs/pref_change_registrar.h"
  13
+#include "base/prefs/pref_member.h"
12 14
 #include "base/prefs/pref_registry_simple.h"
13 15
 #include "base/prefs/pref_service.h"
14  
-#include "base/prefs/public/pref_change_registrar.h"
15  
-#include "base/prefs/public/pref_member.h"
16 16
 #include "chrome/browser/content_settings/content_settings_utils.h"
17 17
 #include "chrome/common/chrome_notification_types.h"
18 18
 #include "chrome/common/content_settings.h"
2  notifications/balloon_notification_ui_manager.h
@@ -8,7 +8,7 @@
8 8
 #include <string>
9 9
 
10 10
 #include "base/memory/scoped_ptr.h"
11  
-#include "base/prefs/public/pref_member.h"
  11
+#include "base/prefs/pref_member.h"
12 12
 #include "chrome/browser/notifications/balloon.h"
13 13
 #include "chrome/browser/notifications/balloon_collection.h"
14 14
 #include "chrome/browser/notifications/notification_prefs_manager.h"
2  notifications/desktop_notification_service.h
@@ -11,7 +11,7 @@
11 11
 
12 12
 #include "base/basictypes.h"
13 13
 #include "base/memory/ref_counted.h"
14  
-#include "base/prefs/public/pref_member.h"
  14
+#include "base/prefs/pref_member.h"
15 15
 #include "base/string16.h"
16 16
 #include "chrome/browser/content_settings/content_settings_provider.h"
17 17
 #include "chrome/browser/profiles/profile_keyed_service.h"
2  notifications/notification_ui_manager_impl.h
@@ -11,7 +11,7 @@
11 11
 
12 12
 #include "base/id_map.h"
13 13
 #include "base/memory/linked_ptr.h"
14  
-#include "base/prefs/public/pref_member.h"
  14
+#include "base/prefs/pref_member.h"
15 15
 #include "base/timer.h"
16 16
 #include "chrome/browser/notifications/notification_ui_manager.h"
17 17
 #include "content/public/browser/notification_observer.h"
2  password_manager/password_manager.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/memory/scoped_ptr.h"
11 11
 #include "base/memory/scoped_vector.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "base/stl_util.h"
14 14
 #include "chrome/browser/password_manager/password_form_manager.h"
15 15
 #include "chrome/browser/ui/login/login_model.h"
2  plugins/plugin_info_message_filter.h
@@ -10,7 +10,7 @@
10 10
 
11 11
 #include "base/compiler_specific.h"
12 12
 #include "base/memory/weak_ptr.h"
13  
-#include "base/prefs/public/pref_member.h"
  13
+#include "base/prefs/pref_member.h"
14 14
 #include "base/sequenced_task_runner_helpers.h"
15 15
 #include "chrome/common/content_settings.h"
16 16
 #include "content/public/browser/browser_message_filter.h"
2  plugins/plugin_prefs.h
@@ -11,8 +11,8 @@
11 11
 
12 12
 #include "base/basictypes.h"
13 13
 #include "base/files/file_path.h"
  14
+#include "base/prefs/pref_change_registrar.h"
14 15
 #include "base/prefs/pref_service.h"
15  
-#include "base/prefs/public/pref_change_registrar.h"
16 16
 #include "base/synchronization/lock.h"
17 17
 #include "chrome/browser/plugins/plugin_finder.h"
18 18
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
2  plugins/plugin_status_pref_setter.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/memory/ref_counted.h"
11 11
 #include "base/memory/weak_ptr.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "content/public/browser/notification_observer.h"
14 14
 #include "content/public/browser/notification_registrar.h"
15 15
 
2  policy/cloud/cloud_policy_core.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/basictypes.h"
11 11
 #include "base/memory/scoped_ptr.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
14 14
 
15 15
 class PrefService;
2  policy/cloud/cloud_policy_manager.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/basictypes.h"
11 11
 #include "base/compiler_specific.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
14 14
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
15 15
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
2  policy/url_blacklist_manager.h
@@ -14,7 +14,7 @@
14 14
 #include "base/hash_tables.h"
15 15
 #include "base/memory/scoped_ptr.h"
16 16
 #include "base/memory/weak_ptr.h"
17  
-#include "base/prefs/public/pref_change_registrar.h"
  17
+#include "base/prefs/pref_change_registrar.h"
18 18
 #include "extensions/common/matcher/url_matcher.h"
19 19
 
20 20
 class GURL;
2  prefs/scoped_user_pref_update_unittest.cc
@@ -3,7 +3,7 @@
3 3
 // found in the LICENSE file.
4 4
 
5 5
 #include "base/prefs/mock_pref_change_callback.h"
6  
-#include "base/prefs/public/pref_change_registrar.h"
  6
+#include "base/prefs/pref_change_registrar.h"
7 7
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
8 8
 #include "chrome/test/base/testing_pref_service_syncable.h"
9 9
 #include "components/user_prefs/pref_registry_syncable.h"
2  printing/cloud_print/cloud_print_proxy_service.h
@@ -12,7 +12,7 @@
12 12
 #include "base/callback_forward.h"
13 13
 #include "base/memory/weak_ptr.h"
14 14
 #include "base/observer_list.h"
15  
-#include "base/prefs/public/pref_change_registrar.h"
  15
+#include "base/prefs/pref_change_registrar.h"
16 16
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
17 17
 #include "chrome/browser/profiles/profile_keyed_service.h"
18 18
 
2  printing/print_view_manager.h
@@ -6,7 +6,7 @@
6 6
 #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_H_
7 7
 
8 8
 #include "base/memory/ref_counted.h"
9  
-#include "base/prefs/public/pref_member.h"
  9
+#include "base/prefs/pref_member.h"
10 10
 #include "base/string16.h"
11 11
 #include "content/public/browser/notification_observer.h"
12 12
 #include "content/public/browser/notification_registrar.h"
2  profiles/gaia_info_update_service.h
@@ -8,7 +8,7 @@
8 8
 #include "base/compiler_specific.h"
9 9
 #include "base/gtest_prod_util.h"
10 10
 #include "base/memory/scoped_ptr.h"
11  
-#include "base/prefs/public/pref_member.h"
  11
+#include "base/prefs/pref_member.h"
12 12
 #include "base/timer.h"
13 13
 #include "chrome/browser/profiles/profile_downloader.h"
14 14
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
2  profiles/profile_impl.h
@@ -13,7 +13,7 @@
13 13
 #include "base/gtest_prod_util.h"
14 14
 #include "base/memory/ref_counted.h"
15 15
 #include "base/memory/scoped_ptr.h"
16  
-#include "base/prefs/public/pref_change_registrar.h"
  16
+#include "base/prefs/pref_change_registrar.h"
17 17
 #include "base/timer.h"
18 18
 #include "chrome/browser/profiles/profile.h"
19 19
 #include "chrome/browser/profiles/profile_impl_io_data.h"
2  profiles/profile_impl_io_data.cc
@@ -8,8 +8,8 @@
8 8
 #include "base/command_line.h"
9 9
 #include "base/file_util.h"
10 10
 #include "base/logging.h"
  11
+#include "base/prefs/pref_member.h"
11 12
 #include "base/prefs/pref_service.h"
12  
-#include "base/prefs/public/pref_member.h"
13 13
 #include "base/sequenced_task_runner.h"
14 14
 #include "base/stl_util.h"
15 15
 #include "base/threading/sequenced_worker_pool.h"
2  profiles/profile_io_data.h
@@ -13,7 +13,7 @@
13 13
 #include "base/memory/ref_counted.h"
14 14
 #include "base/memory/scoped_ptr.h"
15 15
 #include "base/memory/weak_ptr.h"
16  
-#include "base/prefs/public/pref_member.h"
  16
+#include "base/prefs/pref_member.h"
17 17
 #include "base/synchronization/lock.h"
18 18
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
19 19
 #include "chrome/browser/io_thread.h"
2  safe_browsing/safe_browsing_service.cc
@@ -11,8 +11,8 @@
11 11
 #include "base/debug/leak_tracker.h"
12 12
 #include "base/lazy_instance.h"
13 13
 #include "base/path_service.h"
  14
+#include "base/prefs/pref_change_registrar.h"
14 15
 #include "base/prefs/pref_service.h"
15  
-#include "base/prefs/public/pref_change_registrar.h"
16 16
 #include "base/stl_util.h"
17 17
 #include "base/string_util.h"
18 18
 #include "base/threading/thread.h"
2  safe_browsing/safe_browsing_tab_observer.h
@@ -6,7 +6,7 @@
6 6
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_OBSERVER_H_
7 7
 
8 8
 #include "base/memory/scoped_ptr.h"
9  
-#include "base/prefs/public/pref_change_registrar.h"
  9
+#include "base/prefs/pref_change_registrar.h"
10 10
 #include "content/public/browser/web_contents_user_data.h"
11 11
 
12 12
 namespace content {
2  search_engines/template_url_service.h
@@ -14,7 +14,7 @@
14 14
 #include "base/gtest_prod_util.h"
15 15
 #include "base/memory/scoped_ptr.h"
16 16
 #include "base/observer_list.h"
17  
-#include "base/prefs/public/pref_change_registrar.h"
  17
+#include "base/prefs/pref_change_registrar.h"
18 18
 #include "chrome/browser/profiles/profile_keyed_service.h"
19 19
 #include "chrome/browser/search_engines/template_url_id.h"
20 20
 #include "chrome/browser/webdata/web_data_service.h"
4  signin/signin_manager.h
@@ -24,8 +24,8 @@
24 24
 #include "base/logging.h"
25 25
 #include "base/memory/scoped_ptr.h"
26 26
 #include "base/observer_list.h"
27  
-#include "base/prefs/public/pref_change_registrar.h"
28  
-#include "base/prefs/public/pref_member.h"
  27
+#include "base/prefs/pref_change_registrar.h"
  28
+#include "base/prefs/pref_member.h"
29 29
 #include "chrome/browser/profiles/profile.h"
30 30
 #include "chrome/browser/profiles/profile_keyed_service.h"
31 31
 #include "chrome/browser/signin/signin_internals_util.h"
2  speech/chrome_speech_recognition_preferences.h
@@ -9,7 +9,7 @@
9 9
 #include "base/memory/ref_counted.h"
10 10
 #include "base/memory/scoped_ptr.h"
11 11
 #include "base/memory/singleton.h"
12  
-#include "base/prefs/public/pref_change_registrar.h"
  12
+#include "base/prefs/pref_change_registrar.h"
13 13
 #include "base/synchronization/lock.h"
14 14
 #include "base/threading/non_thread_safe.h"
15 15
 #include "chrome/browser/profiles/profile_keyed_service.h"
2  spellchecker/spellcheck_service.cc
@@ -5,8 +5,8 @@
5 5
 #include "chrome/browser/spellchecker/spellcheck_service.h"
6 6
 
7 7
 #include "base/platform_file.h"
  8
+#include "base/prefs/pref_member.h"
8 9
 #include "base/prefs/pref_service.h"
9  
-#include "base/prefs/public/pref_member.h"
10 10
 #include "base/strings/string_split.h"
11 11
 #include "base/synchronization/waitable_event.h"
12 12
 #include "chrome/browser/profiles/profile.h"
4  spellchecker/spellcheck_service.h
@@ -5,11 +5,11 @@
5 5
 #ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_
6 6
 #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_
7 7
 
8  
-#include "base/gtest_prod_util.h"
9 8
 #include "base/compiler_specific.h"
  9
+#include "base/gtest_prod_util.h"
10 10
 #include "base/memory/scoped_ptr.h"
11 11
 #include "base/memory/weak_ptr.h"
12  
-#include "base/prefs/public/pref_change_registrar.h"
  12
+#include "base/prefs/pref_change_registrar.h"
13 13
 #include "chrome/browser/profiles/profile_keyed_service.h"
14 14
 #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h"
15 15
 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
2  sync/glue/typed_url_data_type_controller.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/compiler_specific.h"
11 11
 #include "base/memory/ref_counted.h"
12  
-#include "base/prefs/public/pref_change_registrar.h"
  12
+#include "base/prefs/pref_change_registrar.h"
13 13
 #include "chrome/browser/common/cancelable_request.h"
14 14
 #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h"
15 15
 
2  sync/sync_prefs.cc
@@ -6,8 +6,8 @@
6 6
 
7 7
 #include "base/command_line.h"
8 8
 #include "base/logging.h"
  9
+#include "base/prefs/pref_member.h"
9 10
 #include "base/prefs/pref_service.h"
10  
-#include "base/prefs/public/pref_member.h"
11 11
 #include "base/strings/string_number_conversions.h"
12 12
 #include "base/values.h"
13 13
 #include "build/build_config.h"
2  sync/sync_prefs.h
@@ -9,7 +9,7 @@
9 9
 #include "base/compiler_specific.h"
10 10
 #include "base/memory/weak_ptr.h"
11 11
 #include "base/observer_list.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "base/threading/non_thread_safe.h"
14 14
 #include "base/time.h"
15 15
 #include "sync/internal_api/public/base/model_type.h"
2  sync/test/integration/sync_errors_test.cc
@@ -2,8 +2,8 @@
2 2
 // Use of this source code is governed by a BSD-style license that can be
3 3
 // found in the LICENSE file.
4 4
 
  5
+#include "base/prefs/pref_member.h"
5 6
 #include "base/prefs/pref_service.h"
6  
-#include "base/prefs/public/pref_member.h"
7 7
 #include "chrome/browser/sync/profile_sync_service.h"
8 8
 #include "chrome/browser/sync/profile_sync_service_harness.h"
9 9
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
2  tab_contents/render_view_context_menu.cc
@@ -11,8 +11,8 @@
11 11
 #include "base/command_line.h"
12 12
 #include "base/logging.h"
13 13
 #include "base/metrics/histogram.h"
  14
+#include "base/prefs/pref_member.h"
14 15
 #include "base/prefs/pref_service.h"
15  
-#include "base/prefs/public/pref_member.h"
16 16
 #include "base/stl_util.h"
17 17
 #include "base/string_util.h"
18 18
 #include "base/time.h"
2  tab_contents/spellchecker_submenu_observer_hunspell.cc
@@ -6,8 +6,8 @@
6 6
 
7 7
 #include "base/command_line.h"
8 8
 #include "base/logging.h"
  9
+#include "base/prefs/pref_member.h"
9 10
 #include "base/prefs/pref_service.h"
10  
-#include "base/prefs/public/pref_member.h"
11 11
 #include "chrome/app/chrome_command_ids.h"
12 12
 #include "chrome/browser/browser_process.h"
13 13
 #include "chrome/browser/spellchecker/spellcheck_service.h"
2  tab_contents/spelling_menu_observer.h
@@ -9,7 +9,7 @@
9 9
 
10 10
 #include "base/compiler_specific.h"
11 11
 #include "base/memory/scoped_ptr.h"
12  
-#include "base/prefs/public/pref_member.h"
  12
+#include "base/prefs/pref_member.h"
13 13
 #include "base/string16.h"
14 14
 #include "base/timer.h"
15 15
 #include "chrome/browser/spellchecker/spelling_service_client.h"
2  translate/translate_manager.h
@@ -14,7 +14,7 @@
14 14
 #include "base/lazy_instance.h"
15 15
 #include "base/memory/scoped_ptr.h"
16 16
 #include "base/memory/weak_ptr.h"
17  
-#include "base/prefs/public/pref_change_registrar.h"
  17
+#include "base/prefs/pref_change_registrar.h"
18 18
 #include "base/time.h"
19 19
 #include "chrome/common/translate_errors.h"
20 20
 #include "content/public/browser/notification_observer.h"
2  translate/translate_manager_browsertest.cc
@@ -9,8 +9,8 @@
9 9
 
10 10
 #include "base/json/json_writer.h"
11 11
 #include "base/memory/scoped_ptr.h"
  12
+#include "base/prefs/pref_change_registrar.h"
12 13
 #include "base/prefs/pref_service.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
14 14
 #include "base/stringprintf.h"
15 15
 #include "base/utf_string_conversions.h"
16 16
 #include "base/values.h"
2  ui/alternate_error_tab_observer.h
@@ -5,7 +5,7 @@
5 5
 #ifndef CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_
6 6
 #define CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_
7 7
 
8  
-#include "base/prefs/public/pref_change_registrar.h"
  8
+#include "base/prefs/pref_change_registrar.h"
9 9
 #include "content/public/browser/notification_observer.h"
10 10
 #include "content/public/browser/notification_registrar.h"
11 11
 #include "content/public/browser/web_contents_observer.h"
2  ui/ash/event_rewriter_unittest.cc
@@ -6,7 +6,7 @@
6 6
 
7 7
 #include "base/basictypes.h"
8 8
 #include "base/command_line.h"
9  
-#include "base/prefs/public/pref_member.h"
  9
+#include "base/prefs/pref_member.h"
10 10
 #include "base/stringprintf.h"
11 11
 #include "chrome/common/chrome_switches.h"
12 12
 #include "chrome/common/pref_names.h"
2  ui/ash/launcher/chrome_launcher_controller_per_app.h
@@ -18,7 +18,7 @@
18 18
 #include "base/compiler_specific.h"
19 19
 #include "base/memory/scoped_ptr.h"
20 20
 #include "base/memory/scoped_vector.h"
21  
-#include "base/prefs/public/pref_change_registrar.h"
  21
+#include "base/prefs/pref_change_registrar.h"
22 22
 #include "chrome/browser/extensions/extension_prefs.h"
23 23
 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
24 24
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
2  ui/ash/launcher/chrome_launcher_controller_per_browser.h
@@ -17,7 +17,7 @@
17 17
 #include "base/basictypes.h"
18 18
 #include "base/compiler_specific.h"
19 19
 #include "base/memory/scoped_ptr.h"
20  
-#include "base/prefs/public/pref_change_registrar.h"
  20
+#include "base/prefs/pref_change_registrar.h"
21 21
 #include "chrome/browser/extensions/extension_prefs.h"
22 22
 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
23 23
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
2  ui/autofill/autofill_dialog_models.h
@@ -10,7 +10,7 @@
10 10
 
11 11
 #include "base/basictypes.h"
12 12
 #include "base/compiler_specific.h"
13  
-#include "base/prefs/public/pref_change_registrar.h"
  13
+#include "base/prefs/pref_change_registrar.h"
14 14
 #include "base/string16.h"
15 15
 #include "ui/base/models/combobox_model.h"
16 16
 #include "ui/base/models/simple_menu_model.h"
4  ui/browser.h
@@ -15,8 +15,8 @@
15 15
 #include "base/gtest_prod_util.h"