Split incognito extension content settings in session-only and persistent.

chrome/browser/extensions/extension_content_settings_store.h

Index: chrome/browser/extensions/extension_content_settings_store.h
diff --git a/chrome/browser/extensions/extension_content_settings_store.h b/chrome/browser/extensions/extension_content_settings_store.h
index b2672686279874be75d6a0a6b14c27537f01ff9a..86bbca8c986b39f654040763bb778852bfd64c8d 100644
--- a/chrome/browser/extensions/extension_content_settings_store.h
+++ b/chrome/browser/extensions/extension_content_settings_store.h
@@ -16,6 +16,7 @@
 #include "base/tuple.h"
 #include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/extensions/extension_prefs_scope.h"
 #include "chrome/common/content_settings.h"
 #include "googleurl/src/gurl.h"
 
@@ -60,7 +61,7 @@ class ExtensionContentSettingsStore {
       ContentSettingsType type,
       const content_settings::ResourceIdentifier& identifier,
       ContentSetting setting,
-      bool incognito);
+      extension_prefs_scope::Scope scope);
 
   ContentSetting GetEffectiveContentSetting(
       const GURL& embedded_url,
@@ -69,6 +70,10 @@ class ExtensionContentSettingsStore {
       const content_settings::ResourceIdentifier& identifier,
       bool incognito) const;
 
+  // Clears all contents settings set by the extension |ext_id|.
+  void ClearContentSettingsForExtension(const std::string& ext_id,
+                                        extension_prefs_scope::Scope scope);
+
   // Returns a list of all content setting rules for the content type |type|
   // and the resource identifier (if specified and the content type uses
   // resource identifiers).
@@ -81,12 +86,14 @@ class ExtensionContentSettingsStore {
   // Serializes all content settings set by the extension with ID |extension_id|
   // and returns them as a ListValue. The caller takes ownership of the returned
   // value.
-  ListValue* GetSettingsForExtension(const std::string& extension_id) const;
+  ListValue* GetSettingsForExtension(const std::string& extension_id,
+                                     extension_prefs_scope::Scope scope) const;
 
   // Deserializes content settings rules from |list| and applies them as set by
   // the extension with ID |extension_id|.
   void SetExtensionContentSettingsFromList(const std::string& extension_id,
-                                           const ListValue* dict);
+                                           const ListValue* list,
+                                           extension_prefs_scope::Scope scope);
 
   // //////////////////////////////////////////////////////////////////////////
 
@@ -137,11 +144,18 @@ class ExtensionContentSettingsStore {
 
   ContentSettingSpecList* GetContentSettingSpecList(
       const std::string& ext_id,
-      bool incognito);
+      extension_prefs_scope::Scope scope);
 
   const ContentSettingSpecList* GetContentSettingSpecList(
       const std::string& ext_id,
-      bool incognito) const;
+      extension_prefs_scope::Scope scope) const;
+
+  // Adds all content setting rules for |type| and |identifier| found in
+  // |setting_spec_list| to |rules|.
+  static void AddRules(ContentSettingsType type,
+                       const content_settings::ResourceIdentifier& identifier,
+                       const ContentSettingSpecList* setting_spec_list,
+                       content_settings::ProviderInterface::Rules* rules);
 
   void NotifyOfContentSettingChanged(const std::string& extension_id,
                                      bool incognito);