Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6608)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2339783003: Make 'Load full site' a button instead of link. (Closed)
Patch Set: . Created 4 years, 3 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
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 f198b115ab4fdd08b6e3234027edb24e336e96b2..ed0b57ae9606a83a515ce25a4871662a858a4abe 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
@@ -56,7 +56,7 @@ class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {
EXPECT_NE(expect_clear_link || expect_reload_hint,
bubble_content.custom_link.empty());
EXPECT_EQ(expect_clear_link, bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
}
std::string GetDefaultAudioDevice() {
@@ -84,7 +84,7 @@ TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
EXPECT_EQ(0, bubble_content.radio_group.default_item);
EXPECT_TRUE(bubble_content.custom_link.empty());
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
}
TEST_F(ContentSettingBubbleModelTest, Cookies) {
@@ -102,7 +102,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
ASSERT_EQ(2U, bubble_content.radio_group.radio_items.size());
EXPECT_FALSE(bubble_content.custom_link.empty());
EXPECT_TRUE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
content_settings->ClearCookieSpecificContentSettings();
content_settings->OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES);
@@ -124,7 +124,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
web_contents()->GetURL())));
EXPECT_FALSE(bubble_content_2.custom_link.empty());
EXPECT_TRUE(bubble_content_2.custom_link_enabled);
- EXPECT_FALSE(bubble_content_2.manage_link.empty());
+ EXPECT_FALSE(bubble_content_2.manage_text.empty());
}
TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
@@ -164,7 +164,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
EXPECT_EQ(0, bubble_content.radio_group.default_item);
EXPECT_TRUE(bubble_content.custom_link.empty());
EXPECT_FALSE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
EXPECT_EQ(2U, bubble_content.media_menus.size());
}
@@ -523,7 +523,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
EXPECT_EQ(0, bubble_content.radio_group.default_item);
EXPECT_TRUE(bubble_content.custom_link.empty());
EXPECT_FALSE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
EXPECT_EQ(1U, bubble_content.media_menus.size());
EXPECT_EQ(content::MEDIA_DEVICE_AUDIO_CAPTURE,
bubble_content.media_menus.begin()->first);
@@ -554,7 +554,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
EXPECT_EQ(1, new_bubble_content.radio_group.default_item);
EXPECT_TRUE(new_bubble_content.custom_link.empty());
EXPECT_FALSE(new_bubble_content.custom_link_enabled);
- EXPECT_FALSE(new_bubble_content.manage_link.empty());
+ EXPECT_FALSE(new_bubble_content.manage_text.empty());
EXPECT_EQ(1U, new_bubble_content.media_menus.size());
EXPECT_EQ(content::MEDIA_DEVICE_AUDIO_CAPTURE,
new_bubble_content.media_menus.begin()->first);
@@ -596,7 +596,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
EXPECT_EQ(0, bubble_content.radio_group.default_item);
EXPECT_TRUE(bubble_content.custom_link.empty());
EXPECT_FALSE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
EXPECT_EQ(1U, bubble_content.media_menus.size());
EXPECT_EQ(content::MEDIA_DEVICE_VIDEO_CAPTURE,
bubble_content.media_menus.begin()->first);
@@ -627,7 +627,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
EXPECT_EQ(1, new_bubble_content.radio_group.default_item);
EXPECT_TRUE(new_bubble_content.custom_link.empty());
EXPECT_FALSE(new_bubble_content.custom_link_enabled);
- EXPECT_FALSE(new_bubble_content.manage_link.empty());
+ EXPECT_FALSE(new_bubble_content.manage_text.empty());
EXPECT_EQ(1U, new_bubble_content.media_menus.size());
EXPECT_EQ(content::MEDIA_DEVICE_VIDEO_CAPTURE,
new_bubble_content.media_menus.begin()->first);
@@ -721,7 +721,7 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) {
EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
EXPECT_FALSE(bubble_content.custom_link.empty());
EXPECT_TRUE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
EXPECT_FALSE(bubble_content.learn_more_link.empty());
}
@@ -742,7 +742,7 @@ TEST_F(ContentSettingBubbleModelTest, PepperBroker) {
std::string radio1 = bubble_content.radio_group.radio_items[0];
std::string radio2 = bubble_content.radio_group.radio_items[1];
EXPECT_FALSE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
content_settings->ClearBlockedContentSettingsExceptForCookies();
content_settings->OnContentAllowed(CONTENT_SETTINGS_TYPE_PPAPI_BROKER);
@@ -759,7 +759,7 @@ TEST_F(ContentSettingBubbleModelTest, PepperBroker) {
EXPECT_NE(radio1, bubble_content_2.radio_group.radio_items[0]);
EXPECT_NE(radio2, bubble_content_2.radio_group.radio_items[1]);
EXPECT_FALSE(bubble_content_2.custom_link_enabled);
- EXPECT_FALSE(bubble_content_2.manage_link.empty());
+ EXPECT_FALSE(bubble_content_2.manage_text.empty());
}
TEST_F(ContentSettingBubbleModelTest, Geolocation) {
@@ -831,7 +831,7 @@ TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {
EXPECT_TRUE(bubble_content.domain_lists.empty());
EXPECT_TRUE(bubble_content.custom_link.empty());
EXPECT_FALSE(bubble_content.custom_link_enabled);
- EXPECT_FALSE(bubble_content.manage_link.empty());
+ EXPECT_FALSE(bubble_content.manage_text.empty());
}
class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
@@ -937,7 +937,7 @@ TEST_F(ContentSettingBubbleModelTest, SubresourceFilter) {
EXPECT_TRUE(bubble_content.custom_link.empty());
EXPECT_FALSE(bubble_content.custom_link_enabled);
EXPECT_EQ(
- bubble_content.manage_link,
+ bubble_content.manage_text,
l10n_util::GetStringUTF8(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD));
EXPECT_EQ(0U, bubble_content.media_menus.size());
}
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698