chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc - Issue 12315094: Remove kDefaultHostDesktopType from browser_finder.cc.

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_interactive_uitest.cc

Issue 12315094: Remove kDefaultHostDesktopType from browser_finder.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix StartupBrowserCreatorTest.ProfilesWithoutPagesNotLaunched Created 7 years, 10 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/startup/startup_browser_creator_browsertest.cc ('k') | chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 77da246fb22ee529db8ca3e12477707d222ff4f6..bf3a31ffe6e1b5b2d933852fb4767e17a6e843d1 100644

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

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

@@ -76,28 +76,32 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, LastUsedProfileActivated) {

Browser* new_browser = NULL;

// The last used profile (the profile_2 in this case) must be active.

- ASSERT_EQ(1u, chrome::GetBrowserCount(profile_2));

+ ASSERT_EQ(1u, chrome::GetBrowserCount(profile_2,

+ browser()->host_desktop_type()));

new_browser = FindBrowserWithProfile(profile_2,

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ browser()->host_desktop_type());

ASSERT_TRUE(new_browser);

EXPECT_TRUE(new_browser->window()->IsActive());

// All other profiles browser should not be active.

- ASSERT_EQ(1u, chrome::GetBrowserCount(profile_1));

+ ASSERT_EQ(1u, chrome::GetBrowserCount(profile_1,

+ browser()->host_desktop_type()));

new_browser = FindBrowserWithProfile(profile_1,

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ browser()->host_desktop_type());

ASSERT_TRUE(new_browser);

EXPECT_FALSE(new_browser->window()->IsActive());

- ASSERT_EQ(1u, chrome::GetBrowserCount(profile_3));

+ ASSERT_EQ(1u, chrome::GetBrowserCount(profile_3,

+ browser()->host_desktop_type()));

new_browser = FindBrowserWithProfile(profile_3,

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ browser()->host_desktop_type());

ASSERT_TRUE(new_browser);

EXPECT_FALSE(new_browser->window()->IsActive());

- ASSERT_EQ(1u, chrome::GetBrowserCount(profile_4));

+ ASSERT_EQ(1u, chrome::GetBrowserCount(profile_4,

+ browser()->host_desktop_type()));

new_browser = FindBrowserWithProfile(profile_4,

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ browser()->host_desktop_type());

ASSERT_TRUE(new_browser);

EXPECT_FALSE(new_browser->window()->IsActive());