chrome/browser/notifications/notification_browsertest.cc - Issue 802753002: Revert of "Call the Close() event on a Notification when it's being replaced."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/notification_browsertest.cc

Issue 802753002: Revert of "Call the Close() event on a Notification when it's being replaced." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/notifications/message_center_notifications_browsertest.cc ('k') | chrome/test/data/notifications/notification_tester.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_browsertest.cc

diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc

index 7f9a3f21427cbd05acd21e2ff182632da0a7dcec..36262e5449f9ec1a2e4ab138826af39766f8ebba 100644

--- a/chrome/browser/notifications/notification_browsertest.cc

+++ b/chrome/browser/notifications/notification_browsertest.cc

@@ -765,15 +765,15 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) {

ui_test_utils::NavigateToURL(browser(), GetTestPageURL());

- std::string original_result = CreateNotification(

+ std::string result = CreateNotification(

browser(), true, "abc.png", "Title1", "Body1", "chat");

- EXPECT_NE("-1", original_result);

+ EXPECT_NE("-1", result);

ASSERT_EQ(1, GetNotificationCount());

- std::string replaced_result = CreateNotification(

+ result = CreateNotification(

browser(), false, "no_such_file.png", "Title2", "Body2", "chat");

- EXPECT_NE("-1", replaced_result);

+ EXPECT_NE("-1", result);

ASSERT_EQ(1, GetNotificationCount());

message_center::NotificationList::Notifications notifications =

@@ -781,15 +781,6 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) {

EXPECT_EQ(base::ASCIIToUTF16("Title2"), (*notifications.rbegin())->title());

EXPECT_EQ(base::ASCIIToUTF16("Body2"),

(*notifications.rbegin())->message());

- std::string result;

- bool success = content::ExecuteScriptAndExtractString(

- browser()->tab_strip_model()->GetActiveWebContents(),

- std::string("hasBeenClosed(") + original_result + ");",

- &result);

- EXPECT_TRUE(success);

- EXPECT_EQ(result, "true");

}

IN_PROC_BROWSER_TEST_F(NotificationsTest, TestLastUsage) {