| Index: chrome/chrome_tests.gypi
 | 
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
 | 
| index d2c1e2e7a1016a90b3c009b78462d9b47b75241b..b92b0c5a5e871a29a794c6634970e1c8f7709a2a 100644
 | 
| --- a/chrome/chrome_tests.gypi
 | 
| +++ b/chrome/chrome_tests.gypi
 | 
| @@ -48,8 +48,6 @@
 | 
|          # The only thing used from browser is Browser::Type.
 | 
|          'browser/browser.h',
 | 
|          'browser/cocoa/browser_test_helper.h',
 | 
| -        'browser/dummy_pref_store.cc',
 | 
| -        'browser/dummy_pref_store.h',
 | 
|          'browser/extensions/test_extension_prefs.cc',
 | 
|          'browser/extensions/test_extension_prefs.h',
 | 
|          'browser/geolocation/mock_location_provider.cc',
 | 
| @@ -66,8 +64,10 @@
 | 
|          #'browser/net/url_request_mock_http_job.h',
 | 
|          'browser/net/url_request_mock_net_error_job.cc',
 | 
|          'browser/net/url_request_mock_net_error_job.h',
 | 
| -        'browser/pref_value_store.cc',
 | 
| -        'browser/pref_value_store.h',
 | 
| +        'browser/prefs/dummy_pref_store.cc',
 | 
| +        'browser/prefs/dummy_pref_store.h',
 | 
| +        'browser/prefs/pref_value_store.cc',
 | 
| +        'browser/prefs/pref_value_store.h',
 | 
|          'browser/renderer_host/mock_render_process_host.cc',
 | 
|          'browser/renderer_host/mock_render_process_host.h',
 | 
|          'browser/renderer_host/test/test_backing_store.cc',
 | 
| @@ -308,7 +308,7 @@
 | 
|          'browser/login_prompt_uitest.cc',
 | 
|          'browser/media_uitest.cc',
 | 
|          'browser/metrics/metrics_service_uitest.cc',
 | 
| -        'browser/pref_service_uitest.cc',
 | 
| +        'browser/prefs/pref_service_uitest.cc',
 | 
|          'browser/printing/printing_layout_uitest.cc',
 | 
|          'browser/process_singleton_linux_uitest.cc',
 | 
|          'browser/process_singleton_uitest.cc',
 | 
| @@ -1032,7 +1032,6 @@
 | 
|          'browser/cocoa/window_size_autosaver_unittest.mm',
 | 
|          'browser/cocoa/wrench_menu_button_cell_unittest.mm',
 | 
|          'browser/cocoa/wrench_menu_controller_unittest.mm',
 | 
| -        'browser/command_line_pref_store_unittest.cc',
 | 
|          'browser/command_updater_unittest.cc',
 | 
|          'browser/cookies_tree_model_unittest.cc',
 | 
|          'browser/debugger/devtools_manager_unittest.cc',
 | 
| @@ -1130,7 +1129,6 @@
 | 
|          'browser/keychain_mock_mac.h',
 | 
|          'browser/login_prompt_unittest.cc',
 | 
|          'browser/mach_broker_mac_unittest.cc',
 | 
| -        'browser/managed_prefs_banner_base_unittest.cc',
 | 
|          'browser/metrics/metrics_log_unittest.cc',
 | 
|          'browser/metrics/metrics_response_unittest.cc',
 | 
|          'browser/metrics/metrics_service_unittest.cc',
 | 
| @@ -1163,15 +1161,17 @@
 | 
|          'browser/policy/configuration_policy_pref_store_unittest.cc',
 | 
|          'browser/policy/configuration_policy_provider_mac_unittest.cc',
 | 
|          'browser/policy/configuration_policy_provider_win_unittest.cc',
 | 
| +        'browser/policy/managed_prefs_banner_base_unittest.cc',
 | 
|          'browser/policy/mock_configuration_policy_provider.h',
 | 
|          'browser/policy/mock_configuration_policy_store.h',
 | 
| -        'browser/pref_member_unittest.cc',
 | 
| -        'browser/pref_notifier_unittest.cc',
 | 
| -        'browser/pref_service_unittest.cc',
 | 
| -        'browser/pref_set_observer_unittest.cc',
 | 
| -        'browser/pref_value_store_unittest.cc',
 | 
|          'browser/preferences_mock_mac.cc',
 | 
|          'browser/preferences_mock_mac.h',
 | 
| +        'browser/prefs/command_line_pref_store_unittest.cc',
 | 
| +        'browser/prefs/pref_member_unittest.cc',
 | 
| +        'browser/prefs/pref_notifier_unittest.cc',
 | 
| +        'browser/prefs/pref_service_unittest.cc',
 | 
| +        'browser/prefs/pref_set_observer_unittest.cc',
 | 
| +        'browser/prefs/pref_value_store_unittest.cc',
 | 
|          'browser/printing/print_dialog_cloud_unittest.cc',
 | 
|          'browser/printing/print_job_unittest.cc',
 | 
|          'browser/process_info_snapshot_mac_unittest.cc',
 | 
| 
 |