content/browser/renderer_host/render_view_host_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: content/browser/renderer_host/render_view_host_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 | « content/browser/renderer_host/render_view_host_delegate.h ('k') | content/browser/service_worker/service_worker_url_request_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_unittest.cc

diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc

index 927942bb5fe3ec576e3676131e1d2793c6a98e0a..b2cd8a8b6cc66f1daa7f94e0fa8b20f0b8015de1 100644

--- a/content/browser/renderer_host/render_view_host_unittest.cc

+++ b/content/browser/renderer_host/render_view_host_unittest.cc

@@ -15,7 +15,6 @@

#include "content/public/browser/navigation_entry.h"

#include "content/public/common/bindings_policy.h"

#include "content/public/common/drop_data.h"

-#include "content/public/common/page_transition_types.h"

#include "content/public/common/url_constants.h"

#include "content/public/test/mock_render_process_host.h"

#include "content/test/test_content_browser_client.h"

@@ -23,6 +22,7 @@

#include "content/test/test_web_contents.h"

#include "net/base/filename_util.h"

#include "third_party/WebKit/public/web/WebDragOperation.h"

+#include "ui/base/page_transition_types.h"

namespace content {

@@ -96,7 +96,7 @@ TEST_F(RenderViewHostTest, ResetUnloadOnReload) {

NavigateAndCommit(url1);

controller().LoadURL(

- url2, Referrer(), PAGE_TRANSITION_LINK, std::string());

+ url2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());

// Simulate the ClosePage call which is normally sent by the net::URLRequest.

rvh()->ClosePage();

// Needed so that navigations are not suspended on the RVH.