[Do not commit] Track revocations in content_settings::Observer

components/content_settings/core/browser/content_settings_pref.h

 // Copyright 2015 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 COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 23 matching lines @@
 namespace content_settings {
 
 class RuleIterator;
 
 // Represents a single pref for reading/writing content settings of one type.
 class ContentSettingsPref {
  public:
   typedef base::Callback<void(const ContentSettingsPattern&,
                               const ContentSettingsPattern&,
                               ContentSettingsType,
+                              ContentSetting,
                               const std::string&)> NotifyObserversCallback;
 
   ContentSettingsPref(ContentSettingsType content_type,
                       PrefService* prefs,
                       PrefChangeRegistrar* registrar,
                       const std::string& pref_name,
                       bool incognito,
                       NotifyObserversCallback notify_callback);
   ~ContentSettingsPref();
 
@@ skipping 31 matching lines @@
   // into the |value_map_|. The |value_map_| is cleared first.
   void ReadContentSettingsFromPref();
 
   // Callback for changes in the pref with the same name.
   void OnPrefChanged();
 
   // Update the preference that stores content settings exceptions and syncs the
   // value to the obsolete preference. When calling this function, |lock_|
   // should not be held, since this function will send out notifications of
   // preference changes.
-  void UpdatePref(
+  ContentSetting UpdatePref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       const ResourceIdentifier& resource_identifier,
       const base::Value* value);
 
   static void CanonicalizeContentSettingsExceptions(
       base::DictionaryValue* all_settings_dictionary);
 
   // In the debug mode, asserts that |lock_| is not held by this thread. It's
   // ok if some other thread holds |lock_|, as long as it will eventually
@@ skipping 28 matching lines @@
   mutable base::Lock lock_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsPref);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_