chrome/browser/unload_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/unload_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: 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/ui/panels/panel_browsertest.cc ('k') | content/browser/database_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/unload_browsertest.cc

diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc

index 5f8526d0c8a6c8a4a5197ca9331488303672183f..9b4add4d459bc8028ad0e3dbc35a982bbb6f597a 100644

--- a/chrome/browser/unload_browsertest.cc

+++ b/chrome/browser/unload_browsertest.cc

@@ -24,7 +24,7 @@

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

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

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

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

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

#include "net/url_request/url_request_test_util.h"

#if defined(OS_WIN)

@@ -146,7 +146,7 @@ class UnloadTest : public InProcessBrowserTest {

}

void NavigateToNolistenersFileTwice() {

- GURL url(content::URLRequestMockHTTPJob::GetMockUrl(

+ GURL url(net::URLRequestMockHTTPJob::GetMockUrl(

base::FilePath(FILE_PATH_LITERAL("title2.html"))));

ui_test_utils::NavigateToURL(browser(), url);

CheckTitle("Title Of Awesomeness");

@@ -158,7 +158,7 @@ class UnloadTest : public InProcessBrowserTest {

// load is purposely async to test the case where the user loads another

// page without waiting for the first load to complete.

void NavigateToNolistenersFileTwiceAsync() {

- GURL url(content::URLRequestMockHTTPJob::GetMockUrl(

+ GURL url(net::URLRequestMockHTTPJob::GetMockUrl(

base::FilePath(FILE_PATH_LITERAL("title2.html"))));

ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);

ui_test_utils::NavigateToURL(browser(), url);