Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

chrome/renderer/content_settings_observer.cc

 // Copyright (c) 2012 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/content_settings_observer.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ skipping 78 matching lines @@
     const std::string& identifier) {
   // If the empty string is in here, it means all plug-ins are allowed.
   // TODO(bauerb): Remove this once we only pass in explicit identifiers.
   return (temporarily_allowed_plugins_.find(identifier) !=
           temporarily_allowed_plugins_.end()) ||
          (temporarily_allowed_plugins_.find(std::string()) !=
           temporarily_allowed_plugins_.end());
 }
 
 void ContentSettingsObserver::DidBlockContentType(
-    ContentSettingsType settings_type,
-    const std::string& resource_identifier) {
-  // Always send a message when |resource_identifier| is not empty, to tell the
-  // browser which resource was blocked (otherwise the browser will only show
-  // the first resource to be blocked, and none that are blocked at a later
-  // time).
-  if (!content_blocked_[settings_type] || !resource_identifier.empty()) {
+    ContentSettingsType settings_type) {
+  if (!content_blocked_[settings_type]) {
     content_blocked_[settings_type] = true;
-    Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type,
-                                              resource_identifier));
+    Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type));
   }
 }
 
 bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ContentSettingsObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAsInterstitial, OnSetAsInterstitial)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   if (handled)
@@ skipping 72 matching lines @@
       return true;
 
     if (content_setting_rules_) {
       GURL secondary_url(image_url);
       allow = GetContentSettingFromRules(
           content_setting_rules_->image_rules,
           frame, secondary_url) != CONTENT_SETTING_BLOCK;
     }
   }
   if (!allow)
-    DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES, std::string());
+    DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES);
   return allow;
 }
 
 bool ContentSettingsObserver::AllowIndexedDB(WebFrame* frame,
                                              const WebString& name,
                                              const WebSecurityOrigin& origin) {
   if (frame->document().securityOrigin().isUnique() ||
       frame->top()->document().securityOrigin().isUnique())
     return false;
 
@@ skipping 74 matching lines @@
 
   Send(new ChromeViewHostMsg_AllowDOMStorage(
       routing_id(), GURL(frame->document().securityOrigin().toString()),
       GURL(frame->top()->document().securityOrigin().toString()),
       local, &result));
   cached_storage_permissions_[key] = result;
   return result;
 }
 
 void ContentSettingsObserver::DidNotAllowPlugins() {
-  DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
+  DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
 }
 
 void ContentSettingsObserver::DidNotAllowScript() {
-  DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string());
+  DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
 
 void ContentSettingsObserver::DidNotAllowMixedScript() {
-  DidBlockContentType(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, std::string());
+  DidBlockContentType(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT);
 }
 
 void ContentSettingsObserver::BlockNPAPIPlugins() {
   npapi_plugins_blocked_ = true;
 }
 
 bool ContentSettingsObserver::AreNPAPIPluginsBlocked() const {
   return npapi_plugins_blocked_;
 }
 
@@ skipping 57 matching lines @@
 
   // If the scheme is file:, an empty file name indicates a directory listing,
   // which requires JavaScript to function properly.
   if (EqualsASCII(origin.protocol(), chrome::kFileScheme)) {
     return document_url.SchemeIs(chrome::kFileScheme) &&
            document_url.ExtractFileName().empty();
   }
 
   return false;
 }