Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/protector/protected_prefs_watcher_unittest.cc

Index: chrome/browser/protector/protected_prefs_watcher_unittest.cc
diff --git a/chrome/browser/protector/protected_prefs_watcher_unittest.cc b/chrome/browser/protector/protected_prefs_watcher_unittest.cc
index 19774122ad3882682f28fd5212ac576335bc235c..b67f8d9848303f16f23d4377015ffd285946f17e 100644
--- a/chrome/browser/protector/protected_prefs_watcher_unittest.cc
+++ b/chrome/browser/protector/protected_prefs_watcher_unittest.cc
@@ -4,8 +4,9 @@
 
 #include "base/message_loop.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
+#include "chrome/browser/extensions/extension_pref_value_map_factory.h"
+#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -105,12 +106,11 @@ TEST_F(ProtectedPrefsWatcherTest, ExtensionPrefChange) {
 
   FilePath extensions_install_dir =
       profile_.GetPath().AppendASCII(ExtensionService::kInstallDirectoryName);
-  scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_(
-      new ExtensionPrefValueMap);
   scoped_ptr<ExtensionPrefs> extension_prefs(
       new ExtensionPrefs(profile_.GetPrefs(),
                          extensions_install_dir,
-                         extension_pref_value_map_.get()));
+                         ExtensionPrefValueMapFactory::GetForProfile(
+                             &profile_)));
   std::string sample_id = extension_misc::kWebStoreAppId;
   extension_prefs->Init(false);
   // Flip a pref value of an extension (this will actually add it to the list).