chrome/browser/ui/startup/startup_browser_creator_browsertest.cc - Issue 190063006: Infobar Componentization Proof of Concept

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/ui/startup/startup_browser_creator_browsertest.cc

Issue 190063006: Infobar Componentization Proof of Concept (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: minor fixes Created 6 years, 9 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

« chrome/browser/infobars/infobars_browsertest.cc ('K') | « chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

index 884a70964339ad76ea43798ed06bf9e18b07f1a4..eb172a11f194fe11dc59dc4fd7a6a478ff5aaaa0 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/launch_util.h"

#include "chrome/browser/first_run/first_run.h"

+#include "chrome/browser/infobars/infobar_manager.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"

#include "chrome/browser/managed_mode/managed_user_service.h"

@@ -939,7 +940,9 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {

content::WebContents* web_contents = tab_strip->GetWebContentsAt(0);

EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());

EXPECT_EQ(1U,

- InfoBarService::FromWebContents(web_contents)->infobar_count());

+ InfoBarService::FromWebContents(web_contents)

+ ->infobar_manager()

+ .infobar_count());

// The profile which normally opens last open pages displays the new tab page.

ASSERT_EQ(1u, chrome::GetBrowserCount(profile_last,

@@ -951,7 +954,9 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {

web_contents = tab_strip->GetWebContentsAt(0);

EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());

EXPECT_EQ(1U,

- InfoBarService::FromWebContents(web_contents)->infobar_count());

+ InfoBarService::FromWebContents(web_contents)

+ ->infobar_manager()

+ .infobar_count());

// The profile which normally opens URLs displays the new tab page.

ASSERT_EQ(1u, chrome::GetBrowserCount(profile_urls,

@@ -963,7 +968,9 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {

web_contents = tab_strip->GetWebContentsAt(0);

EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());

EXPECT_EQ(1U,

- InfoBarService::FromWebContents(web_contents)->infobar_count());

+ InfoBarService::FromWebContents(web_contents)

+ ->infobar_manager()

+ .infobar_count());

}

class ManagedModeBrowserCreatorTest : public InProcessBrowserTest {