Revert 109036 (speculative; seems to cause increased worker test flakiness) - 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.

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


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109005

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

TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8499023

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

3 files changed, 3 insertions, 20 deletions

diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc
index de814d9..2338507 100644
--- a/chrome/browser/content_settings/content_settings_utils.cc
+++ b/chrome/browser/content_settings/content_settings_utils.cc
@@ -14,10 +14,8 @@
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
-#include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ -196,12 +194,4 @@ ContentSetting GetContentSetting(const ProviderInterface* provider,
   return ValueToContentSetting(value.get());
 }
 
-void GetRendererContentSettingRules(const HostContentSettingsMap* map,
-                                    RendererContentSettingRules* rules) {
-  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "",
-                             &(rules->image_rules));
-  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "",
-                             &(rules->script_rules));
-}
-
 }  // namespace content_settings
diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h
index 4b0e81b..4fae58c 100644
--- a/chrome/browser/content_settings/content_settings_utils.h
+++ b/chrome/browser/content_settings/content_settings_utils.h
@@ -17,7 +17,6 @@ class Value;
 }
 
 class GURL;
-class HostContentSettingsMap;
 
 namespace content_settings {
 
@@ -86,11 +85,6 @@ ContentSetting GetContentSetting(
     const std::string& resource_identifier,
     bool include_incognito);
 
-// Populates |rules| with content setting rules for content types that are
-// handled by the renderer.
-void GetRendererContentSettingRules(const HostContentSettingsMap* map,
-                                    RendererContentSettingRules* rules);
-
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 91948d5..bee8f69 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
-#include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
@@ -491,9 +490,9 @@ void TabSpecificContentSettings::Observe(
         map->GetDefaultContentSettings()));
     Send(new ChromeViewMsg_SetContentSettingsForCurrentURL(
         entry_url, map->GetContentSettings(entry_url)));
-    RendererContentSettingRules rules;
-    GetRendererContentSettingRules(map, &rules);
-    Send(new ChromeViewMsg_SetContentSettingRules(rules));
+    ContentSettingsForOneType settings;
+    map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
+    Send(new ChromeViewMsg_SetImageSettingRules(settings));
   }
 }