Add the names of plugins to the blocked plugin bubble.

chrome/renderer/content_settings_observer_browsertest.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 "components/content_settings/core/common/content_settings.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using testing::_;
 using testing::DeleteArg;
 
 namespace {
 
 class MockContentSettingsObserver : public ContentSettingsObserver {
  public:
   explicit MockContentSettingsObserver(content::RenderFrame* render_frame);
 
   virtual bool Send(IPC::Message* message);
 
-  MOCK_METHOD1(OnContentBlocked,
-               void(ContentSettingsType));
+  MOCK_METHOD2(OnContentBlocked,
+               void(ContentSettingsType, const base::string16&));
 
   MOCK_METHOD5(OnAllowDOMStorage,
                void(int, const GURL&, const GURL&, bool, IPC::Message*));
   GURL image_url_;
   std::string image_origin_;
 };
 
 MockContentSettingsObserver::MockContentSettingsObserver(
     content::RenderFrame* render_frame)
     : ContentSettingsObserver(render_frame, NULL),
@@ skipping 10 matching lines @@
   IPC_END_MESSAGE_MAP()
 
   // Our super class deletes the message.
   return RenderFrameObserver::Send(message);
 }
 
 }  // namespace
 
 TEST_F(ChromeRenderViewTest, DidBlockContentType) {
   MockContentSettingsObserver observer(view_->GetMainRenderFrame());
-  EXPECT_CALL(observer,
-              OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
+  EXPECT_CALL(observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES,
+                                         base::string16()));
   observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_COOKIES);
 
   // Blocking the same content type a second time shouldn't send a notification.
   observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_COOKIES);
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Tests that multiple invokations of AllowDOMStorage result in a single IPC.
 // Fails due to http://crbug.com/104300
 TEST_F(ChromeRenderViewTest, DISABLED_AllowDOMStorage) {
@@ skipping 112 matching lines @@
       ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
                                   ContentSettingsPattern::Wildcard(),
                                   CONTENT_SETTING_BLOCK,
                                   std::string(),
                                   false));
 
   ContentSettingsObserver* observer = ContentSettingsObserver::Get(
       view_->GetMainRenderFrame());
   observer->SetContentSettingRules(&content_setting_rules);
   EXPECT_CALL(mock_observer,
-              OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
+              OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES, base::string16()));
   EXPECT_FALSE(observer->allowImage(true, mock_observer.image_url_));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 
   // Create an exception which allows the image.
   image_setting_rules.insert(
       image_setting_rules.begin(),
       ContentSettingPatternSource(
           ContentSettingsPattern::Wildcard(),
           ContentSettingsPattern::FromString(mock_observer.image_origin_),
           CONTENT_SETTING_ALLOW,
           std::string(),
           false));
 
-  EXPECT_CALL(
-      mock_observer,
-      OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)).Times(0);
+  EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
+                                              base::string16())).Times(0);
   EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 }
 
 TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) {
   MockContentSettingsObserver mock_observer(view_->GetMainRenderFrame());
 
   // Load some HTML.
   LoadHTML("<html>Foo</html>");
 
   // Set the default image blocking setting.
   RendererContentSettingRules content_setting_rules;
   ContentSettingsForOneType& image_setting_rules =
       content_setting_rules.image_rules;
   image_setting_rules.push_back(
       ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
                                   ContentSettingsPattern::Wildcard(),
                                   CONTENT_SETTING_ALLOW,
                                   std::string(),
                                   false));
 
   ContentSettingsObserver* observer =
       ContentSettingsObserver::Get(view_->GetMainRenderFrame());
   observer->SetContentSettingRules(&content_setting_rules);
-  EXPECT_CALL(
-      mock_observer,
-      OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)).Times(0);
+  EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
+                                              base::string16())).Times(0);
   EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 
   // Create an exception which blocks the image.
   image_setting_rules.insert(
       image_setting_rules.begin(),
       ContentSettingPatternSource(
           ContentSettingsPattern::Wildcard(),
           ContentSettingsPattern::FromString(mock_observer.image_origin_),
           CONTENT_SETTING_BLOCK,
           std::string(),
           false));
   EXPECT_CALL(mock_observer,
-              OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
+              OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES, base::string16()));
   EXPECT_FALSE(observer->allowImage(true, mock_observer.image_url_));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 }
 
 TEST_F(ChromeRenderViewTest, ContentSettingsBlockScripts) {
   // Set the content settings for scripts.
   RendererContentSettingRules content_setting_rules;
   ContentSettingsForOneType& script_setting_rules =
       content_setting_rules.script_rules;
   script_setting_rules.push_back(
@@ skipping 103 matching lines @@
   // Verify that the script was allowed.
   bool was_blocked = false;
   for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
     const IPC::Message* msg = render_thread_->sink().GetMessageAt(i);
     if (msg->type() == ChromeViewHostMsg_ContentBlocked::ID)
       was_blocked = true;
   }
   EXPECT_FALSE(was_blocked);
 
   // Verify that images are allowed.
-  EXPECT_CALL(
-      mock_observer,
-      OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)).Times(0);
+  EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
+                                              base::string16())).Times(0);
   EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 }