chrome/browser/notifications/notification_browsertest.cc - Issue 14241006: Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

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 14241006: Eliminate InfoBarTabHelper. Make InfoBarService a concrete class. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 8 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/media/media_stream_infobar_delegate.cc ('k') | chrome/browser/password_manager/password_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_browsertest.cc

===================================================================

--- chrome/browser/notifications/notification_browsertest.cc (revision 195254)

+++ chrome/browser/notifications/notification_browsertest.cc (working copy)

@@ -344,8 +344,8 @@

InfoBarService* infobar_service = InfoBarService::FromWebContents(

browser->tab_strip_model()->GetWebContentsAt(index));

- ASSERT_EQ(1U, infobar_service->GetInfoBarCount());

- InfoBarDelegate* infobar = infobar_service->GetInfoBarDelegateAt(0);

+ ASSERT_EQ(1U, infobar_service->infobar_count());

+ InfoBarDelegate* infobar = infobar_service->infobar_at(0);

ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate();

ASSERT_TRUE(confirm_infobar);

int buttons = confirm_infobar->GetButtons();

@@ -428,8 +428,7 @@

InfoBarService* infobar_service = InfoBarService::FromWebContents(

browser->tab_strip_model()->GetWebContentsAt(tab_index));

- InfoBarDelegate* infobar =

- infobar_service->GetInfoBarDelegateAt(infobar_index);

+ InfoBarDelegate* infobar = infobar_service->infobar_at(infobar_index);

switch (action) {

case DISMISS:

infobar->InfoBarDismissed();

@@ -510,7 +509,7 @@

EXPECT_TRUE(result);

EXPECT_EQ(1U, InfoBarService::FromWebContents(

- browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());

+ browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());

}

// If this flakes, use http://crbug.com/62311.

@@ -523,7 +522,7 @@

"files/notifications/notifications_request_inline.html"));

EXPECT_EQ(0U, InfoBarService::FromWebContents(

- browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());

+ browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());

}

IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {

@@ -675,7 +674,7 @@

ASSERT_EQ(1, GetNotificationCount());

EXPECT_EQ(0U, InfoBarService::FromWebContents(

- browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());

+ browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());

}

IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyNotificationsFromAllSites) {

@@ -744,7 +743,7 @@

ASSERT_EQ(1, GetNotificationCount());

EXPECT_EQ(0U, InfoBarService::FromWebContents(

- browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());

+ browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());

}

IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateDenyCloseNotifications) {