Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/extensions/extension_pref_value_map.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
+#include "base/observer_list.h"
 #include "base/time.h"
-#include "chrome/browser/prefs/value_map_pref_store.h"
+#include "base/values.h"
+#include "chrome/browser/prefs/pref_value_map.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/extensions/extension_prefs_scope.h"
 
 // Non-persistent data container that is shared by ExtensionPrefStores. All
 // extension pref values (incognito and regular) are stored herein and
 // provided to ExtensionPrefStores.
 //
 // The semantics of the ExtensionPrefValueMap are:
 // - The precedence of extensions is determined by their installation time.
 //   The extension that has been installed later takes higher precedence.
 // - If two extensions set a value for the same preference, the following
@@ skipping 11 matching lines @@
 //     1   |   2   |   -   |   -   |   1   |   2
 //     1   |   -   |   3   |   -   |   3   |   3
 //     1   |   -   |   -   |   4   |   1   |   4
 //     1   |   2   |   3   |   -   |   3   |   3(!)
 //     1   |   2   |   -   |   4   |   1   |   4
 //     1   |   2   |   3   |   4   |   3   |   4
 // A = extension A, B = extension B, E = effective value
 // .reg = regular value
 // .inc = incognito value
 // Extension B has higher precedence than A.
-class ExtensionPrefValueMap {
+class ExtensionPrefValueMap : public ProfileKeyedService {
  public:
   // Observer interface for monitoring ExtensionPrefValueMap.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called when the value for the given |key| set by one of the extensions
     // changes. This does not necessarily mean that the effective value has
     // changed.
     virtual void OnPrefValueChanged(const std::string& key) = 0;
     // Notification about the ExtensionPrefValueMap being fully initialized.
     virtual void OnInitializationCompleted() = 0;
     // Called when the ExtensionPrefValueMap is being destroyed. When called,
     // observers must unsubscribe.
     virtual void OnExtensionPrefValueMapDestruction() = 0;
   };
 
   ExtensionPrefValueMap();
   virtual ~ExtensionPrefValueMap();
 
+  // ProfileKeyedService implementation.
+  virtual void Shutdown() OVERRIDE;
+
   // Set an extension preference |value| for |key| of extension |ext_id|.
   // Takes ownership of |value|.
   // Note that regular extension pref values need to be reported to
   // incognito and to regular ExtensionPrefStores.
   // Precondition: the extension must be registered.
   void SetExtensionPref(const std::string& ext_id,
                         const std::string& key,
                         ExtensionPrefsScope scope,
                         base::Value* value);
 
@@ skipping 79 matching lines @@
 
   void NotifyOfDestruction();
   void NotifyPrefValueChanged(const std::string& key);
   void NotifyPrefValueChanged(const std::set<std::string>& keys);
 
   // Mapping of which extension set which preference value. The effective
   // preferences values (i.e. the ones with the highest precedence)
   // are stored in ExtensionPrefStores.
   ExtensionEntryMap entries_;
 
+  // In normal Profile shutdown, Shutdown() notifies observers that we are
+  // being destroyed. In tests, it isn't called, so the notification must
+  // be done in the destructor. This bit tracks whether it has been done yet.
+  bool destroyed_;
+
   ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefValueMap);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_