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

chrome/renderer/content_settings_observer.h

 // 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.
 
 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 19 matching lines @@
 
   // Sets the content setting rules which back |AllowImage()|, |AllowScript()|,
   // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this
   // |ContentSettingsObserver|.
   void SetContentSettingRules(
       const RendererContentSettingRules* content_setting_rules);
 
   bool IsPluginTemporarilyAllowed(const std::string& identifier);
 
   // Sends an IPC notification that the specified content type was blocked.
-  // If the content type requires it, |resource_identifier| names the specific
-  // resource that was blocked (the plugin path in the case of plugins),
-  // otherwise it's the empty string.
-  void DidBlockContentType(ContentSettingsType settings_type,
-                           const std::string& resource_identifier);
+  void DidBlockContentType(ContentSettingsType settings_type);
 
   // These correspond to blink::WebPermissionClient methods.
   bool AllowDatabase(blink::WebFrame* frame,
                      const blink::WebString& name,
                      const blink::WebString& display_name,
                      unsigned long estimated_size);
   bool AllowFileSystem(blink::WebFrame* frame);
   bool AllowImage(blink::WebFrame* frame,
                   bool enabled_per_settings,
                   const blink::WebURL& image_url);
@@ skipping 56 matching lines @@
   std::map<blink::WebFrame*, bool> cached_script_permissions_;
 
   std::set<std::string> temporarily_allowed_plugins_;
   bool is_interstitial_page_;
   bool npapi_plugins_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_