Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/browser/content_settings/content_settings_utils.h

Index: chrome/browser/content_settings/content_settings_utils.h
diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h
index 6d40b7264c5e270fd9af35f2c828971872b0d755..4fae58cacd462ca4443ae97cbef3d8b6f782c1d2 100644
--- a/chrome/browser/content_settings/content_settings_utils.h
+++ b/chrome/browser/content_settings/content_settings_utils.h
@@ -52,15 +52,22 @@ std::string CreatePatternString(
     const ContentSettingsPattern& top_level_frame_pattern);
 
 // Caller takes the ownership of the returned |base::Value*|.
-base::Value* GetContentSettingValue(
+base::Value* GetContentSettingValueAndPatterns(
     RuleIterator* rule_iterator,
     const GURL& primary_url,
-    const GURL& secondary_url);
+    const GURL& secondary_url,
+    ContentSettingsPattern* primary_pattern,
+    ContentSettingsPattern* secondary_pattern);
 
-ContentSetting GetContentSetting(
-    RuleIterator* rule_iterator,
+base::Value* GetContentSettingValueAndPatterns(
+    const ProviderInterface* provider,
     const GURL& primary_url,
-    const GURL& secondary_url);
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    const std::string& resource_identifier,
+    bool include_incognito,
+    ContentSettingsPattern* primary_pattern,
+    ContentSettingsPattern* secondary_pattern);
 
 base::Value* GetContentSettingValue(
     const ProviderInterface* provider,