Take script URLs into account when applying script content settings.

chrome/renderer/chrome_render_process_observer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_render_process_observer.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 249 matching lines @@
 bool ChromeRenderProcessObserver::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderProcessObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess,
                         OnSetIsIncognitoProcess)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetDefaultContentSettings,
                         OnSetDefaultContentSettings)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingsForCurrentURL,
                         OnSetContentSettingsForCurrentURL)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetImageSettingRules,
-                        OnSetImageSettingRules)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
+                        OnSetContentSettingRules)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetCacheCapacities, OnSetCacheCapacities)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ClearCache, OnClearCache)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
 #if defined(USE_TCMALLOC)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_GetRendererTcmalloc,
                         OnGetRendererTcmalloc)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetTcmallocHeapProfiling,
                         OnSetTcmallocHeapProfiling)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_WriteTcmallocHeapProfile,
                         OnWriteTcmallocHeapProfile)
@@ skipping 21 matching lines @@
     const ContentSettings& content_settings) {
   RenderViewContentSettingsSetter setter(url, content_settings);
   content::RenderView::ForEach(&setter);
 }
 
 void ChromeRenderProcessObserver::OnSetDefaultContentSettings(
     const ContentSettings& content_settings) {
   default_content_settings_ = content_settings;
 }
 
-void ChromeRenderProcessObserver::OnSetImageSettingRules(
-    const ContentSettingsForOneType& settings) {
-  image_setting_rules_ = settings;
+void ChromeRenderProcessObserver::OnSetContentSettingRules(
+    const RendererContentSettingRules& rules) {
+  content_setting_rules_ = rules;
 }
 
 void ChromeRenderProcessObserver::OnSetCacheCapacities(size_t min_dead_capacity,
                                                        size_t max_dead_capacity,
                                                        size_t capacity) {
   WebCache::setCapacities(
       min_dead_capacity, max_dead_capacity, capacity);
 }
 
 void ChromeRenderProcessObserver::OnClearCache(bool on_navigation) {
@@ skipping 97 matching lines @@
     client_->OnPurgeMemory();
 }
 
 void ChromeRenderProcessObserver::ExecutePendingClearCache() {
   if (clear_cache_pending_) {
     clear_cache_pending_ = false;
     WebCache::clear();
   }
 }
 
-const ContentSettingsForOneType*
-ChromeRenderProcessObserver::image_setting_rules() const {
-  return &image_setting_rules_;
+const RendererContentSettingRules*
+ChromeRenderProcessObserver::content_setting_rules() const {
+  return &content_setting_rules_;
 }
 
 const ContentSettings*
 ChromeRenderProcessObserver::default_content_settings() const {
   return &default_content_settings_;
 }