Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/extensions/extension_pref_value_map.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 
 struct ExtensionPrefValueMap::ExtensionEntry {
   // Installation time of the extension.
   base::Time install_time;
   // Whether extension is enabled in the profile.
   bool enabled;
   // Extension controlled preferences for the regular profile.
   PrefValueMap regular_profile_preferences;
   // Persistent extension controlled preferences for the incognito profile,
   // empty for regular profile ExtensionPrefStore.
   PrefValueMap incognito_profile_preferences_persistent;
   // Session only extension controlled preferences for the incognito profile.
   // These preferences are deleted when the incognito profile is destroyed.
   PrefValueMap incognito_profile_preferences_session_only;
 };
 
 ExtensionPrefValueMap::ExtensionPrefValueMap() {
 }
 
 ExtensionPrefValueMap::~ExtensionPrefValueMap() {
-  NotifyOfDestruction();
+  if (!destroyed_) {

[Elliot Glaysher, 2012/03/21 00:37:49]

I assume this is here because ExtensionPrefValueMap is instantiated directly in
test code?

+    NotifyOfDestruction();
+    destroyed_ = true;
+  }
   STLDeleteValues(&entries_);
   entries_.clear();
 }
 
+void ExtensionPrefValueMap::Shutdown() {
+  NotifyOfDestruction();
+  destroyed_ = true;
+}
+
 void ExtensionPrefValueMap::SetExtensionPref(const std::string& ext_id,
                                              const std::string& key,
                                              ExtensionPrefsScope scope,
                                              Value* value) {
   PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, scope);
 
   if (prefs->SetValue(key, value))
     NotifyPrefValueChanged(key);
 }
 
@@ skipping 269 matching lines @@
 
 void ExtensionPrefValueMap::NotifyPrefValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnPrefValueChanged(key));
 }
 
 void ExtensionPrefValueMap::NotifyOfDestruction() {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnExtensionPrefValueMapDestruction());
 }