Take script URLs into account when applying script content settings.

chrome/common/content_settings.h

Index: chrome/common/content_settings.h
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h
index ec500b6eda75ca928cd30296f27b45844dadc7b6..6e015ee87afedf560901b8db14263463639131f1 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