Take script URLs into account when applying script content settings.

Transmit script content settings to the renderer. Use the script URL as the secondary URL 
for the content setting rules. 

This CL contains the functionality of the following 2 CLs, hopefully without performance
regressions:
http://codereview.chromium.org/8409006
http://codereview.chromium.org/8498007

BUG=90840
TEST=ChromeRenderViewTest.ContentSettings(Allow|Block)Scripts


Review URL: http://codereview.chromium.org/8538004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110286 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h
index ec500b6..6e015ee 100644
--- a/chrome/common/content_settings.h
+++ b/chrome/common/content_settings.h
@@ -27,14 +27,6 @@ enum ContentSetting {
 // prefs off disk.
 ContentSetting IntToContentSetting(int content_setting);
 
-// Aggregates the permissions for the different content types.
-struct ContentSettings {
-  ContentSettings();
-  explicit ContentSettings(ContentSetting default_setting);
-
-  ContentSetting settings[CONTENT_SETTINGS_NUM_TYPES];
-};
-
 struct ContentSettingPatternSource {
   ContentSettingPatternSource(const ContentSettingsPattern& primary_pattern,
                               const ContentSettingsPattern& secondary_patttern,
@@ -51,6 +43,13 @@ struct ContentSettingPatternSource {
 
 typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
 
+struct RendererContentSettingRules {
+  RendererContentSettingRules();
+  ~RendererContentSettingRules();
+  ContentSettingsForOneType image_rules;
+  ContentSettingsForOneType script_rules;
+};
+
 namespace content_settings {
 
 // Enum containing the various source for content settings. Settings can be