Take script URLs into account when applying script content settings.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 032bfce1260ab62f600e0b4d960e48d52e2cb752..13f55be82b681753e89f78d38ca0eccf41ba8cfe 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/chrome_plugin_message_filter.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
 #include "chrome/browser/chrome_worker_message_filter.h"
+#include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/download/download_util.h"
@@ -290,10 +291,10 @@ void ChromeContentBrowserClient::BrowserRenderProcessHostCreated(
       profile->IsOffTheRecord()));
 
   SendExtensionWebRequestStatusToHost(host);
-  ContentSettingsForOneType settings;
-  HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
-  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
-  host->Send(new ChromeViewMsg_SetImageSettingRules(settings));
+
+  const HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
+  SendContentSettingRules(map, CONTENT_SETTINGS_TYPE_IMAGES, host);
+  SendContentSettingRules(map, CONTENT_SETTINGS_TYPE_JAVASCRIPT, host);
 }
 
 void ChromeContentBrowserClient::PluginProcessHostCreated(