Make the hcsm and its providers communicate via an observer interface.

chrome/browser/content_settings/content_settings_pref_provider.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_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of the pref service.
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
-#include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/content_settings/content_settings_observable_provider.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class ContentSettingsDetails;
 class DictionaryValue;
 class HostContentSettingsMap;
 class PrefService;
 
@@ skipping 63 matching lines @@
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefDefaultProvider);
 };
 
 // Content settings provider that provides content settings from the user
 // preference.
-class PrefProvider : public ProviderInterface,
+class PrefProvider : public ObservableProvider,
                      public NotificationObserver {
  public:
   static void RegisterUserPrefs(PrefService* prefs);
 
-  PrefProvider(HostContentSettingsMap* map,
-               PrefService* prefs,
+  PrefProvider(PrefService* prefs,
                bool incognito);
   virtual ~PrefProvider();
 
   // ProviderInterface implementations.
   virtual void SetContentSetting(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting content_setting);
@@ skipping 63 matching lines @@
 
   // Copies the value of the preference that stores the content settings
   // exceptions to the obsolete preference for content settings exceptions. This
   // is necessary to allow content settings exceptions beeing synced to older
   // versions of chrome that only use the obsolete.
   void SyncObsoletePref();
 
   static void CanonicalizeContentSettingsExceptions(
       DictionaryValue* all_settings_dictionary);
 
-  void NotifyObservers(const ContentSettingsDetails& details);
-
   // Weak; owned by the Profile and reset in ShutdownOnUIThread.
   PrefService* prefs_;
 
-  // Weak; owns us
-  HostContentSettingsMap* host_content_settings_map_;
-
   bool is_incognito_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   OriginIdentifierValueMap value_map_;
 
   OriginIdentifierValueMap incognito_value_map_;
 
   // Used around accesses to the value map objects to guarantee
   // thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProvider);
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_