chrome/browser/lifetime/browser_close_manager_browsertest.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/lifetime/browser_close_manager_browsertest.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: rebased 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/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc ('k') | chrome/browser/net/dns_probe_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/lifetime/browser_close_manager_browsertest.cc

diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc

index ef424b8f40e235d547d981df6c0e0ea62d9a1ca4..fd59e2f4315ba438db0d1da836f1dde3631bb3ec 100644

--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc

+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc

@@ -39,9 +39,9 @@

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

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

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

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

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

#include "net/test/embedded_test_server/embedded_test_server.h"

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

#if defined(OS_CHROMEOS)

#include "chromeos/chromeos_switches.h"

@@ -747,7 +747,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,

// This .swf normally would be categorized as DANGEROUS_FILE, but

// TestDownloadManagerDelegate turns it into DANGEROUS_URL.

base::FilePath file(FILE_PATH_LITERAL("downloads/dangerous/dangerous.swf"));

- GURL download_url(content::URLRequestMockHTTPJob::GetMockUrl(file));

+ GURL download_url(net::URLRequestMockHTTPJob::GetMockUrl(file));

content::DownloadTestObserverInterrupted observer(

content::BrowserContext::GetDownloadManager(browser()->profile()),