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 fa11d5503e65fe6d33654ac5dc78b9fd781f666e..178059995d665fc99a7bca4b840f99ca4cf0a5a6 100644 |
--- a/net/url_request/url_request_ftp_job_unittest.cc |
+++ b/net/url_request/url_request_ftp_job_unittest.cc |
@@ -123,8 +123,7 @@ class URLRequestFtpJobPriorityTest : public testing::Test { |
: proxy_service_(new SimpleProxyConfigService, NULL, NULL), |
req_(context_.CreateRequest(GURL("ftp://ftp.example.com"), |
DEFAULT_PRIORITY, |
- &delegate_, |
- NULL)) { |
+ &delegate_)) { |
context_.set_proxy_service(&proxy_service_); |
context_.set_http_transaction_factory(&network_layer_); |
} |
@@ -265,8 +264,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, |
- &request_delegate, NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(4); |
@@ -291,8 +289,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
// Now |url_request| will be deleted before its completion, |
@@ -318,8 +315,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
@@ -363,8 +359,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthWithCredentials) { |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass"))); |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(9); |
@@ -395,8 +390,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
@@ -438,8 +432,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthWithCredentials) { |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass"))); |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(9); |
@@ -503,7 +496,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) { |
request_delegate.set_credentials( |
AuthCredentials(ASCIIToUTF16("proxyuser"), ASCIIToUTF16("proxypass"))); |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- url, DEFAULT_PRIORITY, &request_delegate, NULL)); |
+ url, DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
socket_data(0)->RunFor(5); |
@@ -536,8 +529,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
ASSERT_TRUE(url_request->is_pending()); |
@@ -569,8 +561,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotFollowRedirects) { |
TestDelegate request_delegate; |
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate, |
- NULL)); |
+ GURL("ftp://ftp.example.com/"), DEFAULT_PRIORITY, &request_delegate)); |
url_request->Start(); |
EXPECT_TRUE(url_request->is_pending()); |
@@ -612,9 +603,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { |
TestDelegate request_delegate1; |
- scoped_ptr<URLRequest> url_request1(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/first"), DEFAULT_PRIORITY, &request_delegate1, |
- NULL)); |
+ scoped_ptr<URLRequest> url_request1( |
+ request_context()->CreateRequest(GURL("ftp://ftp.example.com/first"), |
+ DEFAULT_PRIORITY, &request_delegate1)); |
url_request1->Start(); |
ASSERT_TRUE(url_request1->is_pending()); |
socket_data(0)->RunFor(4); |
@@ -628,9 +619,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { |
EXPECT_EQ("test1.html", request_delegate1.data_received()); |
TestDelegate request_delegate2; |
- scoped_ptr<URLRequest> url_request2(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/second"), DEFAULT_PRIORITY, |
- &request_delegate2, NULL)); |
+ scoped_ptr<URLRequest> url_request2( |
+ request_context()->CreateRequest(GURL("ftp://ftp.example.com/second"), |
+ DEFAULT_PRIORITY, &request_delegate2)); |
url_request2->Start(); |
ASSERT_TRUE(url_request2->is_pending()); |
socket_data(0)->RunFor(4); |
@@ -673,9 +664,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) { |
AddSocket(reads2, arraysize(reads2), writes2, arraysize(writes2)); |
TestDelegate request_delegate1; |
- scoped_ptr<URLRequest> url_request1(request_context()->CreateRequest( |
- GURL("ftp://ftp.example.com/first"), DEFAULT_PRIORITY, |
- &request_delegate1, NULL)); |
+ scoped_ptr<URLRequest> url_request1( |
+ request_context()->CreateRequest(GURL("ftp://ftp.example.com/first"), |
+ DEFAULT_PRIORITY, &request_delegate1)); |
url_request1->Start(); |
ASSERT_TRUE(url_request1->is_pending()); |
socket_data(0)->RunFor(4); |
@@ -687,9 +678,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) { |
EXPECT_EQ("test1.html", request_delegate1.data_received()); |
TestDelegate request_delegate2; |
- scoped_ptr<URLRequest> url_request2(request_context()->CreateRequest( |
- GURL("http://ftp.example.com/second"), DEFAULT_PRIORITY, |
- &request_delegate2, NULL)); |
+ scoped_ptr<URLRequest> url_request2( |
+ request_context()->CreateRequest(GURL("http://ftp.example.com/second"), |
+ DEFAULT_PRIORITY, &request_delegate2)); |
url_request2->Start(); |
ASSERT_TRUE(url_request2->is_pending()); |
socket_data(1)->RunFor(4); |