chrome/browser/prerender/prerender_tracker_unittest.cc - Issue 541743002: Move url_request_mock_http_job to net/test/url_request/

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/prerender/prerender_tracker_unittest.cc

Issue 541743002: Move url_request_mock_http_job to net/test/url_request/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed a few compile errors 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/prerender/prerender_browsertest.cc ('k') | chrome/browser/ui/panels/panel_browsertest.cc » ('j') | content/browser/loader/resource_dispatcher_host_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_tracker_unittest.cc

diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc

index 2d20c455d1e650b0cf9c88b282c583763f42f00a..5fc302bceabe2e410923def18f19af1d3f02baeb 100644

--- a/chrome/browser/prerender/prerender_tracker_unittest.cc

+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc

@@ -19,9 +19,9 @@

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

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

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

-#include "content/test/net/url_request_mock_http_job.h"

#include "ipc/ipc_message.h"

#include "net/base/request_priority.h"

+#include "net/test/url_request/url_request_mock_http_job.h"

#include "net/url_request/redirect_info.h"

#include "net/url_request/url_request.h"

#include "net/url_request/url_request_test_util.h"

@@ -225,7 +225,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {

net::TestURLRequestContext url_request_context;

DeferredRedirectDelegate delegate;

scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(

- content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

+ net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

net::DEFAULT_PRIORITY,

&delegate,

NULL));

@@ -268,7 +268,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {

net::TestURLRequestContext url_request_context;

DeferredRedirectDelegate delegate;

scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(

- content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

+ net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

net::DEFAULT_PRIORITY,

&delegate,

NULL));

@@ -310,7 +310,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {

net::TestURLRequestContext url_request_context;

DeferredRedirectDelegate delegate;

scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(

- content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

+ net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),

net::DEFAULT_PRIORITY,

&delegate,

NULL));