Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 722d4e608011f904b613153a84221294983dc376..d37531ab2e6d58bfac05105202503ebadeb15bc2 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.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_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ -396,19 +397,17 @@ ExtensionService* TestingProfile::CreateExtensionService(
     bool autoupdate_enabled) {
   // Extension pref store, created for use by |extension_prefs_|.
 
-  extension_pref_value_map_.reset(new ExtensionPrefValueMap);
-
   bool extensions_disabled =
       command_line && command_line->HasSwitch(switches::kDisableExtensions);
 
   // Note that the GetPrefs() creates a TestingPrefService, therefore
   // the extension controlled pref values set in extension_prefs_
   // are not reflected in the pref service. One would need to
-  // inject a new ExtensionPrefStore(extension_pref_value_map_.get(), false).
+  // inject a new ExtensionPrefStore(extension_pref_value_map, false).
   extension_prefs_.reset(
       new ExtensionPrefs(GetPrefs(),
                          install_directory,
-                         extension_pref_value_map_.get()));
+                         ExtensionPrefValueMapFactory::GetForProfile(this)));
   extension_prefs_->Init(extensions_disabled);
   extension_service_.reset(new ExtensionService(this,
                                                 command_line,