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

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc

Issue 2262223002: Material Page Info (all desktop): Introduce new strings and styling info for the security section. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move tests from followup CL into this one. 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/app/generated_resources.grd ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
index a859424438b410d8276e5154dd8b3d85139f100a..416ae661ef6da2880da6282c9c335f11390e9ebd 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
@@ -191,29 +191,25 @@ TEST_F(WebsiteSettingsPopupViewTest, MAYBE_SetPermissionInfo) {
views::Label* label =
static_cast<views::Label*>(selector->child_at(kLabelIndex));
EXPECT_EQ(base::ASCIIToUTF16("Location:"), label->text());
- EXPECT_EQ(base::ASCIIToUTF16("Allowed by you"),
- api_->GetPermissionButtonTextAt(0));
+ EXPECT_EQ(base::ASCIIToUTF16("Allow"), api_->GetPermissionButtonTextAt(0));
// Verify calling SetPermisisonInfo() directly updates the UI.
list.back().setting = CONTENT_SETTING_BLOCK;
api_->SetPermissionInfo(list);
- EXPECT_EQ(base::ASCIIToUTF16("Blocked by you"),
- api_->GetPermissionButtonTextAt(0));
+ EXPECT_EQ(base::ASCIIToUTF16("Block"), api_->GetPermissionButtonTextAt(0));
// Simulate a user selection via the UI. Note this will also cover logic in
// WebsiteSettings to update the pref.
list.back().setting = CONTENT_SETTING_ALLOW;
api_->GetPermissionSelectorAt(0)->PermissionChanged(list.back());
EXPECT_EQ(kExpectedChildren, api_->permissions_content()->child_count());
- EXPECT_EQ(base::ASCIIToUTF16("Allowed by you"),
- api_->GetPermissionButtonTextAt(0));
+ EXPECT_EQ(base::ASCIIToUTF16("Allow"), api_->GetPermissionButtonTextAt(0));
// Setting to the default via the UI should keep the button around.
list.back().setting = CONTENT_SETTING_ASK;
api_->GetPermissionSelectorAt(0)->PermissionChanged(list.back());
EXPECT_EQ(kExpectedChildren, api_->permissions_content()->child_count());
- EXPECT_EQ(base::ASCIIToUTF16("Ask by you"),
- api_->GetPermissionButtonTextAt(0));
+ EXPECT_EQ(base::ASCIIToUTF16("Ask"), api_->GetPermissionButtonTextAt(0));
// However, since the setting is now default, recreating the dialog with those
// settings should omit the permission from the UI.
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698