chrome/browser/captive_portal/captive_portal_browsertest.cc - Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser.

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/captive_portal/captive_portal_browsertest.cc

Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-review pass. Created 8 years, 2 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/bookmarks/bookmark_browsertest.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.h » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc

diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc

index f002f6c7c7a49d7530dd63113682b661ed18b64b..ba36a60c5c4858c867196bf1d6a3b2496701c7ab 100644

--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc

+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc

@@ -2057,7 +2057,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {

// when running multiple tests at once, the original browser window may

// remain the profile's active window.

Browser* active_browser =

- browser::FindTabbedBrowser(browser()->profile(), true);

+ browser::FindTabbedBrowser(browser()->profile(), true,

+ browser()->host_desktop_type());

Browser* inactive_browser;

if (active_browser == browser2) {

// When only one test is running at a time, the new browser will probably be

@@ -2086,7 +2087,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {

// Make sure the active window hasn't changed, and its new tab is

// active.

ASSERT_EQ(active_browser,

- browser::FindTabbedBrowser(browser()->profile(), true));

+ browser::FindTabbedBrowser(browser()->profile(), true,

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

ASSERT_EQ(1, active_browser->active_index());

// Check that the only two navigated tabs were the new error tab in the