chrome/browser/net/url_request_mock_util.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/net/url_request_mock_util.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 one unmatched brace 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/net/dns_probe_browsertest.cc ('k') | chrome/browser/plugins/npapi_infobar_browsertest.cc » ('j') | net/test/url_request/url_request_mock_http_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/url_request_mock_util.cc

diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc

index 6255c60128b26ad651a6e7a064a4c20ac7a5b8ba..6743da1f0bc45e4c1cb06d05b971975e6db0fea2 100644

--- a/chrome/browser/net/url_request_mock_util.cc

+++ b/chrome/browser/net/url_request_mock_util.cc

@@ -11,8 +11,8 @@

#include "chrome/common/chrome_paths.h"

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

#include "content/test/net/url_request_failed_job.h"

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

#include "content/test/net/url_request_slow_download_job.h"

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

#include "net/url_request/url_request_filter.h"

using content::BrowserThread;

@@ -37,7 +37,9 @@ void SetUrlRequestMocksEnabled(bool enabled) {

base::FilePath root_http;

PathService::Get(chrome::DIR_TEST_DATA, &root_http);

- content::URLRequestMockHTTPJob::AddUrlHandler(root_http);

+ net::URLRequestMockHTTPJob::AddUrlHandler(

+ root_http,

+ content::BrowserThread::GetBlockingPool());

} else {

// Revert to the default handlers.

net::URLRequestFilter::GetInstance()->ClearHandlers();