chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc - Issue 1025503002: Use same base class for popup and plugin blocking UI

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

Issue 1025503002: Use same base class for popup and plugin blocking UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: msw comments Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('K') | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.h » ('j') | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

index 0b747901e1ebade0b9128a1c8cae352f837277c6..1bf2669a4fdb608691c0a12c8c60bcceebcd14ee 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -47,7 +47,7 @@ class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {

content_setting_bubble_model->bubble_content();

EXPECT_TRUE(bubble_content.title.empty());

EXPECT_TRUE(bubble_content.radio_group.radio_items.empty());

- EXPECT_TRUE(bubble_content.popup_items.empty());

+ EXPECT_TRUE(bubble_content.list_items.empty());

EXPECT_EQ(expected_domains, bubble_content.domain_lists.size());

EXPECT_NE(expect_clear_link || expect_reload_hint,

bubble_content.custom_link.empty());

@@ -96,7 +96,6 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {

content_setting_bubble_model->bubble_content();

std::string title = bubble_content.title;

EXPECT_FALSE(title.empty());

- EXPECT_TRUE(bubble_content.plugin_names.empty());

ASSERT_EQ(2U, bubble_content.radio_group.radio_items.size());

std::string radio1 = bubble_content.radio_group.radio_items[0];

std::string radio2 = bubble_content.radio_group.radio_items[1];

@@ -742,9 +741,9 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) {

const ContentSettingBubbleModel::BubbleContent& bubble_content =

content_setting_bubble_model->bubble_content();

EXPECT_FALSE(bubble_content.title.empty());

- EXPECT_FALSE(bubble_content.plugin_names.empty());

- EXPECT_NE(base::string16::npos,

- bubble_content.plugin_names.find(plugin_name));

+ EXPECT_EQ(1U, bubble_content.list_items.size());

Bernhard Bauer 2015/03/23 22:30:46 ASSERT so you fail somewhat gracefully instead of

meacer 2015/03/23 23:44:46 Done.

+ EXPECT_EQ(plugin_name,

+ base::ASCIIToUTF16(bubble_content.list_items[0].title));

EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());

EXPECT_FALSE(bubble_content.custom_link.empty());

EXPECT_TRUE(bubble_content.custom_link_enabled);

@@ -860,7 +859,7 @@ TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {

content_setting_bubble_model.bubble_content();

EXPECT_FALSE(bubble_content.title.empty());

EXPECT_FALSE(bubble_content.radio_group.radio_items.empty());

- EXPECT_TRUE(bubble_content.popup_items.empty());

+ EXPECT_TRUE(bubble_content.list_items.empty());

EXPECT_TRUE(bubble_content.domain_lists.empty());

EXPECT_TRUE(bubble_content.custom_link.empty());

EXPECT_FALSE(bubble_content.custom_link_enabled);