Sanitize PrefStore interface.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f62f4c96e291536ae3630afad42ac2febb8cb8c3..05e3139c8858da8ad5df1260571c5e11adb372e4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1113,6 +1113,8 @@
         'browser/extensions/extension_page_actions_module_constants.h',
         'browser/extensions/extension_popup_api.cc',
         'browser/extensions/extension_popup_api.h',
+        'browser/extensions/extension_pref_store.h',
+        'browser/extensions/extension_pref_store.cc',
         'browser/extensions/extension_prefs.cc',
         'browser/extensions/extension_prefs.h',
         'browser/extensions/extension_process_manager.cc',
@@ -1990,8 +1992,7 @@
         'browser/prefs/browser_prefs.h',
         'browser/prefs/command_line_pref_store.cc',
         'browser/prefs/command_line_pref_store.h',
-        'browser/prefs/in_memory_pref_store.cc',
-        'browser/prefs/in_memory_pref_store.h',
+        'browser/prefs/default_pref_store.h',
         'browser/prefs/pref_member.cc',
         'browser/prefs/pref_member.h',
         'browser/prefs/pref_notifier.h',
@@ -2003,12 +2004,16 @@
         'browser/prefs/pref_service.h',
         'browser/prefs/pref_set_observer.cc',
         'browser/prefs/pref_set_observer.h',
+        'browser/prefs/pref_value_map.cc',
+        'browser/prefs/pref_value_map.h',
         'browser/prefs/pref_value_store.cc',
         'browser/prefs/pref_value_store.h',
         'browser/prefs/scoped_pref_update.cc',
         'browser/prefs/scoped_pref_update.h',
         'browser/prefs/session_startup_pref.cc',
         'browser/prefs/session_startup_pref.h',
+        'browser/prefs/value_map_pref_store.cc',
+        'browser/prefs/value_map_pref_store.h',
         'browser/prerender/prerender_contents.cc',
         'browser/prerender/prerender_contents.h',
         'browser/prerender/prerender_interceptor.cc',