Clean up pref change notification handling.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 84c04e197c3bce1ce622124dbf54aae5f2d28e81..5cc65221e22e4207a3b728e5810448818c37a184 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -63,10 +63,9 @@
         #'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',
@@ -77,9 +76,10 @@
         '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',
@@ -1279,7 +1279,7 @@
         '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',