Index: net/url_request/url_request_ftp_job_unittest.cc |
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc |
index 8797a3584fb44196fa4b4183dff795f3e6fa0e0b..e672413228880bc2b1d43ef6ce03a129e065ddb7 100644 |
--- a/net/url_request/url_request_ftp_job_unittest.cc |
+++ b/net/url_request/url_request_ftp_job_unittest.cc |
@@ -268,16 +268,15 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, |
+ &request_delegate, NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(4); |
- EXPECT_TRUE(url_request.status().is_success()); |
- EXPECT_TRUE(url_request.proxy_server().Equals( |
+ EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_TRUE(url_request->proxy_server().Equals( |
net::HostPortPair::FromString("localhost:80"))); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
@@ -295,11 +294,10 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) { |
new MockAsyncProxyResolver, NULL)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
// Now |url_request| will be deleted before its completion, |
// resulting in it being orphaned. It should not crash. |
@@ -323,16 +321,15 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
- EXPECT_TRUE(url_request.status().is_success()); |
- EXPECT_TRUE(url_request.proxy_server().Equals( |
+ EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_TRUE(url_request->proxy_server().Equals( |
net::HostPortPair::FromString("localhost:80"))); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
@@ -369,15 +366,14 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthWithCredentials) { |
TestDelegate request_delegate; |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass"))); |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(9); |
- EXPECT_TRUE(url_request.status().is_success()); |
+ EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -402,15 +398,14 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
- EXPECT_TRUE(url_request.status().is_success()); |
+ EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -446,15 +441,14 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthWithCredentials) { |
TestDelegate request_delegate; |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass"))); |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(9); |
- EXPECT_TRUE(url_request.status().is_success()); |
+ EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -512,17 +506,17 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) { |
TestDelegate request_delegate; |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("proxyuser"), ASCIIToUTF16("proxypass"))); |
- URLRequest url_request( |
- url, DEFAULT_PRIORITY, &request_delegate, request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ url, DEFAULT_PRIORITY, &request_delegate, NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass"))); |
socket_data(0)->RunFor(9); |
- EXPECT_TRUE(url_request.status().is_success()); |
+ EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -545,16 +539,15 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- ASSERT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
- EXPECT_TRUE(url_request.status().is_success()); |
+ EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
@@ -579,26 +572,25 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotFollowRedirects) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate; |
- URLRequest url_request(GURL("ftp://ftp.example.com/"), |
- DEFAULT_PRIORITY, |
- &request_delegate, |
- request_context()); |
- url_request.Start(); |
- EXPECT_TRUE(url_request.is_pending()); |
+ scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
+ NULL)); |
+ url_request->Start(); |
+ EXPECT_TRUE(url_request->is_pending()); |
base::MessageLoop::current()->RunUntilIdle(); |
- EXPECT_TRUE(url_request.is_pending()); |
+ EXPECT_TRUE(url_request->is_pending()); |
EXPECT_EQ(0, request_delegate.response_started_count()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
- ASSERT_TRUE(url_request.status().is_success()); |
+ ASSERT_TRUE(url_request->status().is_success()); |
socket_data(0)->RunFor(1); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(1, network_delegate()->error_count()); |
- EXPECT_FALSE(url_request.status().is_success()); |
- EXPECT_EQ(ERR_UNSAFE_REDIRECT, url_request.status().error()); |
+ EXPECT_FALSE(url_request->status().is_success()); |
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, url_request->status().error()); |
} |
// We should re-use socket for requests using the same scheme, host, and port. |
@@ -623,16 +615,16 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { |
AddSocket(reads, arraysize(reads), writes, arraysize(writes)); |
TestDelegate request_delegate1; |
- URLRequest url_request1(GURL("ftp://ftp.example.com/first"), |
- DEFAULT_PRIORITY, |
- &request_delegate1, |
- request_context()); |
- url_request1.Start(); |
- ASSERT_TRUE(url_request1.is_pending()); |
+ |
+ scoped_ptr<URLRequest> url_request1(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/first"), DEFAULT_PRIORITY, &request_delegate1, |
+ NULL)); |
+ url_request1->Start(); |
+ ASSERT_TRUE(url_request1->is_pending()); |
socket_data(0)->RunFor(4); |
- EXPECT_TRUE(url_request1.status().is_success()); |
- EXPECT_TRUE(url_request1.proxy_server().Equals( |
+ EXPECT_TRUE(url_request1->status().is_success()); |
+ EXPECT_TRUE(url_request1->proxy_server().Equals( |
net::HostPortPair::FromString("localhost:80"))); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
@@ -640,15 +632,14 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { |
EXPECT_EQ("test1.html", request_delegate1.data_received()); |
TestDelegate request_delegate2; |
- URLRequest url_request2(GURL("ftp://ftp.example.com/second"), |
- DEFAULT_PRIORITY, |
- &request_delegate2, |
- request_context()); |
- url_request2.Start(); |
- ASSERT_TRUE(url_request2.is_pending()); |
+ scoped_ptr<URLRequest> url_request2(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/second"), DEFAULT_PRIORITY, |
+ &request_delegate2, NULL)); |
+ url_request2->Start(); |
+ ASSERT_TRUE(url_request2->is_pending()); |
socket_data(0)->RunFor(4); |
- EXPECT_TRUE(url_request2.status().is_success()); |
+ EXPECT_TRUE(url_request2->status().is_success()); |
EXPECT_EQ(2, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_FALSE(request_delegate2.auth_required_called()); |
@@ -686,30 +677,28 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) { |
AddSocket(reads2, arraysize(reads2), writes2, arraysize(writes2)); |
TestDelegate request_delegate1; |
- URLRequest url_request1(GURL("ftp://ftp.example.com/first"), |
- DEFAULT_PRIORITY, |
- &request_delegate1, |
- request_context()); |
- url_request1.Start(); |
- ASSERT_TRUE(url_request1.is_pending()); |
+ scoped_ptr<URLRequest> url_request1(request_context()->CreateRequest( |
+ GURL("ftp://ftp.example.com/first"), DEFAULT_PRIORITY, |
+ &request_delegate1, NULL)); |
+ url_request1->Start(); |
+ ASSERT_TRUE(url_request1->is_pending()); |
socket_data(0)->RunFor(4); |
- EXPECT_TRUE(url_request1.status().is_success()); |
+ EXPECT_TRUE(url_request1->status().is_success()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_FALSE(request_delegate1.auth_required_called()); |
EXPECT_EQ("test1.html", request_delegate1.data_received()); |
TestDelegate request_delegate2; |
- URLRequest url_request2(GURL("http://ftp.example.com/second"), |
- DEFAULT_PRIORITY, |
- &request_delegate2, |
- request_context()); |
- url_request2.Start(); |
- ASSERT_TRUE(url_request2.is_pending()); |
+ scoped_ptr<URLRequest> url_request2(request_context()->CreateRequest( |
+ GURL("http://ftp.example.com/second"), DEFAULT_PRIORITY, |
+ &request_delegate2, NULL)); |
+ url_request2->Start(); |
+ ASSERT_TRUE(url_request2->is_pending()); |
socket_data(1)->RunFor(4); |
- EXPECT_TRUE(url_request2.status().is_success()); |
+ EXPECT_TRUE(url_request2->status().is_success()); |
EXPECT_EQ(2, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_FALSE(request_delegate2.auth_required_called()); |