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 0a00e69d63dbc30a80ba5e66a8fe1c76a4a86b3a..aea3ec4b7c9eff1583d1843adc810d3700eeddf8 100644 |
--- a/net/url_request/url_request_unittest.cc |
+++ b/net/url_request/url_request_unittest.cc |
@@ -634,21 +634,22 @@ class URLRequestTest : public PlatformTest { |
TEST_F(URLRequestTest, AboutBlankTest) { |
TestDelegate d; |
{ |
- URLRequest r(GURL("about:blank"), DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ GURL("about:blank"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), 0); |
- EXPECT_EQ("", r.GetSocketAddress().host()); |
- EXPECT_EQ(0, r.GetSocketAddress().port()); |
+ EXPECT_EQ("", r->GetSocketAddress().host()); |
+ EXPECT_EQ(0, r->GetSocketAddress().port()); |
HttpRequestHeaders headers; |
- EXPECT_FALSE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_FALSE(r->GetFullRequestHeaders(&headers)); |
} |
} |
@@ -656,7 +657,7 @@ TEST_F(URLRequestTest, DataURLImageTest) { |
TestDelegate d; |
{ |
// Use our nice little Chrome logo. |
- URLRequest r( |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
GURL( |
"data:image/png;base64," |
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADVklEQVQ4jX2TfUwUBBjG3" |
@@ -677,23 +678,21 @@ TEST_F(URLRequestTest, DataURLImageTest) { |
"nlm2O34uI4b9tflqp1+QEFGzoW/ulmcofcpkZCYJhDfSpme7QcrHa+Xfji8paEQkTkSfm" |
"moRWRNZr/F1KfVMjW+IKEnv2FwZfKdzt0BQR6lClcZR0EfEXEfv/G6W9iLiIyCoReV5En" |
"hORIBHx+ufPj/gLB/zGI/G4Bk0AAAAASUVORK5CYII="), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), 911); |
- EXPECT_EQ("", r.GetSocketAddress().host()); |
- EXPECT_EQ(0, r.GetSocketAddress().port()); |
+ EXPECT_EQ("", r->GetSocketAddress().host()); |
+ EXPECT_EQ(0, r->GetSocketAddress().port()); |
HttpRequestHeaders headers; |
- EXPECT_FALSE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_FALSE(r->GetFullRequestHeaders(&headers)); |
} |
} |
@@ -705,25 +704,26 @@ TEST_F(URLRequestTest, FileTest) { |
TestDelegate d; |
{ |
- URLRequest r(app_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ app_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = -1; |
EXPECT_TRUE(base::GetFileSize(app_path, &file_size)); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); |
- EXPECT_EQ("", r.GetSocketAddress().host()); |
- EXPECT_EQ(0, r.GetSocketAddress().port()); |
+ EXPECT_EQ("", r->GetSocketAddress().host()); |
+ EXPECT_EQ(0, r->GetSocketAddress().port()); |
HttpRequestHeaders headers; |
- EXPECT_FALSE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_FALSE(r->GetFullRequestHeaders(&headers)); |
} |
} |
@@ -734,11 +734,12 @@ TEST_F(URLRequestTest, FileTestCancel) { |
TestDelegate d; |
{ |
- URLRequest r(app_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ app_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
- r.Cancel(); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
+ r->Cancel(); |
} |
// Async cancellation should be safe even when URLRequest has been already |
// destroyed. |
@@ -766,19 +767,20 @@ TEST_F(URLRequestTest, FileTestFullSpecifiedRange) { |
TestDelegate d; |
{ |
- URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ temp_url, DEFAULT_PRIORITY, &d, NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader( |
HttpRequestHeaders::kRange, |
HttpByteRange::Bounded( |
first_byte_position, last_byte_position).GetHeaderValue()); |
- r.SetExtraRequestHeaders(headers); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->SetExtraRequestHeaders(headers); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(static_cast<int>(content_length), d.bytes_received()); |
@@ -810,18 +812,19 @@ TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) { |
TestDelegate d; |
{ |
- URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ temp_url, DEFAULT_PRIORITY, &d, NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kRange, |
HttpByteRange::RightUnbounded( |
first_byte_position).GetHeaderValue()); |
- r.SetExtraRequestHeaders(headers); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->SetExtraRequestHeaders(headers); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(static_cast<int>(content_length), d.bytes_received()); |
@@ -847,13 +850,14 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) { |
TestDelegate d; |
{ |
- URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ temp_url, DEFAULT_PRIORITY, &d, NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kRange, "bytes=0-0,10-200,200-300"); |
- r.SetExtraRequestHeaders(headers); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->SetExtraRequestHeaders(headers); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
@@ -876,8 +880,9 @@ TEST_F(URLRequestTest, AllowFileURLs) { |
TestNetworkDelegate network_delegate; |
network_delegate.set_can_access_files(true); |
default_context_.set_network_delegate(&network_delegate); |
- URLRequest r(test_file_url, DEFAULT_PRIORITY, &d, &default_context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_file_url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_FALSE(d.request_failed()); |
EXPECT_EQ(test_data, d.data_received()); |
@@ -888,8 +893,9 @@ TEST_F(URLRequestTest, AllowFileURLs) { |
TestNetworkDelegate network_delegate; |
network_delegate.set_can_access_files(false); |
default_context_.set_network_delegate(&network_delegate); |
- URLRequest r(test_file_url, DEFAULT_PRIORITY, &d, &default_context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_file_url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
EXPECT_EQ("", d.data_received()); |
@@ -908,10 +914,10 @@ TEST_F(URLRequestTest, FileDirCancelTest) { |
file_path = file_path.Append(FILE_PATH_LITERAL("net")); |
file_path = file_path.Append(FILE_PATH_LITERAL("data")); |
- URLRequest req( |
- FilePathToFileURL(file_path), DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
- EXPECT_TRUE(req.is_pending()); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ FilePathToFileURL(file_path), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
+ EXPECT_TRUE(req->is_pending()); |
d.set_cancel_in_received_data_pending(true); |
@@ -935,9 +941,9 @@ TEST_F(URLRequestTest, FileDirOutputSanity) { |
path = path.Append(FILE_PATH_LITERAL("url_request_unittest")); |
TestDelegate d; |
- URLRequest req( |
- FilePathToFileURL(path), DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ FilePathToFileURL(path), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
// Generate entry for the sentinel file. |
@@ -954,7 +960,7 @@ TEST_F(URLRequestTest, FileDirOutputSanity) { |
ASSERT_LT(0, d.bytes_received()); |
ASSERT_FALSE(d.request_failed()); |
- ASSERT_TRUE(req.status().is_success()); |
+ ASSERT_TRUE(req->status().is_success()); |
// Check for the entry generated for the "sentinel" file. |
const std::string& data = d.data_received(); |
ASSERT_NE(data.find(sentinel_output), std::string::npos); |
@@ -972,27 +978,28 @@ TEST_F(URLRequestTest, FileDirRedirectNoCrash) { |
path = path.Append(FILE_PATH_LITERAL("url_request_unittest")); |
TestDelegate d; |
- URLRequest req( |
- FilePathToFileURL(path), DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ FilePathToFileURL(path), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
ASSERT_EQ(1, d.received_redirect_count()); |
ASSERT_LT(0, d.bytes_received()); |
ASSERT_FALSE(d.request_failed()); |
- ASSERT_TRUE(req.status().is_success()); |
+ ASSERT_TRUE(req->status().is_success()); |
} |
#if defined(OS_WIN) |
// Don't accept the url "file:///" on windows. See http://crbug.com/1474. |
TEST_F(URLRequestTest, FileDirRedirectSingleSlash) { |
TestDelegate d; |
- URLRequest req(GURL("file:///"), DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("file:///"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
ASSERT_EQ(1, d.received_redirect_count()); |
- ASSERT_FALSE(req.status().is_success()); |
+ ASSERT_FALSE(req->status().is_success()); |
} |
#endif // defined(OS_WIN) |
@@ -1001,10 +1008,11 @@ TEST_F(URLRequestTest, FileDirRedirectSingleSlash) { |
TEST_F(URLRequestTest, InvalidUrlTest) { |
TestDelegate d; |
{ |
- URLRequest r(GURL("invalid url"), DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ GURL("invalid url"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
@@ -1038,13 +1046,12 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { |
TestDelegate d; |
{ |
- URLRequest r(FilePathToFileURL(base::FilePath(lnk_path)), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ FilePathToFileURL(base::FilePath(lnk_path)), DEFAULT_PRIORITY, &d, |
+ NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -1063,7 +1070,7 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { |
std::string content(buffer.get(), read_size); |
CloseHandle(file); |
- EXPECT_TRUE(!r.is_pending()); |
+ EXPECT_TRUE(!r->is_pending()); |
EXPECT_EQ(1, d.received_redirect_count()); |
EXPECT_EQ(content, d.data_received()); |
} |
@@ -1285,31 +1292,29 @@ TEST_F(URLRequestTest, Intercept) { |
interceptor.main_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data(); |
base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data(); |
base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data(); |
- req.SetUserData(NULL, user_data0); |
- req.SetUserData(&user_data1, user_data1); |
- req.SetUserData(&user_data2, user_data2); |
- req.set_method("GET"); |
- req.Start(); |
+ req->SetUserData(NULL, user_data0); |
+ req->SetUserData(&user_data1, user_data1); |
+ req->SetUserData(&user_data2, user_data2); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Make sure we can retrieve our specific user data |
- EXPECT_EQ(user_data0, req.GetUserData(NULL)); |
- EXPECT_EQ(user_data1, req.GetUserData(&user_data1)); |
- EXPECT_EQ(user_data2, req.GetUserData(&user_data2)); |
+ EXPECT_EQ(user_data0, req->GetUserData(NULL)); |
+ EXPECT_EQ(user_data1, req->GetUserData(&user_data1)); |
+ EXPECT_EQ(user_data2, req->GetUserData(&user_data2)); |
// Check the interceptor got called as expected |
EXPECT_TRUE(interceptor.did_intercept_main_); |
// Check we got one good response |
- EXPECT_TRUE(req.status().is_success()); |
- EXPECT_EQ(200, req.response_headers()->response_code()); |
+ EXPECT_TRUE(req->status().is_success()); |
+ EXPECT_EQ(200, req->response_headers()->response_code()); |
EXPECT_EQ(TestInterceptor::ok_data(), d.data_received()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.received_redirect_count()); |
@@ -1329,12 +1334,10 @@ TEST_F(URLRequestTest, InterceptRedirect) { |
interceptor.redirect_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1342,9 +1345,9 @@ TEST_F(URLRequestTest, InterceptRedirect) { |
EXPECT_TRUE(interceptor.did_intercept_redirect_); |
// Check we got one good response |
- EXPECT_TRUE(req.status().is_success()); |
- if (req.status().is_success()) { |
- EXPECT_EQ(200, req.response_headers()->response_code()); |
+ EXPECT_TRUE(req->status().is_success()); |
+ if (req->status().is_success()) { |
+ EXPECT_EQ(200, req->response_headers()->response_code()); |
} |
EXPECT_EQ(TestInterceptor::ok_data(), d.data_received()); |
EXPECT_EQ(1, d.response_started_count()); |
@@ -1365,12 +1368,10 @@ TEST_F(URLRequestTest, InterceptServerError) { |
interceptor.final_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1378,8 +1379,8 @@ TEST_F(URLRequestTest, InterceptServerError) { |
EXPECT_TRUE(interceptor.did_intercept_final_); |
// Check we got one good response |
- EXPECT_TRUE(req.status().is_success()); |
- EXPECT_EQ(200, req.response_headers()->response_code()); |
+ EXPECT_TRUE(req->status().is_success()); |
+ EXPECT_EQ(200, req->response_headers()->response_code()); |
EXPECT_EQ(TestInterceptor::ok_data(), d.data_received()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.received_redirect_count()); |
@@ -1397,12 +1398,10 @@ TEST_F(URLRequestTest, InterceptNetworkError) { |
interceptor.final_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1410,8 +1409,8 @@ TEST_F(URLRequestTest, InterceptNetworkError) { |
EXPECT_TRUE(interceptor.did_intercept_final_); |
// Check we received one good response |
- EXPECT_TRUE(req.status().is_success()); |
- EXPECT_EQ(200, req.response_headers()->response_code()); |
+ EXPECT_TRUE(req->status().is_success()); |
+ EXPECT_EQ(200, req->response_headers()->response_code()); |
EXPECT_EQ(TestInterceptor::ok_data(), d.data_received()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.received_redirect_count()); |
@@ -1429,12 +1428,10 @@ TEST_F(URLRequestTest, InterceptRestartRequired) { |
interceptor.main_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1442,9 +1439,9 @@ TEST_F(URLRequestTest, InterceptRestartRequired) { |
EXPECT_TRUE(interceptor.did_intercept_main_); |
// Check we received one good response |
- EXPECT_TRUE(req.status().is_success()); |
- if (req.status().is_success()) { |
- EXPECT_EQ(200, req.response_headers()->response_code()); |
+ EXPECT_TRUE(req->status().is_success()); |
+ if (req->status().is_success()) { |
+ EXPECT_EQ(200, req->response_headers()->response_code()); |
} |
EXPECT_EQ(TestInterceptor::ok_data(), d.data_received()); |
EXPECT_EQ(1, d.response_started_count()); |
@@ -1463,12 +1460,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelMain) { |
interceptor.final_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1476,8 +1471,8 @@ TEST_F(URLRequestTest, InterceptRespectsCancelMain) { |
EXPECT_FALSE(interceptor.did_intercept_final_); |
// Check we see a canceled request |
- EXPECT_FALSE(req.status().is_success()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_FALSE(req->status().is_success()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) { |
@@ -1497,12 +1492,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) { |
interceptor.final_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1511,8 +1504,8 @@ TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) { |
EXPECT_FALSE(interceptor.did_intercept_final_); |
// Check we see a canceled request |
- EXPECT_FALSE(req.status().is_success()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_FALSE(req->status().is_success()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
TEST_F(URLRequestTest, InterceptRespectsCancelFinal) { |
@@ -1525,12 +1518,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelFinal) { |
interceptor.cancel_final_request_ = true; |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1538,8 +1529,8 @@ TEST_F(URLRequestTest, InterceptRespectsCancelFinal) { |
EXPECT_TRUE(interceptor.did_cancel_final_); |
// Check we see a canceled request |
- EXPECT_FALSE(req.status().is_success()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_FALSE(req->status().is_success()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) { |
@@ -1554,12 +1545,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) { |
interceptor.final_data_ = TestInterceptor::ok_data(); |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("GET"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check the interceptor got called as expected |
@@ -1567,8 +1556,8 @@ TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) { |
EXPECT_FALSE(interceptor.did_intercept_final_); |
// Check we see a canceled request |
- EXPECT_FALSE(req.status().is_success()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_FALSE(req->status().is_success()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
LoadTimingInfo RunLoadTimingTest(const LoadTimingInfo& job_load_timing, |
@@ -1577,13 +1566,13 @@ LoadTimingInfo RunLoadTimingTest(const LoadTimingInfo& job_load_timing, |
interceptor.intercept_main_request_ = true; |
interceptor.main_request_load_timing_info_ = job_load_timing; |
TestDelegate d; |
- URLRequest req( |
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context->CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
LoadTimingInfo resulting_load_timing; |
- req.GetLoadTimingInfo(&resulting_load_timing); |
+ req->GetLoadTimingInfo(&resulting_load_timing); |
// None of these should be modified by the URLRequest. |
EXPECT_EQ(job_load_timing.socket_reused, resulting_load_timing.socket_reused); |
@@ -1855,18 +1844,19 @@ TEST_F(URLRequestTest, NetworkDelegateProxyError) { |
TestURLRequestContextWithProxy context("myproxy:70", &network_delegate); |
TestDelegate d; |
- URLRequest req(GURL("http://example.com"), DEFAULT_PRIORITY, &d, &context); |
- req.set_method("GET"); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ GURL("http://example.com"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("GET"); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
// Check we see a failed request. |
- EXPECT_FALSE(req.status().is_success()); |
+ EXPECT_FALSE(req->status().is_success()); |
// The proxy server is not set before failure. |
- EXPECT_TRUE(req.proxy_server().IsEmpty()); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, req.status().error()); |
+ EXPECT_TRUE(req->proxy_server().IsEmpty()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, req->status().error()); |
EXPECT_EQ(1, network_delegate.error_count()); |
EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, network_delegate.last_error()); |
@@ -1877,8 +1867,9 @@ TEST_F(URLRequestTest, NetworkDelegateProxyError) { |
// content is empty. |
TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) { |
TestDelegate d; |
- URLRequest req(GURL("data:,"), DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("data:,"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ("", d.data_received()); |
EXPECT_EQ(1, default_network_delegate_.completed_requests()); |
@@ -1888,40 +1879,36 @@ TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) { |
// correctly, both before and after start. |
TEST_F(URLRequestTest, SetPriorityBasic) { |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req->priority()); |
- req.SetPriority(LOW); |
- EXPECT_EQ(LOW, req.priority()); |
+ req->SetPriority(LOW); |
+ EXPECT_EQ(LOW, req->priority()); |
- req.Start(); |
- EXPECT_EQ(LOW, req.priority()); |
+ req->Start(); |
+ EXPECT_EQ(LOW, req->priority()); |
- req.SetPriority(MEDIUM); |
- EXPECT_EQ(MEDIUM, req.priority()); |
+ req->SetPriority(MEDIUM); |
+ EXPECT_EQ(MEDIUM, req->priority()); |
} |
// Make sure that URLRequest calls SetPriority on a job before calling |
// Start on it. |
TEST_F(URLRequestTest, SetJobPriorityBeforeJobStart) { |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req->priority()); |
scoped_refptr<URLRequestTestJob> job = |
- new URLRequestTestJob(&req, &default_network_delegate_); |
+ new URLRequestTestJob(req.get(), &default_network_delegate_); |
AddTestInterceptor()->set_main_intercept_job(job.get()); |
EXPECT_EQ(DEFAULT_PRIORITY, job->priority()); |
- req.SetPriority(LOW); |
+ req->SetPriority(LOW); |
- req.Start(); |
+ req->Start(); |
EXPECT_EQ(LOW, job->priority()); |
} |
@@ -1929,21 +1916,19 @@ TEST_F(URLRequestTest, SetJobPriorityBeforeJobStart) { |
// job. |
TEST_F(URLRequestTest, SetJobPriority) { |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL)); |
scoped_refptr<URLRequestTestJob> job = |
- new URLRequestTestJob(&req, &default_network_delegate_); |
+ new URLRequestTestJob(req.get(), &default_network_delegate_); |
AddTestInterceptor()->set_main_intercept_job(job.get()); |
- req.SetPriority(LOW); |
- req.Start(); |
+ req->SetPriority(LOW); |
+ req->Start(); |
EXPECT_EQ(LOW, job->priority()); |
- req.SetPriority(MEDIUM); |
- EXPECT_EQ(MEDIUM, req.priority()); |
+ req->SetPriority(MEDIUM); |
+ EXPECT_EQ(MEDIUM, req->priority()); |
EXPECT_EQ(MEDIUM, job->priority()); |
} |
@@ -1951,24 +1936,22 @@ TEST_F(URLRequestTest, SetJobPriority) { |
// is MAXIMUM_PRIORITY. |
TEST_F(URLRequestTest, PriorityIgnoreLimits) { |
TestDelegate d; |
- URLRequest req(GURL("http://test_intercept/foo"), |
- MAXIMUM_PRIORITY, |
- &d, |
- &default_context_); |
- EXPECT_EQ(MAXIMUM_PRIORITY, req.priority()); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ GURL("http://test_intercept/foo"), MAXIMUM_PRIORITY, &d, NULL)); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req->priority()); |
scoped_refptr<URLRequestTestJob> job = |
- new URLRequestTestJob(&req, &default_network_delegate_); |
+ new URLRequestTestJob(req.get(), &default_network_delegate_); |
AddTestInterceptor()->set_main_intercept_job(job.get()); |
- req.SetLoadFlags(LOAD_IGNORE_LIMITS); |
- EXPECT_EQ(MAXIMUM_PRIORITY, req.priority()); |
+ req->SetLoadFlags(LOAD_IGNORE_LIMITS); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req->priority()); |
- req.SetPriority(MAXIMUM_PRIORITY); |
- EXPECT_EQ(MAXIMUM_PRIORITY, req.priority()); |
+ req->SetPriority(MAXIMUM_PRIORITY); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req->priority()); |
- req.Start(); |
- EXPECT_EQ(MAXIMUM_PRIORITY, req.priority()); |
+ req->Start(); |
+ EXPECT_EQ(MAXIMUM_PRIORITY, req->priority()); |
EXPECT_EQ(MAXIMUM_PRIORITY, job->priority()); |
} |
@@ -2005,11 +1988,10 @@ TEST_F(URLRequestTest, DelayedCookieCallback) { |
TestNetworkDelegate network_delegate; |
context.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotSend=1"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
EXPECT_EQ(0, network_delegate.blocked_set_cookie_count()); |
@@ -2021,11 +2003,9 @@ TEST_F(URLRequestTest, DelayedCookieCallback) { |
TestNetworkDelegate network_delegate; |
context.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1") |
@@ -2044,11 +2024,10 @@ TEST_F(URLRequestTest, DoNotSendCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotSend=1"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
EXPECT_EQ(0, network_delegate.blocked_set_cookie_count()); |
@@ -2059,11 +2038,9 @@ TEST_F(URLRequestTest, DoNotSendCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1") |
@@ -2077,12 +2054,10 @@ TEST_F(URLRequestTest, DoNotSendCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1") |
@@ -2103,11 +2078,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotUpdate=2"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2120,13 +2094,11 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetLoadFlags(LOAD_DO_NOT_SAVE_COOKIES); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetLoadFlags(LOAD_DO_NOT_SAVE_COOKIES); |
+ req->Start(); |
base::RunLoop().Run(); |
@@ -2141,11 +2113,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSave=1") |
@@ -2168,11 +2138,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotSend=1"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2184,11 +2153,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1") |
@@ -2204,11 +2171,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES); |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1") |
@@ -2228,11 +2193,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotUpdate=2"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2245,12 +2209,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE); |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
@@ -2263,11 +2225,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSave=1") |
@@ -2289,11 +2249,9 @@ TEST_F(URLRequestTest, DoNotSaveEmptyCookies) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2311,11 +2269,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotSend=1"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2327,11 +2284,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1") |
@@ -2347,11 +2302,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES); |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1") |
@@ -2371,11 +2324,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("set-cookie?CookieToNotUpdate=2"), DEFAULT_PRIORITY, |
+ &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); |
@@ -2388,12 +2340,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE); |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
@@ -2406,11 +2356,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("CookieToNotSave=1") |
@@ -2477,13 +2425,11 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
test_server.GetURL( |
"set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
} |
// Verify that the cookie is not set. |
@@ -2491,11 +2437,9 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("StillGood=1") == std::string::npos); |
@@ -2505,13 +2449,11 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { |
FixedDateNetworkDelegate network_delegate("18-Apr-1977 22:49:13 UTC"); |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
test_server.GetURL( |
"set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
} |
// Verify that the cookie is set. |
@@ -2519,11 +2461,9 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { |
TestNetworkDelegate network_delegate; |
default_context_.set_network_delegate(&network_delegate); |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Cookie"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Cookie"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("StillGood=1") != std::string::npos); |
@@ -2541,17 +2481,15 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) { |
// only the latter shall be respected. |
{ |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Referer"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetReferrer("http://foo.com/"); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Referer"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetReferrer("http://foo.com/"); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/"); |
- req.SetExtraRequestHeaders(headers); |
+ req->SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ("http://foo.com/", d.data_received()); |
@@ -2561,17 +2499,15 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) { |
// shall be sent in the header. |
{ |
TestDelegate d; |
- URLRequest req(test_server.GetURL("echoheader?Referer"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server.GetURL("echoheader?Referer"), DEFAULT_PRIORITY, &d, NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/"); |
- req.SetExtraRequestHeaders(headers); |
- req.SetLoadFlags(LOAD_VALIDATE_CACHE); |
+ req->SetExtraRequestHeaders(headers); |
+ req->SetLoadFlags(LOAD_VALIDATE_CACHE); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ("None", d.data_received()); |
@@ -2599,20 +2535,21 @@ class URLRequestTestHTTP : public URLRequestTest { |
bool include_data) { |
static const char kData[] = "hello world"; |
TestDelegate d; |
- URLRequest req(redirect_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.set_method(request_method); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ redirect_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method(request_method); |
if (include_data) { |
- req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ req->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kContentLength, |
base::UintToString(arraysize(kData) - 1)); |
- req.SetExtraRequestHeaders(headers); |
+ req->SetExtraRequestHeaders(headers); |
} |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(redirect_method, req.method()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
- EXPECT_EQ(OK, req.status().error()); |
+ EXPECT_EQ(redirect_method, req->method()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
+ EXPECT_EQ(OK, req->status().error()); |
if (include_data) { |
if (request_method == redirect_method) { |
EXPECT_EQ(kData, d.data_received()); |
@@ -2644,20 +2581,20 @@ class URLRequestTestHTTP : public URLRequestTest { |
for (int i = 0; i < kIterations; ++i) { |
TestDelegate d; |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.set_method(method.c_str()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_method(method.c_str()); |
- r.set_upload(make_scoped_ptr(CreateSimpleUploadData(uploadBytes))); |
+ r->set_upload(make_scoped_ptr(CreateSimpleUploadData(uploadBytes))); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
ASSERT_EQ(1, d.response_started_count()) |
- << "request failed: " << r.status().status() |
- << ", os error: " << r.status().error(); |
+ << "request failed: " << r->status().status() |
+ << ", os error: " << r->status().error(); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(uploadBytes, d.data_received()); |
@@ -2691,21 +2628,20 @@ class URLRequestTestHTTP : public URLRequestTest { |
bool DoManyCookiesRequest(int num_cookies) { |
TestDelegate d; |
- URLRequest r(test_server_.GetURL("set-many-cookies?" + |
- base::IntToString(num_cookies)), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("set-many-cookies?" + |
+ base::IntToString(num_cookies)), |
+ DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- bool is_success = r.status().is_success(); |
+ bool is_success = r->status().is_success(); |
if (!is_success) { |
- EXPECT_TRUE(r.status().error() == ERR_RESPONSE_HEADERS_TOO_BIG); |
+ EXPECT_TRUE(r->status().error() == ERR_RESPONSE_HEADERS_TOO_BIG); |
// The test server appears to be unable to handle subsequent requests |
// after this error is triggered. Force it to restart. |
EXPECT_TRUE(test_server_.Stop()); |
@@ -2731,17 +2667,17 @@ TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) { |
TestDelegate d; |
{ |
- URLRequest r( |
- GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
// The proxy server is not set before failure. |
- EXPECT_TRUE(r.proxy_server().IsEmpty()); |
- EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error()); |
+ EXPECT_TRUE(r->proxy_server().IsEmpty()); |
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r->status().error()); |
EXPECT_EQ(1, d.response_started_count()); |
// We should not have followed the redirect. |
EXPECT_EQ(0, d.received_redirect_count()); |
@@ -2759,17 +2695,17 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) { |
TestDelegate d; |
{ |
- URLRequest r( |
- GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
// The proxy server is not set before failure. |
- EXPECT_TRUE(r.proxy_server().IsEmpty()); |
- EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error()); |
+ EXPECT_TRUE(r->proxy_server().IsEmpty()); |
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r->status().error()); |
EXPECT_EQ(1, d.response_started_count()); |
// We should not have followed the redirect. |
EXPECT_EQ(0, d.received_redirect_count()); |
@@ -2803,10 +2739,10 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateBlockAsynchronously) { |
context.Init(); |
{ |
- URLRequest r( |
- test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
for (size_t i = 0; i < blocking_stages_length; ++i) { |
base::RunLoop().Run(); |
EXPECT_EQ(blocking_stages[i], |
@@ -2814,8 +2750,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateBlockAsynchronously) { |
network_delegate.DoCallback(OK); |
} |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -2836,16 +2772,16 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelRequest) { |
test_server_.host_port_pair().ToString(), &network_delegate); |
{ |
- URLRequest r( |
- test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
// The proxy server is not set before cancellation. |
- EXPECT_TRUE(r.proxy_server().IsEmpty()); |
- EXPECT_EQ(ERR_EMPTY_RESPONSE, r.status().error()); |
+ EXPECT_TRUE(r->proxy_server().IsEmpty()); |
+ EXPECT_EQ(ERR_EMPTY_RESPONSE, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -2869,15 +2805,16 @@ void NetworkDelegateCancelRequest(BlockingNetworkDelegate::BlockMode block_mode, |
context.Init(); |
{ |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
// The proxy server is not set before cancellation. |
- EXPECT_TRUE(r.proxy_server().IsEmpty()); |
- EXPECT_EQ(ERR_BLOCKED_BY_CLIENT, r.status().error()); |
+ EXPECT_TRUE(r->proxy_server().IsEmpty()); |
+ EXPECT_EQ(ERR_BLOCKED_BY_CLIENT, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -2947,37 +2884,38 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequest) { |
{ |
GURL original_url(test_server_.GetURL("empty.html")); |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
// Quit after hitting the redirect, so can check the headers. |
d.set_quit_on_redirect(true); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
// Check headers from URLRequestJob. |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(307, r.GetResponseCode()); |
- EXPECT_EQ(307, r.response_headers()->response_code()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(307, r->GetResponseCode()); |
+ EXPECT_EQ(307, r->response_headers()->response_code()); |
std::string location; |
- ASSERT_TRUE(r.response_headers()->EnumerateHeader(NULL, "Location", |
- &location)); |
+ ASSERT_TRUE(r->response_headers()->EnumerateHeader(NULL, "Location", |
+ &location)); |
EXPECT_EQ(redirect_url, GURL(location)); |
// Let the request finish. |
- r.FollowDeferredRedirect(); |
+ r->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair())); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_TRUE(r->proxy_server().Equals(test_server_.host_port_pair())); |
EXPECT_EQ( |
1, network_delegate.observed_before_proxy_headers_sent_callbacks()); |
EXPECT_TRUE( |
network_delegate.last_observed_proxy().Equals( |
test_server_.host_port_pair())); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(redirect_url, r.url()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(2U, r.url_chain().size()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(redirect_url, r->url()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3000,37 +2938,38 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestSynchronously) { |
{ |
GURL original_url(test_server_.GetURL("empty.html")); |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
// Quit after hitting the redirect, so can check the headers. |
d.set_quit_on_redirect(true); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
// Check headers from URLRequestJob. |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(307, r.GetResponseCode()); |
- EXPECT_EQ(307, r.response_headers()->response_code()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(307, r->GetResponseCode()); |
+ EXPECT_EQ(307, r->response_headers()->response_code()); |
std::string location; |
- ASSERT_TRUE(r.response_headers()->EnumerateHeader(NULL, "Location", |
- &location)); |
+ ASSERT_TRUE(r->response_headers()->EnumerateHeader(NULL, "Location", |
+ &location)); |
EXPECT_EQ(redirect_url, GURL(location)); |
// Let the request finish. |
- r.FollowDeferredRedirect(); |
+ r->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair())); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_TRUE(r->proxy_server().Equals(test_server_.host_port_pair())); |
EXPECT_EQ( |
1, network_delegate.observed_before_proxy_headers_sent_callbacks()); |
EXPECT_TRUE( |
network_delegate.last_observed_proxy().Equals( |
test_server_.host_port_pair())); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(redirect_url, r.url()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(2U, r.url_chain().size()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(redirect_url, r->url()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3056,40 +2995,41 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestPost) { |
{ |
GURL original_url(test_server_.GetURL("empty.html")); |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); |
- r.set_method("POST"); |
- r.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_method("POST"); |
+ r->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kContentLength, |
base::UintToString(arraysize(kData) - 1)); |
- r.SetExtraRequestHeaders(headers); |
+ r->SetExtraRequestHeaders(headers); |
// Quit after hitting the redirect, so can check the headers. |
d.set_quit_on_redirect(true); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
// Check headers from URLRequestJob. |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(307, r.GetResponseCode()); |
- EXPECT_EQ(307, r.response_headers()->response_code()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(307, r->GetResponseCode()); |
+ EXPECT_EQ(307, r->response_headers()->response_code()); |
std::string location; |
- ASSERT_TRUE(r.response_headers()->EnumerateHeader(NULL, "Location", |
- &location)); |
+ ASSERT_TRUE(r->response_headers()->EnumerateHeader(NULL, "Location", |
+ &location)); |
EXPECT_EQ(redirect_url, GURL(location)); |
// Let the request finish. |
- r.FollowDeferredRedirect(); |
+ r->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(redirect_url, r.url()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(2U, r.url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(redirect_url, r->url()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
- EXPECT_EQ("POST", r.method()); |
+ EXPECT_EQ("POST", r->method()); |
EXPECT_EQ(kData, d.data_received()); |
} |
EXPECT_EQ(1, network_delegate.destroyed_requests()); |
@@ -3112,22 +3052,24 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestOnHeadersReceived) { |
{ |
GURL original_url(test_server_.GetURL("empty.html")); |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair())); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_TRUE(r->proxy_server().Equals(test_server_.host_port_pair())); |
EXPECT_EQ( |
2, network_delegate.observed_before_proxy_headers_sent_callbacks()); |
EXPECT_TRUE( |
network_delegate.last_observed_proxy().Equals( |
test_server_.host_port_pair())); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(redirect_url, r.url()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(2U, r.url_chain().size()); |
+ |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(redirect_url, r->url()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
EXPECT_EQ(2, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3153,14 +3095,15 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncNoAction) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_TRUE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3184,20 +3127,21 @@ TEST_F(URLRequestTestHTTP, |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
{ |
HttpRequestHeaders headers; |
- EXPECT_TRUE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_TRUE(r->GetFullRequestHeaders(&headers)); |
EXPECT_FALSE(headers.HasHeader("Authorization")); |
} |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_TRUE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3225,13 +3169,14 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncSetAuth) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_FALSE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3260,20 +3205,21 @@ TEST_F(URLRequestTestHTTP, |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_FALSE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
{ |
HttpRequestHeaders headers; |
- EXPECT_TRUE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_TRUE(r->GetFullRequestHeaders(&headers)); |
EXPECT_TRUE(headers.HasHeader("Authorization")); |
} |
} |
@@ -3298,13 +3244,14 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncCancel) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(401, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(401, r->GetResponseCode()); |
EXPECT_FALSE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3332,13 +3279,14 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncNoAction) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_TRUE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3367,14 +3315,15 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncSetAuth) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(0, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(0, r->status().error()); |
- EXPECT_EQ(200, r.GetResponseCode()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
EXPECT_FALSE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3400,13 +3349,14 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncCancel) { |
{ |
GURL url(test_server_.GetURL("auth-basic")); |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(401, r.GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(401, r->GetResponseCode()); |
EXPECT_FALSE(d.auth_required_called()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
@@ -3430,20 +3380,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting1) { |
context.Init(); |
{ |
- URLRequest r( |
- test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(BlockingNetworkDelegate::ON_BEFORE_URL_REQUEST, |
network_delegate.stage_blocked_for_callback()); |
EXPECT_EQ(0, network_delegate.completed_requests()); |
// Cancel before callback. |
- r.Cancel(); |
+ r->Cancel(); |
// Ensure that network delegate is notified. |
EXPECT_EQ(1, network_delegate.completed_requests()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
- EXPECT_EQ(ERR_ABORTED, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
+ EXPECT_EQ(ERR_ABORTED, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3467,20 +3417,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting2) { |
context.Init(); |
{ |
- URLRequest r( |
- test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(BlockingNetworkDelegate::ON_BEFORE_SEND_HEADERS, |
network_delegate.stage_blocked_for_callback()); |
EXPECT_EQ(0, network_delegate.completed_requests()); |
// Cancel before callback. |
- r.Cancel(); |
+ r->Cancel(); |
// Ensure that network delegate is notified. |
EXPECT_EQ(1, network_delegate.completed_requests()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
- EXPECT_EQ(ERR_ABORTED, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
+ EXPECT_EQ(ERR_ABORTED, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3503,20 +3453,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting3) { |
context.Init(); |
{ |
- URLRequest r( |
- test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(BlockingNetworkDelegate::ON_HEADERS_RECEIVED, |
network_delegate.stage_blocked_for_callback()); |
EXPECT_EQ(0, network_delegate.completed_requests()); |
// Cancel before callback. |
- r.Cancel(); |
+ r->Cancel(); |
// Ensure that network delegate is notified. |
EXPECT_EQ(1, network_delegate.completed_requests()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
- EXPECT_EQ(ERR_ABORTED, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
+ EXPECT_EQ(ERR_ABORTED, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3539,20 +3489,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting4) { |
context.Init(); |
{ |
- URLRequest r( |
- test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(BlockingNetworkDelegate::ON_AUTH_REQUIRED, |
network_delegate.stage_blocked_for_callback()); |
EXPECT_EQ(0, network_delegate.completed_requests()); |
// Cancel before callback. |
- r.Cancel(); |
+ r->Cancel(); |
// Ensure that network delegate is notified. |
EXPECT_EQ(1, network_delegate.completed_requests()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
- EXPECT_EQ(ERR_ABORTED, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
+ EXPECT_EQ(ERR_ABORTED, r->status().error()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -3571,18 +3521,18 @@ TEST_F(URLRequestTestHTTP, UnexpectedServerAuthTest) { |
TestDelegate d; |
{ |
- URLRequest r( |
- GURL("https://www.server-auth.com/"), DEFAULT_PRIORITY, &d, &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ GURL("https://www.server-auth.com/"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
// The proxy server is not set before failure. |
- EXPECT_TRUE(r.proxy_server().IsEmpty()); |
- EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error()); |
+ EXPECT_TRUE(r->proxy_server().IsEmpty()); |
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r->status().error()); |
} |
} |
@@ -3591,13 +3541,11 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -3605,9 +3553,9 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) { |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_NE(0, d.bytes_received()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
// TODO(eroman): Add back the NetLog tests... |
} |
@@ -3660,13 +3608,11 @@ TEST_F(URLRequestTestHTTP, GetTest) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -3674,9 +3620,9 @@ TEST_F(URLRequestTestHTTP, GetTest) { |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_NE(0, d.bytes_received()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
} |
} |
@@ -3686,13 +3632,14 @@ TEST_F(URLRequestTestHTTP, GetTest_GetFullRequestHeaders) { |
TestDelegate d; |
{ |
GURL test_url(test_server_.GetURL(std::string())); |
- URLRequest r(test_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_url, DEFAULT_PRIORITY, &d, NULL)); |
HttpRequestHeaders headers; |
- EXPECT_FALSE(r.GetFullRequestHeaders(&headers)); |
+ EXPECT_FALSE(r->GetFullRequestHeaders(&headers)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -3700,9 +3647,9 @@ TEST_F(URLRequestTestHTTP, GetTest_GetFullRequestHeaders) { |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_NE(0, d.bytes_received()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
EXPECT_TRUE(d.have_full_request_headers()); |
CheckFullRequestHeaders(d.full_request_headers(), test_url); |
@@ -3714,27 +3661,25 @@ TEST_F(URLRequestTestHTTP, GetTestLoadTiming) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
LoadTimingInfo load_timing_info; |
- r.GetLoadTimingInfo(&load_timing_info); |
+ r->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_NE(0, d.bytes_received()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
} |
} |
@@ -3767,24 +3712,24 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) { |
context.set_network_delegate(&network_delegate); |
context.Init(); |
- URLRequest r( |
- test_server_.GetURL(test_file), DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL(test_file), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
VLOG(1) << " Received " << d.bytes_received() << " bytes" |
- << " status = " << r.status().status() |
- << " error = " << r.status().error(); |
+ << " status = " << r->status().status() |
+ << " error = " << r->status().error(); |
if (test_expect_success[i]) { |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()) |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()) |
<< " Parameter = \"" << test_file << "\""; |
} else { |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
- EXPECT_EQ(ERR_CONTENT_LENGTH_MISMATCH, r.status().error()) |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
+ EXPECT_EQ(ERR_CONTENT_LENGTH_MISMATCH, r->status().error()) |
<< " Parameter = \"" << test_file << "\""; |
} |
} |
@@ -3804,19 +3749,17 @@ TEST_F(URLRequestTestHTTP, HTTPSToHTTPRedirectNoRefererTest) { |
// server should not be sent the referer. |
GURL http_destination = test_server_.GetURL(std::string()); |
TestDelegate d; |
- URLRequest req( |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
https_test_server.GetURL("server-redirect?" + http_destination.spec()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetReferrer("https://www.referrer.com/"); |
- req.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetReferrer("https://www.referrer.com/"); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(1, d.received_redirect_count()); |
- EXPECT_EQ(http_destination, req.url()); |
- EXPECT_EQ(std::string(), req.referrer()); |
+ EXPECT_EQ(http_destination, req->url()); |
+ EXPECT_EQ(std::string(), req->referrer()); |
} |
TEST_F(URLRequestTestHTTP, RedirectLoadTiming) { |
@@ -3826,17 +3769,18 @@ TEST_F(URLRequestTestHTTP, RedirectLoadTiming) { |
GURL original_url = |
test_server_.GetURL("server-redirect?" + destination_url.spec()); |
TestDelegate d; |
- URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(1, d.received_redirect_count()); |
- EXPECT_EQ(destination_url, req.url()); |
- EXPECT_EQ(original_url, req.original_url()); |
- ASSERT_EQ(2U, req.url_chain().size()); |
- EXPECT_EQ(original_url, req.url_chain()[0]); |
- EXPECT_EQ(destination_url, req.url_chain()[1]); |
+ EXPECT_EQ(destination_url, req->url()); |
+ EXPECT_EQ(original_url, req->original_url()); |
+ ASSERT_EQ(2U, req->url_chain().size()); |
+ EXPECT_EQ(original_url, req->url_chain()[0]); |
+ EXPECT_EQ(destination_url, req->url_chain()[1]); |
LoadTimingInfo load_timing_info_before_redirect; |
EXPECT_TRUE(default_network_delegate_.GetLoadTimingInfoBeforeRedirect( |
@@ -3845,7 +3789,7 @@ TEST_F(URLRequestTestHTTP, RedirectLoadTiming) { |
CONNECT_TIMING_HAS_DNS_TIMES); |
LoadTimingInfo load_timing_info; |
- req.GetLoadTimingInfo(&load_timing_info); |
+ req->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
// Check that a new socket was used on redirect, since the server does not |
@@ -3866,18 +3810,19 @@ TEST_F(URLRequestTestHTTP, MultipleRedirectTest) { |
GURL original_url = test_server_.GetURL( |
"server-redirect?" + middle_redirect_url.spec()); |
TestDelegate d; |
- URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(2, d.received_redirect_count()); |
- EXPECT_EQ(destination_url, req.url()); |
- EXPECT_EQ(original_url, req.original_url()); |
- ASSERT_EQ(3U, req.url_chain().size()); |
- EXPECT_EQ(original_url, req.url_chain()[0]); |
- EXPECT_EQ(middle_redirect_url, req.url_chain()[1]); |
- EXPECT_EQ(destination_url, req.url_chain()[2]); |
+ EXPECT_EQ(destination_url, req->url()); |
+ EXPECT_EQ(original_url, req->original_url()); |
+ ASSERT_EQ(3U, req->url_chain().size()); |
+ EXPECT_EQ(original_url, req->url_chain()[0]); |
+ EXPECT_EQ(middle_redirect_url, req->url_chain()[1]); |
+ EXPECT_EQ(destination_url, req->url_chain()[2]); |
} |
// First and second pieces of information logged by delegates to URLRequests. |
@@ -4197,25 +4142,24 @@ TEST_F(URLRequestTestHTTP, DelegateInfoBeforeStart) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("empty.html"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); |
EXPECT_EQ(base::string16(), load_state.param); |
AsyncDelegateLogger::Run( |
- &r, |
+ r.get(), |
LOAD_STATE_WAITING_FOR_DELEGATE, |
LOAD_STATE_WAITING_FOR_DELEGATE, |
LOAD_STATE_IDLE, |
- base::Bind(&URLRequest::Start, base::Unretained(&r))); |
+ base::Bind(&URLRequest::Start, base::Unretained(r.get()))); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
} |
CapturingNetLog::CapturedEntryList entries; |
@@ -4245,19 +4189,18 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfo) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("simple.html"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("simple.html"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); |
EXPECT_EQ(base::string16(), load_state.param); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -4303,19 +4246,18 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoRedirect) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("server-redirect?simple.html"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("server-redirect?simple.html"), DEFAULT_PRIORITY, |
+ &request_delegate, NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); |
EXPECT_EQ(base::string16(), load_state.param); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
EXPECT_EQ(2, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -4386,19 +4328,18 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoAuth) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("auth-basic"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); |
EXPECT_EQ(base::string16(), load_state.param); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
EXPECT_EQ(1, network_delegate.created_requests()); |
EXPECT_EQ(0, network_delegate.destroyed_requests()); |
} |
@@ -4451,16 +4392,15 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfo) { |
// body are ignored. Since they are ignored, this test is robust against |
// the possibility of multiple reads being combined in the unlikely event |
// that it occurs. |
- URLRequest r(test_server_.GetURL("chunked?waitBetweenChunks=20"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("chunked?waitBetweenChunks=20"), DEFAULT_PRIORITY, |
+ &request_delegate, NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
} |
CapturingNetLog::CapturedEntryList entries; |
@@ -4505,16 +4445,15 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfoOnRedirect) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("server-redirect?simple.html"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("server-redirect?simple.html"), DEFAULT_PRIORITY, |
+ &request_delegate, NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(200, r.GetResponseCode()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(200, r->GetResponseCode()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
} |
CapturingNetLog::CapturedEntryList entries; |
@@ -4570,14 +4509,13 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateOnRedirectCancelled) { |
context.Init(); |
{ |
- URLRequest r(test_server_.GetURL("server-redirect?simple.html"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- &context); |
- LoadStateWithParam load_state = r.GetLoadState(); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ test_server_.GetURL("server-redirect?simple.html"), DEFAULT_PRIORITY, |
+ &request_delegate, NULL)); |
+ LoadStateWithParam load_state = r->GetLoadState(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
} |
CapturingNetLog::CapturedEntryList entries; |
@@ -4639,16 +4577,17 @@ TEST_F(URLRequestTestHTTP, RedirectWithAdditionalHeadersTest) { |
GURL original_url = test_server_.GetURL( |
"server-redirect?" + destination_url.spec()); |
RedirectWithAdditionalHeadersDelegate d; |
- URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
std::string value; |
- const HttpRequestHeaders& headers = req.extra_request_headers(); |
+ const HttpRequestHeaders& headers = req->extra_request_headers(); |
EXPECT_TRUE(headers.GetHeader(kExtraHeader, &value)); |
EXPECT_EQ(kExtraValue, value); |
- EXPECT_FALSE(req.is_pending()); |
- EXPECT_FALSE(req.is_redirecting()); |
+ EXPECT_FALSE(req->is_pending()); |
+ EXPECT_FALSE(req->is_redirecting()); |
EXPECT_EQ(kExtraValue, d.data_received()); |
} |
@@ -4675,31 +4614,30 @@ TEST_F(URLRequestTestHTTP, RedirectWithHeaderRemovalTest) { |
GURL original_url = test_server_.GetURL( |
"server-redirect?" + destination_url.spec()); |
RedirectWithHeaderRemovalDelegate d; |
- URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.SetExtraRequestHeaderByName(kExtraHeaderToRemove, "dummy", false); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetExtraRequestHeaderByName(kExtraHeaderToRemove, "dummy", false); |
+ req->Start(); |
base::RunLoop().Run(); |
std::string value; |
- const HttpRequestHeaders& headers = req.extra_request_headers(); |
+ const HttpRequestHeaders& headers = req->extra_request_headers(); |
EXPECT_FALSE(headers.GetHeader(kExtraHeaderToRemove, &value)); |
- EXPECT_FALSE(req.is_pending()); |
- EXPECT_FALSE(req.is_redirecting()); |
+ EXPECT_FALSE(req->is_pending()); |
+ EXPECT_FALSE(req->is_redirecting()); |
EXPECT_EQ("None", d.data_received()); |
} |
TEST_F(URLRequestTestHTTP, CancelTest) { |
TestDelegate d; |
{ |
- URLRequest r(GURL("http://www.google.com/"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ GURL("http://www.google.com/"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
- r.Cancel(); |
+ r->Cancel(); |
base::RunLoop().Run(); |
@@ -4716,22 +4654,20 @@ TEST_F(URLRequestTestHTTP, CancelTest2) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
d.set_cancel_in_response_started(true); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.bytes_received()); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
} |
} |
@@ -4740,15 +4676,13 @@ TEST_F(URLRequestTestHTTP, CancelTest3) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
d.set_cancel_in_received_data(true); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -4758,7 +4692,7 @@ TEST_F(URLRequestTestHTTP, CancelTest3) { |
// or it could have been all the bytes. |
// EXPECT_EQ(0, d.bytes_received()); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
} |
} |
@@ -4767,13 +4701,11 @@ TEST_F(URLRequestTestHTTP, CancelTest4) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
// The request will be implicitly canceled when it is destroyed. The |
// test delegate must not post a quit message when this happens because |
@@ -4796,27 +4728,23 @@ TEST_F(URLRequestTestHTTP, CancelTest5) { |
// populate cache |
{ |
TestDelegate d; |
- URLRequest r(test_server_.GetURL("cachetime"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("cachetime"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
} |
// cancel read from cache (see bug 990242) |
{ |
TestDelegate d; |
- URLRequest r(test_server_.GetURL("cachetime"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- r.Cancel(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("cachetime"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ r->Cancel(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::CANCELED, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.bytes_received()); |
EXPECT_FALSE(d.received_data_before_response()); |
@@ -4838,18 +4766,18 @@ TEST_F(URLRequestTestHTTP, PostEmptyTest) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.set_method("POST"); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_method("POST"); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
ASSERT_EQ(1, d.response_started_count()) |
- << "request failed: " << r.status().status() |
- << ", error: " << r.status().error(); |
+ << "request failed: " << r->status().status() |
+ << ", error: " << r->status().error(); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_TRUE(d.data_received().empty()); |
@@ -4861,9 +4789,9 @@ TEST_F(URLRequestTestHTTP, PostFileTest) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.set_method("POST"); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_method("POST"); |
base::FilePath dir; |
PathService::Get(base::DIR_EXE, &dir); |
@@ -4883,11 +4811,11 @@ TEST_F(URLRequestTestHTTP, PostFileTest) { |
0, |
kuint64max, |
base::Time())); |
- r.set_upload(make_scoped_ptr( |
+ r->set_upload(make_scoped_ptr( |
new UploadDataStream(element_readers.Pass(), 0))); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -4898,8 +4826,8 @@ TEST_F(URLRequestTestHTTP, PostFileTest) { |
ASSERT_EQ(size, base::ReadFile(path, buf.get(), size)); |
ASSERT_EQ(1, d.response_started_count()) |
- << "request failed: " << r.status().status() |
- << ", error: " << r.status().error(); |
+ << "request failed: " << r->status().status() |
+ << ", error: " << r->status().error(); |
EXPECT_FALSE(d.received_data_before_response()); |
@@ -4913,9 +4841,9 @@ TEST_F(URLRequestTestHTTP, PostUnreadableFileTest) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL("echo"), DEFAULT_PRIORITY, |
- &d, &default_context_); |
- r.set_method("POST"); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_method("POST"); |
ScopedVector<UploadElementReader> element_readers; |
@@ -4926,19 +4854,19 @@ TEST_F(URLRequestTestHTTP, PostUnreadableFileTest) { |
0, |
kuint64max, |
base::Time())); |
- r.set_upload(make_scoped_ptr( |
+ r->set_upload(make_scoped_ptr( |
new UploadDataStream(element_readers.Pass(), 0))); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(0, d.bytes_received()); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
- EXPECT_EQ(ERR_FILE_NOT_FOUND, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
+ EXPECT_EQ(ERR_FILE_NOT_FOUND, r->status().error()); |
} |
} |
@@ -4947,17 +4875,17 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataBeforeStart) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.EnableChunkedUpload(); |
- r.set_method("POST"); |
- AddChunksToUpload(&r); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->EnableChunkedUpload(); |
+ r->set_method("POST"); |
+ AddChunksToUpload(r.get()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- VerifyReceivedDataMatchesChunks(&r, &d); |
+ VerifyReceivedDataMatchesChunks(r.get(), &d); |
} |
} |
@@ -4966,16 +4894,16 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataJustAfterStart) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.EnableChunkedUpload(); |
- r.set_method("POST"); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
- AddChunksToUpload(&r); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->EnableChunkedUpload(); |
+ r->set_method("POST"); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
+ AddChunksToUpload(r.get()); |
base::RunLoop().Run(); |
- VerifyReceivedDataMatchesChunks(&r, &d); |
+ VerifyReceivedDataMatchesChunks(r.get(), &d); |
} |
} |
@@ -4984,18 +4912,18 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataAfterStart) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.EnableChunkedUpload(); |
- r.set_method("POST"); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->EnableChunkedUpload(); |
+ r->set_method("POST"); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().RunUntilIdle(); |
- AddChunksToUpload(&r); |
+ AddChunksToUpload(r.get()); |
base::RunLoop().Run(); |
- VerifyReceivedDataMatchesChunks(&r, &d); |
+ VerifyReceivedDataMatchesChunks(r.get(), &d); |
} |
} |
@@ -5003,17 +4931,16 @@ TEST_F(URLRequestTestHTTP, ResponseHeadersTest) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/with-headers.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/with-headers.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- const HttpResponseHeaders* headers = req.response_headers(); |
+ const HttpResponseHeaders* headers = req->response_headers(); |
// Simple sanity check that response_info() accesses the same data. |
- EXPECT_EQ(headers, req.response_info().headers.get()); |
+ EXPECT_EQ(headers, req->response_info().headers.get()); |
std::string header; |
EXPECT_TRUE(headers->GetNormalizedHeader("cache-control", &header)); |
@@ -5039,11 +4966,10 @@ TEST_F(URLRequestTestHTTP, ProcessSTS) { |
ASSERT_TRUE(https_test_server.Start()); |
TestDelegate d; |
- URLRequest request(https_test_server.GetURL("files/hsts-headers.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- request.Start(); |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
+ https_test_server.GetURL("files/hsts-headers.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ request->Start(); |
base::RunLoop().Run(); |
TransportSecurityState* security_state = |
@@ -5082,11 +5008,10 @@ TEST_F(URLRequestTestHTTP, MAYBE_ProcessPKP) { |
ASSERT_TRUE(https_test_server.Start()); |
TestDelegate d; |
- URLRequest request(https_test_server.GetURL("files/hpkp-headers.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- request.Start(); |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
+ https_test_server.GetURL("files/hpkp-headers.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ request->Start(); |
base::RunLoop().Run(); |
TransportSecurityState* security_state = |
@@ -5111,12 +5036,10 @@ TEST_F(URLRequestTestHTTP, ProcessSTSOnce) { |
ASSERT_TRUE(https_test_server.Start()); |
TestDelegate d; |
- URLRequest request( |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
https_test_server.GetURL("files/hsts-multiple-headers.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- request.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ request->Start(); |
base::RunLoop().Run(); |
// We should have set parameters from the first header, not the second. |
@@ -5140,12 +5063,10 @@ TEST_F(URLRequestTestHTTP, ProcessSTSAndPKP) { |
ASSERT_TRUE(https_test_server.Start()); |
TestDelegate d; |
- URLRequest request( |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
https_test_server.GetURL("files/hsts-and-hpkp-headers.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- request.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ request->Start(); |
base::RunLoop().Run(); |
// We should have set parameters from the first header, not the second. |
@@ -5181,12 +5102,10 @@ TEST_F(URLRequestTestHTTP, ProcessSTSAndPKP2) { |
ASSERT_TRUE(https_test_server.Start()); |
TestDelegate d; |
- URLRequest request( |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
https_test_server.GetURL("files/hsts-and-hpkp-headers2.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- request.Start(); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ request->Start(); |
base::RunLoop().Run(); |
TransportSecurityState* security_state = |
@@ -5211,21 +5130,20 @@ TEST_F(URLRequestTestHTTP, ContentTypeNormalizationTest) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/content-type-normalization.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/content-type-normalization.html"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
std::string mime_type; |
- req.GetMimeType(&mime_type); |
+ req->GetMimeType(&mime_type); |
EXPECT_EQ("text/html", mime_type); |
std::string charset; |
- req.GetCharset(&charset); |
+ req->GetCharset(&charset); |
EXPECT_EQ("utf-8", charset); |
- req.Cancel(); |
+ req->Cancel(); |
} |
TEST_F(URLRequestTestHTTP, ProtocolHandlerAndFactoryRestrictDataRedirects) { |
@@ -5253,15 +5171,14 @@ TEST_F(URLRequestTestHTTP, RestrictFileRedirects) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/redirect-to-file.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-to-file.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_UNSAFE_REDIRECT, req.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, req->status().error()); |
} |
#endif // !defined(DISABLE_FILE_SUPPORT) |
@@ -5269,30 +5186,28 @@ TEST_F(URLRequestTestHTTP, RestrictDataRedirects) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/redirect-to-data.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-to-data.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::MessageLoop::current()->Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_UNSAFE_REDIRECT, req.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, req->status().error()); |
} |
TEST_F(URLRequestTestHTTP, RedirectToInvalidURL) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/redirect-to-invalid-url.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-to-invalid-url.html"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_INVALID_URL, req.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_INVALID_URL, req->status().error()); |
} |
// Make sure redirects are cached, despite not reading their bodies. |
@@ -5303,31 +5218,33 @@ TEST_F(URLRequestTestHTTP, CacheRedirect) { |
{ |
TestDelegate d; |
- URLRequest req(redirect_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ redirect_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
EXPECT_EQ(1, d.received_redirect_count()); |
- EXPECT_EQ(test_server_.GetURL("echo"), req.url()); |
+ EXPECT_EQ(test_server_.GetURL("echo"), req->url()); |
} |
{ |
TestDelegate d; |
d.set_quit_on_redirect(true); |
- URLRequest req(redirect_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ redirect_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
EXPECT_EQ(0, d.response_started_count()); |
- EXPECT_TRUE(req.was_cached()); |
+ EXPECT_TRUE(req->was_cached()); |
- req.FollowDeferredRedirect(); |
+ req->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
EXPECT_EQ(1, d.response_started_count()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
- EXPECT_EQ(test_server_.GetURL("echo"), req.url()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
+ EXPECT_EQ(test_server_.GetURL("echo"), req->url()); |
} |
} |
@@ -5345,24 +5262,26 @@ TEST_F(URLRequestTestHTTP, NoCacheOnNetworkDelegateRedirect) { |
redirect_to_url); |
TestDelegate d; |
- URLRequest req(initial_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ initial_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
EXPECT_EQ(1, d.received_redirect_count()); |
- EXPECT_EQ(redirect_to_url, req.url()); |
+ EXPECT_EQ(redirect_to_url, req->url()); |
} |
{ |
TestDelegate d; |
- URLRequest req(initial_url, DEFAULT_PRIORITY, &d, &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ initial_url, DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
- EXPECT_FALSE(req.was_cached()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
+ EXPECT_FALSE(req->was_cached()); |
EXPECT_EQ(0, d.received_redirect_count()); |
- EXPECT_EQ(initial_url, req.url()); |
+ EXPECT_EQ(initial_url, req->url()); |
} |
} |
@@ -5377,19 +5296,17 @@ TEST_F(URLRequestTestHTTP, UnsafeRedirectToWhitelistedUnsafeURL) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL("whatever"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("whatever"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(unsafe_url, r.url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(unsafe_url, r->url()); |
EXPECT_EQ("this-is-considered-an-unsafe-url", d.data_received()); |
} |
} |
@@ -5407,16 +5324,14 @@ TEST_F(URLRequestTestHTTP, UnsafeRedirectToDifferentUnsafeURL) { |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL("whatever"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("whatever"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
- EXPECT_EQ(ERR_UNSAFE_REDIRECT, r.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, r->status().error()); |
} |
} |
@@ -5434,16 +5349,17 @@ TEST_F(URLRequestTestHTTP, UnsafeRedirectWithDifferentReferenceFragment) { |
TestDelegate d; |
{ |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(expected_url, r.url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(expected_url, r->url()); |
} |
} |
@@ -5462,16 +5378,17 @@ TEST_F(URLRequestTestHTTP, RedirectWithReferenceFragmentAndUnrelatedUnsafeUrl) { |
TestDelegate d; |
{ |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(expected_redirect_url, r.url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(expected_redirect_url, r->url()); |
} |
} |
@@ -5489,16 +5406,17 @@ TEST_F(URLRequestTestHTTP, RedirectWithReferenceFragment) { |
TestDelegate d; |
{ |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(redirect_url, r.url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(redirect_url, r->url()); |
} |
} |
@@ -5511,32 +5429,31 @@ TEST_F(URLRequestTestHTTP, RedirectJobWithReferenceFragment) { |
GURL redirect_url(test_server_.GetURL("echo")); |
TestDelegate d; |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
URLRequestRedirectJob* job = new URLRequestRedirectJob( |
- &r, &default_network_delegate_, redirect_url, |
+ r.get(), &default_network_delegate_, redirect_url, |
URLRequestRedirectJob::REDIRECT_302_FOUND, "Very Good Reason"); |
AddTestInterceptor()->set_main_intercept_job(job); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(redirect_url, r.url()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(redirect_url, r->url()); |
} |
TEST_F(URLRequestTestHTTP, NoUserPassInReferrer) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Referer"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetReferrer("http://user:pass@foo.com/"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Referer"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetReferrer("http://user:pass@foo.com/"); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("http://foo.com/"), d.data_received()); |
@@ -5546,12 +5463,10 @@ TEST_F(URLRequestTestHTTP, NoFragmentInReferrer) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Referer"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetReferrer("http://foo.com/test#fragment"); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Referer"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetReferrer("http://foo.com/test#fragment"); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("http://foo.com/test"), d.data_received()); |
@@ -5561,13 +5476,11 @@ TEST_F(URLRequestTestHTTP, EmptyReferrerAfterValidReferrer) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Referer"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.SetReferrer("http://foo.com/test#fragment"); |
- req.SetReferrer(""); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Referer"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->SetReferrer("http://foo.com/test#fragment"); |
+ req->SetReferrer(""); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("None"), d.data_received()); |
@@ -5582,20 +5495,21 @@ TEST_F(URLRequestTestHTTP, DeferredBeforeNetworkStart) { |
{ |
d.set_quit_on_network_start(true); |
GURL test_url(test_server_.GetURL("echo")); |
- URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_url, DEFAULT_PRIORITY, &d, NULL)); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_before_network_start_count()); |
EXPECT_EQ(0, d.response_started_count()); |
- req.ResumeNetworkStart(); |
+ req->ResumeNetworkStart(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_NE(0, d.bytes_received()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
} |
} |
@@ -5608,23 +5522,22 @@ TEST_F(URLRequestTestHTTP, BeforeNetworkStartCalledOnce) { |
{ |
d.set_quit_on_redirect(true); |
d.set_quit_on_network_start(true); |
- URLRequest req(test_server_.GetURL("server-redirect?echo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("server-redirect?echo"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_before_network_start_count()); |
EXPECT_EQ(0, d.response_started_count()); |
EXPECT_EQ(0, d.received_redirect_count()); |
- req.ResumeNetworkStart(); |
+ req->ResumeNetworkStart(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
- req.FollowDeferredRedirect(); |
+ req->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
// Check that the redirect's new network transaction does not get propagated |
@@ -5633,7 +5546,7 @@ TEST_F(URLRequestTestHTTP, BeforeNetworkStartCalledOnce) { |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_NE(0, d.bytes_received()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
} |
} |
@@ -5645,20 +5558,21 @@ TEST_F(URLRequestTestHTTP, CancelOnBeforeNetworkStart) { |
{ |
d.set_quit_on_network_start(true); |
GURL test_url(test_server_.GetURL("echo")); |
- URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_url, DEFAULT_PRIORITY, &d, NULL)); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_before_network_start_count()); |
EXPECT_EQ(0, d.response_started_count()); |
- req.Cancel(); |
+ req->Cancel(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.bytes_received()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
} |
@@ -5668,17 +5582,16 @@ TEST_F(URLRequestTestHTTP, CancelRedirect) { |
TestDelegate d; |
{ |
d.set_cancel_in_received_redirect(true); |
- URLRequest req(test_server_.GetURL("files/redirect-test.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-test.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.bytes_received()); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
} |
@@ -5689,19 +5602,20 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect) { |
{ |
d.set_quit_on_redirect(true); |
GURL test_url(test_server_.GetURL("files/redirect-test.html")); |
- URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_url, DEFAULT_PRIORITY, &d, NULL)); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
- req.FollowDeferredRedirect(); |
+ req->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
base::FilePath path; |
PathService::Get(base::DIR_SOURCE_ROOT, &path); |
@@ -5723,11 +5637,12 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect_GetFullRequestHeaders) { |
{ |
d.set_quit_on_redirect(true); |
GURL test_url(test_server_.GetURL("files/redirect-test.html")); |
- URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_url, DEFAULT_PRIORITY, &d, NULL)); |
EXPECT_FALSE(d.have_full_request_headers()); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
@@ -5735,7 +5650,7 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect_GetFullRequestHeaders) { |
CheckFullRequestHeaders(d.full_request_headers(), test_url); |
d.ClearFullRequestHeaders(); |
- req.FollowDeferredRedirect(); |
+ req->FollowDeferredRedirect(); |
base::RunLoop().Run(); |
GURL target_url(test_server_.GetURL("files/with-headers.html")); |
@@ -5743,7 +5658,7 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect_GetFullRequestHeaders) { |
EXPECT_TRUE(d.have_full_request_headers()); |
CheckFullRequestHeaders(d.full_request_headers(), target_url); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status()); |
base::FilePath path; |
PathService::Get(base::DIR_SOURCE_ROOT, &path); |
@@ -5764,22 +5679,21 @@ TEST_F(URLRequestTestHTTP, CancelDeferredRedirect) { |
TestDelegate d; |
{ |
d.set_quit_on_redirect(true); |
- URLRequest req(test_server_.GetURL("files/redirect-test.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-test.html"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.received_redirect_count()); |
- req.Cancel(); |
+ req->Cancel(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_EQ(0, d.bytes_received()); |
EXPECT_FALSE(d.received_data_before_response()); |
- EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status()); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status()); |
} |
} |
@@ -5789,58 +5703,55 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { |
// Populate the cache. |
{ |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheadercache?foo"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader("foo", "1"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
LoadTimingInfo load_timing_info; |
- req.GetLoadTimingInfo(&load_timing_info); |
+ req->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
} |
// Expect a cache hit. |
{ |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheadercache?foo"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader("foo", "1"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_TRUE(req.was_cached()); |
+ EXPECT_TRUE(req->was_cached()); |
LoadTimingInfo load_timing_info; |
- req.GetLoadTimingInfo(&load_timing_info); |
+ req->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingCacheHitNoNetwork(load_timing_info); |
} |
// Expect a cache miss. |
{ |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheadercache?foo"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader("foo", "2"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_FALSE(req.was_cached()); |
+ EXPECT_FALSE(req->was_cached()); |
LoadTimingInfo load_timing_info; |
- req.GetLoadTimingInfo(&load_timing_info); |
+ req->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
} |
} |
@@ -5853,11 +5764,9 @@ TEST_F(URLRequestTestHTTP, BasicAuth) { |
TestDelegate d; |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
- URLRequest r(test_server_.GetURL("auth-basic"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
@@ -5871,19 +5780,17 @@ TEST_F(URLRequestTestHTTP, BasicAuth) { |
TestDelegate d; |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
- URLRequest r(test_server_.GetURL("auth-basic"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.SetLoadFlags(LOAD_VALIDATE_CACHE); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->SetLoadFlags(LOAD_VALIDATE_CACHE); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos); |
// Should be the same cached document. |
- EXPECT_TRUE(r.was_cached()); |
+ EXPECT_TRUE(r->was_cached()); |
} |
} |
@@ -5906,8 +5813,9 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) { |
TestDelegate d; |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
- URLRequest r(url_requiring_auth, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url_requiring_auth, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
@@ -5935,8 +5843,9 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) { |
replacements.SetPasswordStr(password); |
GURL url_with_identity = url_requiring_auth.ReplaceComponents(replacements); |
- URLRequest r(url_with_identity, DEFAULT_PRIORITY, &d, &context); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ url_with_identity, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
@@ -5957,11 +5866,9 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { |
TestDelegate d; |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
- URLRequest r(test_server_.GetURL("auth-basic"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
@@ -5974,7 +5881,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { |
CONNECT_TIMING_HAS_DNS_TIMES); |
LoadTimingInfo load_timing_info; |
- r.GetLoadTimingInfo(&load_timing_info); |
+ r->GetLoadTimingInfo(&load_timing_info); |
// The test server does not support keep alive sockets, so the second |
// request with auth should use a new socket. |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
@@ -5991,24 +5898,22 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { |
TestDelegate d; |
d.set_credentials(AuthCredentials(kUser, kSecret)); |
- URLRequest r(test_server_.GetURL("auth-basic"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.SetLoadFlags(LOAD_VALIDATE_CACHE); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->SetLoadFlags(LOAD_VALIDATE_CACHE); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos); |
// Should be the same cached document. |
- EXPECT_TRUE(r.was_cached()); |
+ EXPECT_TRUE(r->was_cached()); |
// Since there was a request that went over the wire, the load timing |
// information should include connection times. |
LoadTimingInfo load_timing_info; |
- r.GetLoadTimingInfo(&load_timing_info); |
+ r->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNotReused(load_timing_info, CONNECT_TIMING_HAS_DNS_TIMES); |
} |
} |
@@ -6023,12 +5928,11 @@ TEST_F(URLRequestTestHTTP, Post302RedirectGet) { |
const char kData[] = "hello world"; |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("files/redirect-to-echoall"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("POST"); |
- req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("files/redirect-to-echoall"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->set_method("POST"); |
+ req->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
// Set headers (some of which are specific to the POST). |
HttpRequestHeaders headers; |
@@ -6041,12 +5945,12 @@ TEST_F(URLRequestTestHTTP, Post302RedirectGet) { |
"Accept-Charset: ISO-8859-1,*,utf-8\r\n" |
"Content-Length: 11\r\n" |
"Origin: http://localhost:1337/"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
std::string mime_type; |
- req.GetMimeType(&mime_type); |
+ req->GetMimeType(&mime_type); |
EXPECT_EQ("text/html", mime_type); |
const std::string& data = d.data_received(); |
@@ -6125,14 +6029,15 @@ TEST_F(URLRequestTestHTTP, NoRedirectOn308WithoutLocationHeader) { |
TestDelegate d; |
const GURL url = test_server_.GetURL("files/308-without-location-header"); |
- URLRequest request(url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> request(default_context_.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
- request.Start(); |
+ request->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, request.status().status()); |
- EXPECT_EQ(OK, request.status().error()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, request->status().status()); |
+ EXPECT_EQ(OK, request->status().error()); |
EXPECT_EQ(0, d.received_redirect_count()); |
- EXPECT_EQ(308, request.response_headers()->response_code()); |
+ EXPECT_EQ(308, request->response_headers()->response_code()); |
EXPECT_EQ("This is not a redirect.", d.data_received()); |
} |
@@ -6144,16 +6049,17 @@ TEST_F(URLRequestTestHTTP, Redirect302PreserveReferenceFragment) { |
TestDelegate d; |
{ |
- URLRequest r(original_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ original_url, DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(original_url, r.original_url()); |
- EXPECT_EQ(expected_url, r.url()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(original_url, r->original_url()); |
+ EXPECT_EQ(expected_url, r->url()); |
} |
} |
@@ -6165,16 +6071,17 @@ TEST_F(URLRequestTestHTTP, RedirectPreserveFirstPartyURL) { |
TestDelegate d; |
{ |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &default_context_); |
- r.set_first_party_for_cookies(first_party_url); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_first_party_for_cookies(first_party_url); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(first_party_url, r.first_party_for_cookies()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(first_party_url, r->first_party_for_cookies()); |
} |
} |
@@ -6187,18 +6094,19 @@ TEST_F(URLRequestTestHTTP, RedirectUpdateFirstPartyURL) { |
TestDelegate d; |
{ |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &default_context_); |
- r.set_first_party_for_cookies(original_first_party_url); |
- r.set_first_party_url_policy( |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->set_first_party_for_cookies(original_first_party_url); |
+ r->set_first_party_url_policy( |
URLRequest::UPDATE_FIRST_PARTY_URL_ON_REDIRECT); |
- r.Start(); |
+ r->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(2U, r.url_chain().size()); |
- EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); |
- EXPECT_EQ(OK, r.status().error()); |
- EXPECT_EQ(expected_first_party_url, r.first_party_for_cookies()); |
+ EXPECT_EQ(2U, r->url_chain().size()); |
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status()); |
+ EXPECT_EQ(OK, r->status().error()); |
+ EXPECT_EQ(expected_first_party_url, r->first_party_for_cookies()); |
} |
} |
@@ -6208,25 +6116,23 @@ TEST_F(URLRequestTestHTTP, InterceptPost302RedirectGet) { |
const char kData[] = "hello world"; |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("empty.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("POST"); |
- req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("POST"); |
+ req->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kContentLength, |
base::UintToString(arraysize(kData) - 1)); |
- req.SetExtraRequestHeaders(headers); |
+ req->SetExtraRequestHeaders(headers); |
URLRequestRedirectJob* job = new URLRequestRedirectJob( |
- &req, &default_network_delegate_, test_server_.GetURL("echo"), |
+ req.get(), &default_network_delegate_, test_server_.GetURL("echo"), |
URLRequestRedirectJob::REDIRECT_302_FOUND, "Very Good Reason"); |
AddTestInterceptor()->set_main_intercept_job(job); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ("GET", req.method()); |
+ EXPECT_EQ("GET", req->method()); |
} |
TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) { |
@@ -6235,26 +6141,24 @@ TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) { |
const char kData[] = "hello world"; |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("empty.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.set_method("POST"); |
- req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("POST"); |
+ req->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kContentLength, |
base::UintToString(arraysize(kData) - 1)); |
- req.SetExtraRequestHeaders(headers); |
+ req->SetExtraRequestHeaders(headers); |
URLRequestRedirectJob* job = new URLRequestRedirectJob( |
- &req, &default_network_delegate_, test_server_.GetURL("echo"), |
+ req.get(), &default_network_delegate_, test_server_.GetURL("echo"), |
URLRequestRedirectJob::REDIRECT_307_TEMPORARY_REDIRECT, |
"Very Good Reason"); |
AddTestInterceptor()->set_main_intercept_job(job); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ("POST", req.method()); |
+ EXPECT_EQ("POST", req->method()); |
EXPECT_EQ(kData, d.data_received()); |
} |
@@ -6270,11 +6174,10 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) { |
context.Init(); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Language"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ("en", d.data_received()); |
} |
@@ -6294,11 +6197,10 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) { |
context.set_http_user_agent_settings(&settings); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Language"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ("None", d.data_received()); |
} |
@@ -6309,14 +6211,13 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptLanguage) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Language"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kAcceptLanguage, "ru"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("ru"), d.data_received()); |
} |
@@ -6326,13 +6227,12 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptEncoding) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Encoding"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(ContainsString(d.data_received(), "gzip")); |
} |
@@ -6343,14 +6243,13 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptEncoding) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Encoding"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kAcceptEncoding, "identity"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_FALSE(ContainsString(d.data_received(), "gzip")); |
EXPECT_TRUE(ContainsString(d.data_received(), "identity")); |
@@ -6361,14 +6260,13 @@ TEST_F(URLRequestTestHTTP, SetAcceptCharset) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?Accept-Charset"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kAcceptCharset, "koi-8r"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("koi-8r"), d.data_received()); |
} |
@@ -6378,13 +6276,12 @@ TEST_F(URLRequestTestHTTP, DefaultUserAgent) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?User-Agent"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?User-Agent"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ(req.context()->http_user_agent_settings()->GetUserAgent(), |
+ EXPECT_EQ(default_context_.http_user_agent_settings()->GetUserAgent(), |
d.data_received()); |
} |
@@ -6394,14 +6291,13 @@ TEST_F(URLRequestTestHTTP, OverrideUserAgent) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("echoheader?User-Agent"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("echoheader?User-Agent"), DEFAULT_PRIORITY, &d, |
+ NULL)); |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kUserAgent, "Lynx (textmode)"); |
- req.SetExtraRequestHeaders(headers); |
- req.Start(); |
+ req->SetExtraRequestHeaders(headers); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(std::string("Lynx (textmode)"), d.data_received()); |
} |
@@ -6429,9 +6325,9 @@ TEST_F(URLRequestTestHTTP, EmptyHttpUserAgentSettings) { |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) { |
TestDelegate d; |
- URLRequest req( |
- test_server_.GetURL(tests[i].request), DEFAULT_PRIORITY, &d, &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ test_server_.GetURL(tests[i].request), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(tests[i].expected_response, d.data_received()) |
<< " Request = \"" << tests[i].request << "\""; |
@@ -6444,24 +6340,22 @@ TEST_F(URLRequestTestHTTP, SetSubsequentJobPriority) { |
ASSERT_TRUE(test_server_.Start()); |
TestDelegate d; |
- URLRequest req(test_server_.GetURL("empty.html"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); |
+ scoped_ptr<URLRequest> req(default_context_.CreateRequest( |
+ test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, NULL)); |
+ EXPECT_EQ(DEFAULT_PRIORITY, req->priority()); |
scoped_refptr<URLRequestRedirectJob> redirect_job = |
new URLRequestRedirectJob( |
- &req, &default_network_delegate_, test_server_.GetURL("echo"), |
+ req.get(), &default_network_delegate_, test_server_.GetURL("echo"), |
URLRequestRedirectJob::REDIRECT_302_FOUND, "Very Good Reason"); |
AddTestInterceptor()->set_main_intercept_job(redirect_job.get()); |
- req.SetPriority(LOW); |
- req.Start(); |
- EXPECT_TRUE(req.is_pending()); |
+ req->SetPriority(LOW); |
+ req->Start(); |
+ EXPECT_TRUE(req->is_pending()); |
scoped_refptr<URLRequestTestJob> job = |
- new URLRequestTestJob(&req, &default_network_delegate_); |
+ new URLRequestTestJob(req.get(), &default_network_delegate_); |
AddTestInterceptor()->set_main_intercept_job(job.get()); |
// Should trigger |job| to be started. |
@@ -6496,16 +6390,14 @@ TEST_F(URLRequestTestHTTP, NetworkSuspendTest) { |
context.Init(); |
TestDelegate d; |
- URLRequest req(GURL("http://127.0.0.1/"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ GURL("http://127.0.0.1/"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, req.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, req->status().error()); |
} |
// Check that creating a network request while entering/exiting suspend mode |
@@ -6531,16 +6423,14 @@ TEST_F(URLRequestTestHTTP, NetworkSuspendTestNoCache) { |
context.Init(); |
TestDelegate d; |
- URLRequest req(GURL("http://127.0.0.1/"), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.Start(); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ GURL("http://127.0.0.1/"), DEFAULT_PRIORITY, &d, NULL)); |
+ req->Start(); |
base::RunLoop().Run(); |
EXPECT_TRUE(d.request_failed()); |
- EXPECT_EQ(URLRequestStatus::FAILED, req.status().status()); |
- EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, req.status().error()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req->status().status()); |
+ EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, req->status().error()); |
} |
class HTTPSRequestTest : public testing::Test { |
@@ -6565,23 +6455,21 @@ TEST_F(HTTPSRequestTest, HTTPSGetTest) { |
TestDelegate d; |
{ |
- URLRequest r(test_server.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_NE(0, d.bytes_received()); |
- CheckSSLInfo(r.ssl_info()); |
+ CheckSSLInfo(r->ssl_info()); |
EXPECT_EQ(test_server.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
} |
} |
@@ -6599,13 +6487,11 @@ TEST_F(HTTPSRequestTest, HTTPSMismatchedTest) { |
TestDelegate d; |
{ |
d.set_allow_certificate_errors(err_allowed); |
- URLRequest r(test_server.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6614,7 +6500,7 @@ TEST_F(HTTPSRequestTest, HTTPSMismatchedTest) { |
EXPECT_TRUE(d.have_certificate_errors()); |
if (err_allowed) { |
EXPECT_NE(0, d.bytes_received()); |
- CheckSSLInfo(r.ssl_info()); |
+ CheckSSLInfo(r->ssl_info()); |
} else { |
EXPECT_EQ(0, d.bytes_received()); |
} |
@@ -6638,13 +6524,11 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) { |
TestDelegate d; |
{ |
d.set_allow_certificate_errors(err_allowed); |
- URLRequest r(test_server.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6653,7 +6537,7 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) { |
EXPECT_TRUE(d.have_certificate_errors()); |
if (err_allowed) { |
EXPECT_NE(0, d.bytes_received()); |
- CheckSSLInfo(r.ssl_info()); |
+ CheckSSLInfo(r->ssl_info()); |
} else { |
EXPECT_EQ(0, d.bytes_received()); |
} |
@@ -6688,14 +6572,13 @@ TEST_F(HTTPSRequestTest, HTTPSPreloadedHSTSTest) { |
context.Init(); |
TestDelegate d; |
- URLRequest r(GURL(base::StringPrintf("https://www.google.com:%d", |
- test_server.host_port_pair().port())), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ GURL(base::StringPrintf("https://www.google.com:%d", |
+ test_server.host_port_pair().port())), |
+ DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6741,14 +6624,13 @@ TEST_F(HTTPSRequestTest, HTTPSErrorsNoClobberTSSTest) { |
"www.google.com", &dynamic_domain_state)); |
TestDelegate d; |
- URLRequest r(GURL(base::StringPrintf("https://www.google.com:%d", |
- test_server.host_port_pair().port())), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
+ scoped_ptr<URLRequest> r(context.CreateRequest( |
+ GURL(base::StringPrintf("https://www.google.com:%d", |
+ test_server.host_port_pair().port())), |
+ DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6816,19 +6698,18 @@ TEST_F(HTTPSRequestTest, HSTSPreservesPosts) { |
// cause a certificate error. Ignore the error. |
d.set_allow_certificate_errors(true); |
- URLRequest req(GURL(base::StringPrintf("http://www.somewhere.com:%d/echo", |
- test_server.host_port_pair().port())), |
- DEFAULT_PRIORITY, |
- &d, |
- &context); |
- req.set_method("POST"); |
- req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
+ scoped_ptr<URLRequest> req(context.CreateRequest( |
+ GURL(base::StringPrintf("http://www.somewhere.com:%d/echo", |
+ test_server.host_port_pair().port())), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ req->set_method("POST"); |
+ req->set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); |
- req.Start(); |
+ req->Start(); |
base::RunLoop().Run(); |
- EXPECT_EQ("https", req.url().scheme()); |
- EXPECT_EQ("POST", req.method()); |
+ EXPECT_EQ("https", req->url().scheme()); |
+ EXPECT_EQ("POST", req->method()); |
EXPECT_EQ(kData, d.data_received()); |
LoadTimingInfo load_timing_info; |
@@ -6874,13 +6755,11 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) { |
SSLClientAuthTestDelegate d; |
{ |
- URLRequest r(test_server.GetURL(std::string()), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6891,7 +6770,7 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) { |
// Send no certificate. |
// TODO(davidben): Get temporary client cert import (with keys) working on |
// all platforms so we can test sending a cert as well. |
- r.ContinueWithCertificate(NULL); |
+ r->ContinueWithCertificate(NULL); |
base::RunLoop().Run(); |
@@ -6916,13 +6795,11 @@ TEST_F(HTTPSRequestTest, ResumeTest) { |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6934,13 +6811,11 @@ TEST_F(HTTPSRequestTest, ResumeTest) { |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -6989,13 +6864,11 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) { |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -7023,13 +6896,11 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) { |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -7077,9 +6948,8 @@ class HTTPSFallbackTest : public testing::Test { |
base::FilePath(FILE_PATH_LITERAL("net/data/ssl"))); |
ASSERT_TRUE(test_server.Start()); |
- request_.reset(new URLRequest( |
- test_server.GetURL(std::string()), DEFAULT_PRIORITY, |
- &delegate_, &context_)); |
+ request_ = context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &delegate_, NULL); |
request_->Start(); |
base::RunLoop().Run(); |
@@ -7254,13 +7124,11 @@ TEST_F(HTTPSSessionTest, DontResumeSessionsForInvalidCertificates) { |
cert_verifier_.set_default_result(ERR_CERT_DATE_INVALID); |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -7275,13 +7143,11 @@ TEST_F(HTTPSSessionTest, DontResumeSessionsForInvalidCertificates) { |
cert_verifier_.set_default_result(OK); |
{ |
TestDelegate d; |
- URLRequest r(test_server.GetURL("ssl-session-cache"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server.GetURL("ssl-session-cache"), DEFAULT_PRIORITY, &d, NULL)); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
@@ -7402,14 +7268,14 @@ class HTTPSOCSPTest : public HTTPSRequestTest { |
TestDelegate d; |
d.set_allow_certificate_errors(true); |
- URLRequest r( |
- test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context_); |
- r.Start(); |
+ scoped_ptr<URLRequest> r(context_.CreateRequest( |
+ test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
base::RunLoop().Run(); |
EXPECT_EQ(1, d.response_started_count()); |
- *out_cert_status = r.ssl_info().cert_status; |
+ *out_cert_status = r->ssl_info().cert_status; |
} |
virtual ~HTTPSOCSPTest() { |
@@ -7858,15 +7724,16 @@ TEST_F(URLRequestTestFTP, UnsafePort) { |
TestDelegate d; |
{ |
- URLRequest r(url, DEFAULT_PRIORITY, &d, &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ url, DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_FALSE(r.is_pending()); |
- EXPECT_EQ(URLRequestStatus::FAILED, r.status().status()); |
- EXPECT_EQ(ERR_UNSAFE_PORT, r.status().error()); |
+ EXPECT_FALSE(r->is_pending()); |
+ EXPECT_EQ(URLRequestStatus::FAILED, r->status().status()); |
+ EXPECT_EQ(ERR_UNSAFE_PORT, r->status().error()); |
} |
} |
@@ -7876,21 +7743,21 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPDirectoryListing) { |
TestDelegate d; |
{ |
- URLRequest r( |
- test_server_.GetURL("/"), DEFAULT_PRIORITY, &d, &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("/"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_LT(0, d.bytes_received()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
} |
} |
@@ -7903,26 +7770,24 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTestAnonymous) { |
app_path = app_path.AppendASCII("LICENSE"); |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURL("/LICENSE"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("/LICENSE"), DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
} |
} |
@@ -7935,30 +7800,28 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTest) { |
app_path = app_path.AppendASCII("LICENSE"); |
TestDelegate d; |
{ |
- URLRequest r( |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", "chrome"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(test_server_.host_port_pair().host(), |
- r.GetSocketAddress().host()); |
+ r->GetSocketAddress().host()); |
EXPECT_EQ(test_server_.host_port_pair().port(), |
- r.GetSocketAddress().port()); |
+ r->GetSocketAddress().port()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); |
LoadTimingInfo load_timing_info; |
- r.GetLoadTimingInfo(&load_timing_info); |
+ r->GetLoadTimingInfo(&load_timing_info); |
TestLoadTimingNoHttpResponse(load_timing_info); |
} |
} |
@@ -7972,20 +7835,19 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPassword) { |
app_path = app_path.AppendASCII("LICENSE"); |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURLWithUserAndPassword( |
- "/LICENSE", "chrome", "wrong_password"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", |
+ "wrong_password"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), 0); |
@@ -8004,20 +7866,19 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPasswordRestart) { |
// the initial login with wrong credentials will fail. |
d.set_credentials(AuthCredentials(kChrome, kChrome)); |
{ |
- URLRequest r(test_server_.GetURLWithUserAndPassword( |
- "/LICENSE", "chrome", "wrong_password"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", |
+ "wrong_password"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); |
@@ -8033,20 +7894,19 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUser) { |
app_path = app_path.AppendASCII("LICENSE"); |
TestDelegate d; |
{ |
- URLRequest r(test_server_.GetURLWithUserAndPassword( |
- "/LICENSE", "wrong_user", "chrome"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURLWithUserAndPassword("/LICENSE", "wrong_user", |
+ "chrome"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), 0); |
@@ -8065,20 +7925,19 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUserRestart) { |
// the initial login with wrong credentials will fail. |
d.set_credentials(AuthCredentials(kChrome, kChrome)); |
{ |
- URLRequest r(test_server_.GetURLWithUserAndPassword( |
- "/LICENSE", "wrong_user", "chrome"), |
- DEFAULT_PRIORITY, |
- &d, |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURLWithUserAndPassword("/LICENSE", "wrong_user", |
+ "chrome"), |
+ DEFAULT_PRIORITY, &d, NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d.response_started_count()); |
EXPECT_FALSE(d.received_data_before_response()); |
EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); |
@@ -8096,20 +7955,18 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) { |
scoped_ptr<TestDelegate> d(new TestDelegate); |
{ |
// Pass correct login identity in the URL. |
- URLRequest r( |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", "chrome"), |
- DEFAULT_PRIORITY, |
- d.get(), |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ DEFAULT_PRIORITY, d.get(), NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d->response_started_count()); |
EXPECT_FALSE(d->received_data_before_response()); |
EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); |
@@ -8118,19 +7975,17 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) { |
d.reset(new TestDelegate); |
{ |
// This request should use cached identity from previous request. |
- URLRequest r(test_server_.GetURL("/LICENSE"), |
- DEFAULT_PRIORITY, |
- d.get(), |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("/LICENSE"), DEFAULT_PRIORITY, d.get(), NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d->response_started_count()); |
EXPECT_FALSE(d->received_data_before_response()); |
EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); |
@@ -8150,20 +8005,19 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) { |
// the initial login with wrong credentials will fail. |
d->set_credentials(AuthCredentials(kChrome, kChrome)); |
{ |
- URLRequest r(test_server_.GetURLWithUserAndPassword( |
- "/LICENSE", "chrome", "wrong_password"), |
- DEFAULT_PRIORITY, |
- d.get(), |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", |
+ "wrong_password"), |
+ DEFAULT_PRIORITY, d.get(), NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d->response_started_count()); |
EXPECT_FALSE(d->received_data_before_response()); |
EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); |
@@ -8175,19 +8029,17 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) { |
{ |
// Don't pass wrong credentials in the URL, they would override valid cached |
// ones. |
- URLRequest r(test_server_.GetURL("/LICENSE"), |
- DEFAULT_PRIORITY, |
- d.get(), |
- &default_context_); |
- r.Start(); |
- EXPECT_TRUE(r.is_pending()); |
+ scoped_ptr<URLRequest> r(default_context_.CreateRequest( |
+ test_server_.GetURL("/LICENSE"), DEFAULT_PRIORITY, d.get(), NULL)); |
+ r->Start(); |
+ EXPECT_TRUE(r->is_pending()); |
base::RunLoop().Run(); |
int64 file_size = 0; |
base::GetFileSize(app_path, &file_size); |
- EXPECT_FALSE(r.is_pending()); |
+ EXPECT_FALSE(r->is_pending()); |
EXPECT_EQ(1, d->response_started_count()); |
EXPECT_FALSE(d->received_data_before_response()); |
EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); |