Clean up pref change notification handling.

chrome/chrome_tests.gypi

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 45 matching lines @@
         'browser/mock_browsing_data_indexed_db_helper.cc',
         'browser/mock_browsing_data_indexed_db_helper.h',
         'browser/mock_browsing_data_local_storage_helper.cc',
         'browser/mock_browsing_data_local_storage_helper.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (in chrome.gyp).
         #'browser/net/url_request_mock_http_job.cc',
         #'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/prefs/dummy_pref_store.cc',
-        'browser/prefs/dummy_pref_store.h',
-        'browser/prefs/pref_value_store.cc',
-        'browser/prefs/pref_value_store.h',
+        'browser/prefs/pref_observer_mock.h',
+        'browser/prefs/testing_pref_store.cc',
+        'browser/prefs/testing_pref_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',
         'browser/renderer_host/test/test_backing_store.h',
         'browser/renderer_host/test/test_render_view_host.cc',
         'browser/renderer_host/test/test_render_view_host.h',
         'browser/tab_contents/test_tab_contents.cc',
         'browser/tab_contents/test_tab_contents.h',
         'browser/ui/browser.h',
         'browser/ui/cocoa/browser_test_helper.h',
-        'common/notification_observer_mock.h',
         'common/ipc_test_sink.cc',
         'common/ipc_test_sink.h',
+        'common/notification_observer_mock.h',
+        'common/pref_store_observer_mock.h',
         'renderer/mock_keyboard.cc',
         'renderer/mock_keyboard.h',
         'renderer/mock_keyboard_driver_win.cc',
         'renderer/mock_keyboard_driver_win.h',
         'renderer/mock_printer.cc',
         'renderer/mock_printer.h',
         'renderer/mock_render_process.cc',
         'renderer/mock_render_process.h',
         'renderer/mock_render_thread.cc',
         'renderer/mock_render_thread.h',
@@ skipping 26 matching lines @@
         'test/test_launcher_utils.cc',
         'test/test_launcher_utils.h',
         'test/test_location_bar.h',
         'test/test_switches.cc',
         'test/test_switches.h',
         'test/test_url_request_context_getter.h',
         'test/testing_device_token_fetcher.cc',
         'test/testing_device_token_fetcher.h',
         'test/testing_pref_service.cc',
         'test/testing_pref_service.h',
-        'test/testing_pref_value_store.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
         'test/thread_observer_helper.h',
         'test/thread_test_helper.h',
         'test/ui_test_utils.cc',
         'test/ui_test_utils.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
         'test/unit/chrome_test_suite.cc',
@@ skipping 1128 matching lines @@
         'browser/policy/mock_configuration_policy_provider.cc',
         'browser/policy/mock_configuration_policy_provider.h',
         'browser/policy/mock_configuration_policy_store.cc',
         'browser/policy/mock_configuration_policy_store.h',
         'browser/policy/mock_device_management_backend.h',
         'browser/preferences_mock_mac.cc',
         'browser/preferences_mock_mac.h',
         'browser/prefs/command_line_pref_store_unittest.cc',
         'browser/prefs/pref_change_registrar_unittest.cc',
         'browser/prefs/pref_member_unittest.cc',
-        'browser/prefs/pref_notifier_unittest.cc',
+        'browser/prefs/pref_notifier_impl_unittest.cc',
         'browser/prefs/pref_service_unittest.cc',
         'browser/prefs/pref_set_observer_unittest.cc',
         'browser/prefs/pref_value_store_unittest.cc',
         'browser/prefs/session_startup_pref_unittest.cc',
         'browser/printing/cloud_print/cloud_print_setup_source_unittest.cc',
         'browser/printing/print_dialog_cloud_unittest.cc',
         'browser/printing/print_job_unittest.cc',
         'browser/printing/print_preview_tab_controller_unittest.cc',
         'browser/process_info_snapshot_mac_unittest.cc',
         'browser/process_singleton_mac_unittest.cc',
@@ skipping 2244 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: