Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6917)

Unified Diff: chrome/browser/prerender/prerender_resource_throttle_unittest.cc

Issue 1391423002: net: Remove FilePath version of URLRequestMockHTTPJob::GetMockUrl(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke review Created 5 years, 2 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/policy/policy_browsertest.cc ('k') | chrome/browser/unload_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_resource_throttle_unittest.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
index a66296e33ac6efb2b9b7dc715418ccf1e54b1e10..15ed5ea26b5f78d12652482e704f95d09a8c38e2 100644
--- a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
@@ -204,9 +204,6 @@ class PrerenderResourceThrottleTest : public testing::Test {
// Checks that deferred redirects are throttled and resumed correctly.
TEST_F(PrerenderResourceThrottleTest, RedirectResume) {
- const base::FilePath::CharType kRedirectPath[] =
- FILE_PATH_LITERAL("prerender/image-deferred.png");
-
test_contents()->Start();
RunEvents();
@@ -214,7 +211,7 @@ TEST_F(PrerenderResourceThrottleTest, RedirectResume) {
net::TestURLRequestContext url_request_context;
DeferredRedirectDelegate delegate;
scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
- net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+ net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
net::DEFAULT_PRIORITY,
&delegate));
content::ResourceRequestInfo::AllocateForTesting(
@@ -250,9 +247,6 @@ TEST_F(PrerenderResourceThrottleTest, RedirectResume) {
// Checks that redirects in main frame loads are not deferred.
TEST_F(PrerenderResourceThrottleTest, RedirectMainFrame) {
- const base::FilePath::CharType kRedirectPath[] =
- FILE_PATH_LITERAL("prerender/image-deferred.png");
-
test_contents()->Start();
RunEvents();
@@ -260,7 +254,7 @@ TEST_F(PrerenderResourceThrottleTest, RedirectMainFrame) {
net::TestURLRequestContext url_request_context;
DeferredRedirectDelegate delegate;
scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
- net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+ net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
net::DEFAULT_PRIORITY,
&delegate));
content::ResourceRequestInfo::AllocateForTesting(
@@ -294,9 +288,6 @@ TEST_F(PrerenderResourceThrottleTest, RedirectMainFrame) {
// Checks that attempting to defer a synchronous request aborts the
// prerender.
TEST_F(PrerenderResourceThrottleTest, RedirectSyncXHR) {
- const base::FilePath::CharType kRedirectPath[] =
- FILE_PATH_LITERAL("prerender/image-deferred.png");
-
test_contents()->Start();
RunEvents();
@@ -304,7 +295,7 @@ TEST_F(PrerenderResourceThrottleTest, RedirectSyncXHR) {
net::TestURLRequestContext url_request_context;
DeferredRedirectDelegate delegate;
scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
- net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+ net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
net::DEFAULT_PRIORITY,
&delegate));
content::ResourceRequestInfo::AllocateForTesting(
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/unload_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698