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 4509afed3407044a4b662f0b85fbba94f8be1e92..3ea92263af1e5a93c9b287c5e3b78658836d6993 100644 |
--- a/net/url_request/url_request_ftp_job_unittest.cc |
+++ b/net/url_request/url_request_ftp_job_unittest.cc |
@@ -58,7 +58,8 @@ class FtpTestURLRequestContext : public TestURLRequestContext { |
set_network_delegate(network_delegate); |
scoped_ptr<URLRequestJobFactoryImpl> job_factory = |
make_scoped_ptr(new URLRequestJobFactoryImpl); |
- job_factory->SetProtocolHandler("ftp", make_scoped_ptr(ftp_protocol_handler_)); |
+ job_factory->SetProtocolHandler("ftp", |
+ make_scoped_ptr(ftp_protocol_handler_)); |
context_storage_.set_job_factory(job_factory.Pass()); |
Init(); |
} |
@@ -137,7 +138,9 @@ class MockFtpTransactionFactory : public FtpTransactionFactory { |
class URLRequestFtpJobPriorityTest : public testing::Test { |
protected: |
URLRequestFtpJobPriorityTest() |
- : proxy_service_(new SimpleProxyConfigService, NULL, NULL), |
+ : proxy_service_(make_scoped_ptr(new SimpleProxyConfigService), |
+ NULL, |
+ NULL), |
req_(context_.CreateRequest(GURL("ftp://ftp.example.com"), |
DEFAULT_PRIORITY, |
&delegate_)) { |
@@ -226,12 +229,13 @@ TEST_F(URLRequestFtpJobPriorityTest, SetSubsequentTransactionPriority) { |
class URLRequestFtpJobTest : public testing::Test { |
public: |
URLRequestFtpJobTest() |
- : request_context_( |
- &socket_factory_, |
- make_scoped_ptr( |
- new ProxyService(new SimpleProxyConfigService, NULL, NULL)), |
- &network_delegate_, |
- &ftp_transaction_factory_) {} |
+ : request_context_(&socket_factory_, |
+ make_scoped_ptr(new ProxyService( |
+ make_scoped_ptr(new SimpleProxyConfigService), |
+ NULL, |
+ NULL)), |
+ &network_delegate_, |
+ &ftp_transaction_factory_) {} |
~URLRequestFtpJobTest() override { |
// Clean up any remaining tasks that mess up unrelated tests. |
@@ -296,8 +300,8 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) { |
TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) { |
// Use a PAC URL so that URLRequestFtpJob's |pac_request_| field is non-NULL. |
request_context()->set_proxy_service(make_scoped_ptr(new ProxyService( |
- new ProxyConfigServiceFixed( |
- ProxyConfig::CreateFromCustomPacURL(GURL("http://foo"))), |
+ make_scoped_ptr(new ProxyConfigServiceFixed( |
+ ProxyConfig::CreateFromCustomPacURL(GURL("http://foo")))), |
make_scoped_ptr(new MockProxyResolverFactory), NULL))); |
TestDelegate request_delegate; |