chrome/browser/captive_portal/captive_portal_browsertest.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

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 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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/browsing_data/browsing_data_remover_unittest.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.h » ('j') | no next file with comments »
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 a3a454ebf1301fe2cfd97bf7284493b6677a80ee..24c98faddf8b139afe776e14ec7b60a3572cf130 100644

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

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

@@ -1515,7 +1515,7 @@ void CaptivePortalBrowserTest::RunNavigateLoadingTabToTimeoutTest(

browser->OpenURL(content::OpenURLParams(timeout_url,

content::Referrer(),

CURRENT_TAB,

- content::PAGE_TRANSITION_TYPED,

+ ui::PAGE_TRANSITION_TYPED,

false));

portal_observer.WaitForResults(1);

EXPECT_FALSE(CheckPending(browser));

@@ -2102,7 +2102,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {

// window.

chrome::NavigateParams params(inactive_browser,

GURL(kMockHttpsQuickTimeoutUrl),

- content::PAGE_TRANSITION_TYPED);

+ ui::PAGE_TRANSITION_TYPED);

params.disposition = NEW_BACKGROUND_TAB;

params.window_action = chrome::NavigateParams::NO_ACTION;

ui_test_utils::NavigateToURL(&params);