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

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

Issue 1150343004: Changing string id for CONTENT_SETTINGS_TYPE_COOKIES for block and allow case. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 years, 6 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') | no next file » | 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 961332f9d7ecc6da90ee4b189900f3600969b353..943693c9e5d7235d880139ad3fd643d07e23ed65 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
@@ -98,8 +98,6 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
std::string title = bubble_content.title;
EXPECT_FALSE(title.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];
EXPECT_FALSE(bubble_content.custom_link.empty());
EXPECT_TRUE(bubble_content.custom_link_enabled);
EXPECT_FALSE(bubble_content.manage_link.empty());
@@ -115,9 +113,14 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
EXPECT_FALSE(bubble_content_2.title.empty());
EXPECT_NE(title, bubble_content_2.title);
ASSERT_EQ(2U, bubble_content_2.radio_group.radio_items.size());
- // TODO(bauerb): Update this once the strings have been updated.
- EXPECT_EQ(radio1, bubble_content_2.radio_group.radio_items[0]);
- EXPECT_EQ(radio2, bubble_content_2.radio_group.radio_items[1]);
+ EXPECT_EQ(bubble_content_2.radio_group.radio_items[0],
+ l10n_util::GetStringUTF8(IDS_ALLOWED_COOKIES_NO_ACTION));
+ EXPECT_EQ(bubble_content_2.radio_group.radio_items[1],
+ l10n_util::GetStringFUTF8(
+ IDS_ALLOWED_COOKIES_BLOCK,
+ FormatUrlForSecurityDisplay(web_contents()->GetURL(),
+ profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_FALSE(bubble_content_2.custom_link.empty());
EXPECT_TRUE(bubble_content_2.custom_link_enabled);
EXPECT_FALSE(bubble_content_2.manage_link.empty());
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698