chrome/browser/content_settings/content_settings_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/content_settings/content_settings_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/captive_portal/captive_portal_browsertest.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_browsertest.cc

diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc

index 91e0c66a5dc01b092b4d34b381b8481c47dcaaae..3ec5e39324deed9ab6346525b38ee6a18c4dd97f 100644

--- a/chrome/browser/content_settings/content_settings_browsertest.cc

+++ b/chrome/browser/content_settings/content_settings_browsertest.cc

@@ -32,8 +32,8 @@

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

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

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

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

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

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

#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.

@@ -42,7 +42,7 @@

#endif

using content::BrowserThread;

-using content::URLRequestMockHTTPJob;

+using net::URLRequestMockHTTPJob;

class ContentSettingsTest : public InProcessBrowserTest {

public:

« no previous file with comments | « chrome/browser/captive_portal/captive_portal_browsertest.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »