Index: net/url_request/url_request_unittest.cc |
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc |
index e55af568da125feefd7ba94c3ae04001d9d0c14a..9d2c02ef43f5f0cc2127483182088e6251bc0091 100644 |
--- a/net/url_request/url_request_unittest.cc |
+++ b/net/url_request/url_request_unittest.cc |
@@ -1763,16 +1763,16 @@ TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) { |
TEST_F(URLRequestTest, SetPriorityBasic) { |
TestDelegate d; |
URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req.GetPriority()); |
req.SetPriority(LOW); |
- EXPECT_EQ(LOW, req.priority()); |
+ EXPECT_EQ(LOW, req.GetPriority()); |
req.Start(); |
- EXPECT_EQ(LOW, req.priority()); |
+ EXPECT_EQ(LOW, req.GetPriority()); |
req.SetPriority(MEDIUM); |
- EXPECT_EQ(MEDIUM, req.priority()); |
+ EXPECT_EQ(MEDIUM, req.GetPriority()); |
} |
// Make sure that URLRequest calls SetPriority on a job before calling |
@@ -1780,7 +1780,7 @@ TEST_F(URLRequestTest, SetPriorityBasic) { |
TEST_F(URLRequestTest, SetJobPriorityBeforeJobStart) { |
TestDelegate d; |
URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req.GetPriority()); |
scoped_refptr<URLRequestTestJob> job = |
new URLRequestTestJob(&req, &default_network_delegate_); |
@@ -1808,10 +1808,43 @@ TEST_F(URLRequestTest, SetJobPriority) { |
EXPECT_EQ(LOW, job->priority()); |
req.SetPriority(MEDIUM); |
- EXPECT_EQ(MEDIUM, req.priority()); |
+ EXPECT_EQ(MEDIUM, req.GetPriority()); |
EXPECT_EQ(MEDIUM, job->priority()); |
} |
+// Setting the IGNORE_LIMITS load flag should cause priority to become |
+// MAXIMUM_PRIORITY, and unnsetting it should revert to the base |
+// priority. |
+TEST_F(URLRequestTest, PriorityIgnoreLimits) { |
+ TestDelegate d; |
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req.GetPriority()); |
+ |
+ scoped_refptr<URLRequestTestJob> job = |
+ new URLRequestTestJob(&req, &default_network_delegate_); |
+ AddTestInterceptor()->set_main_intercept_job(job.get()); |
+ |
+ req.SetLoadFlags(LOAD_IGNORE_LIMITS); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req.GetPriority()); |
+ |
+ req.SetPriority(LOW); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req.GetPriority()); |
+ |
+ req.SetLoadFlags(~LOAD_IGNORE_LIMITS); |
+ EXPECT_EQ(LOW, req.GetPriority()); |
+ |
+ req.SetLoadFlags(LOAD_IGNORE_LIMITS); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req.GetPriority()); |
+ |
+ req.Start(); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req.GetPriority()); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, job->priority()); |
+ |
+ req.SetPriority(MEDIUM); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req.GetPriority()); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, job->priority()); |
+} |
+ |
// TODO(droger): Support SpawnedTestServer on iOS (see http://crbug.com/148666). |
#if !defined(OS_IOS) |
// A subclass of SpawnedTestServer that uses a statically-configured hostname. |
@@ -1910,7 +1943,7 @@ TEST_F(URLRequestTest, DoNotSendCookies) { |
TestDelegate d; |
URLRequest req( |
test_server.GetURL("echoheader?Cookie"), &d, &default_context_); |
- req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES); |
+ req.SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES); |
req.Start(); |
base::RunLoop().Run(); |
@@ -1952,7 +1985,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { |
test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), |
&d, |
&default_context_); |
- req.set_load_flags(LOAD_DO_NOT_SAVE_COOKIES); |
+ req.SetLoadFlags(LOAD_DO_NOT_SAVE_COOKIES); |
req.Start(); |
base::RunLoop().Run(); |
@@ -2359,7 +2392,7 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) { |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/"); |
req.SetExtraRequestHeaders(headers); |
- req.set_load_flags(LOAD_VALIDATE_CACHE); |
+ req.SetLoadFlags(LOAD_VALIDATE_CACHE); |
req.Start(); |
base::RunLoop().Run(); |
@@ -5080,7 +5113,7 @@ TEST_F(URLRequestTestHTTP, BasicAuth) { |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); |
- r.set_load_flags(LOAD_VALIDATE_CACHE); |
+ r.SetLoadFlags(LOAD_VALIDATE_CACHE); |
r.Start(); |
base::RunLoop().Run(); |
@@ -5194,7 +5227,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); |
- r.set_load_flags(LOAD_VALIDATE_CACHE); |
+ r.SetLoadFlags(LOAD_VALIDATE_CACHE); |
r.Start(); |
base::RunLoop().Run(); |
@@ -5529,7 +5562,7 @@ TEST_F(URLRequestTestHTTP, SetSubsequentJobPriority) { |
TestDelegate d; |
URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req.GetPriority()); |
scoped_refptr<URLRequestRedirectJob> redirect_job = |
new URLRequestRedirectJob( |