Reland 55888: Allow per-plugin content settings.

Now with Fixed Unit Tests!

Run with --enable-resource-content-settings and --enable-click-to-play to enable.

TabSpecificContentSettings now keeps track of which resources were blocked. The content setting bubble displays those resource, and selecting the "allow radio buttons adds exceptions for these resources.

The infobar for non-sandboxed plug-ins now also shows a button to always allow the blocked plug-in on that site.

Screenshot of the plugin bubble: http://imgur.com/6npqv.png

Because we need to change the title and radio button labels depending on whether we track specific plug-ins, we copy them from the ContentSettingBubbleModel.

XIB changes: Add a text field for the blocked plug-ins to ContentBlockedPlugins.xib, hooked up to the |blockedResourcesField_| outlet.

BUG=39252,38432
TEST=HostContentSettingsMapTest.*,manual

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

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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index d94ae8d..65835d9 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -597,7 +597,8 @@ class RenderViewHost : public RenderWidgetHost {
 
   void OnUserMetricsRecordAction(const std::string& action);
   void OnMissingPluginStatus(int status);
-  void OnNonSandboxedPluginBlocked(const string16& name);
+  void OnNonSandboxedPluginBlocked(const std::string& plugin,
+                                   const string16& name);
   void OnBlockedPluginLoaded();
   void OnCrashedPlugin(const FilePath& plugin_path);
   void OnDisabledOutdatedPlugin(const string16& name, const GURL& update_url);
@@ -649,7 +650,8 @@ class RenderViewHost : public RenderWidgetHost {
                         const std::string& original_lang,
                         const std::string& translated_lang,
                         TranslateErrors::Type error_type);
-  void OnContentBlocked(ContentSettingsType type);
+  void OnContentBlocked(ContentSettingsType type,
+                        const std::string& resource_identifier);
   void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy);
   void OnWebDatabaseAccessed(const GURL& url,
                              const string16& name,