Chromium Code Reviews| Index: chrome/browser/prerender/prerender_tracker_unittest.cc |
| diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc |
| index 2ee44da3fcd2525ab7a3a3cdf3f96f56279585f9..a3feab0fded7ab14215188c78fac5a43cc653b6b 100644 |
| --- a/chrome/browser/prerender/prerender_tracker_unittest.cc |
| +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc |
| @@ -20,6 +20,7 @@ |
| #include "content/public/browser/resource_request_info.h" |
| #include "content/public/test/test_browser_thread.h" |
| #include "content/test/net/url_request_mock_http_job.h" |
| +#include "net/base/request_priority.h" |
| #include "net/url_request/url_request.h" |
| #include "net/url_request/url_request_test_util.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -527,9 +528,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) { |
| net::TestURLRequestContext url_request_context; |
| DeferredRedirectDelegate delegate; |
| net::URLRequest request( |
| - content::URLRequestMockHTTPJob::GetMockUrl( |
| - base::FilePath(kRedirectPath)), |
| - &delegate, &url_request_context); |
| + content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)), |
| + net::DEFAULT_PRIORITY, |
| + &delegate, |
| + &url_request_context, |
| + NULL); |
|
mmenke
2013/10/30 15:27:11
Again, don't want to add assumptions here.
akalin
2013/10/30 21:44:37
removed arg.
|
| content::ResourceRequestInfo::AllocateForTesting( |
| &request, ResourceType::IMAGE, NULL, |
| kDefaultChildId, kDefaultRouteId, true); |
| @@ -566,9 +569,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectCancel) { |
| net::TestURLRequestContext url_request_context; |
| DeferredRedirectDelegate delegate; |
| net::URLRequest request( |
| - content::URLRequestMockHTTPJob::GetMockUrl( |
| - base::FilePath(kRedirectPath)), |
| - &delegate, &url_request_context); |
| + content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)), |
| + net::DEFAULT_PRIORITY, |
| + &delegate, |
| + &url_request_context, |
| + NULL); |
| content::ResourceRequestInfo::AllocateForTesting( |
| &request, ResourceType::IMAGE, NULL, |
| kDefaultChildId, kDefaultRouteId, true); |
| @@ -605,9 +610,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) { |
| net::TestURLRequestContext url_request_context; |
| DeferredRedirectDelegate delegate; |
| net::URLRequest request( |
| - content::URLRequestMockHTTPJob::GetMockUrl( |
| - base::FilePath(kRedirectPath)), |
| - &delegate, &url_request_context); |
| + content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)), |
| + net::DEFAULT_PRIORITY, |
| + &delegate, |
| + &url_request_context, |
| + NULL); |
| content::ResourceRequestInfo::AllocateForTesting( |
| &request, ResourceType::MAIN_FRAME, NULL, |
| kDefaultChildId, kDefaultRouteId, true); |
| @@ -643,9 +650,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) { |
| net::TestURLRequestContext url_request_context; |
| DeferredRedirectDelegate delegate; |
| net::URLRequest request( |
| - content::URLRequestMockHTTPJob::GetMockUrl( |
| - base::FilePath(kRedirectPath)), |
| - &delegate, &url_request_context); |
| + content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)), |
| + net::DEFAULT_PRIORITY, |
| + &delegate, |
| + &url_request_context, |
| + NULL); |
| content::ResourceRequestInfo::AllocateForTesting( |
| &request, ResourceType::XHR, NULL, |
| kDefaultChildId, kDefaultRouteId, false); |