chrome/browser/chromeos/offline/offline_load_page_unittest.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/chromeos/offline/offline_load_page_unittest.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/chromeos/memory/oom_priority_manager_browsertest.cc ('k') | chrome/browser/chromeos/policy/consumer_management_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/offline/offline_load_page_unittest.cc

diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc

index c94534a0b1da214624c0ea38353794b28469ec90..f07205ef213454724aa14871db3fd4aa61db7f36 100644

--- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc

+++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc

@@ -64,7 +64,7 @@ class OfflineLoadPageTest : public ChromeRenderViewHostTestHarness {

void Navigate(const char* url, int page_id) {

WebContentsTester::For(web_contents())->TestDidNavigate(

web_contents()->GetMainFrame(), page_id, GURL(url),

- content::PAGE_TRANSITION_TYPED);

+ ui::PAGE_TRANSITION_TYPED);

}

void ShowInterstitial(const char* url) {

@@ -94,7 +94,7 @@ TEST_F(OfflineLoadPageTest, OfflinePageProceed) {

Navigate(kURL1, 1);

// Load next page.

controller().LoadURL(GURL(kURL2), content::Referrer(),

- content::PAGE_TRANSITION_TYPED, std::string());

+ ui::PAGE_TRANSITION_TYPED, std::string());

// Simulate the load causing an offline browsing interstitial page

// to be shown.

@@ -122,7 +122,7 @@ TEST_F(OfflineLoadPageTest, OfflinePageDontProceed) {

// Start a load.

Navigate(kURL1, 1);

controller().LoadURL(GURL(kURL2), content::Referrer(),

- content::PAGE_TRANSITION_TYPED, std::string());

+ ui::PAGE_TRANSITION_TYPED, std::string());

// Simulate the load causing an offline interstitial page to be shown.

ShowInterstitial(kURL2);