| 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 4a8178dd448eb60e8721e7b11e23e870f2b4f7d7..353cfb026d786c727c1708ef8a45e666fa3e6590 100644
|
| --- a/net/url_request/url_request_ftp_job_unittest.cc
|
| +++ b/net/url_request/url_request_ftp_job_unittest.cc
|
| @@ -136,7 +136,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).Pass(),
|
| + NULL,
|
| + NULL),
|
| req_(context_.CreateRequest(GURL("ftp://ftp.example.com"),
|
| DEFAULT_PRIORITY,
|
| &delegate_)) {
|
| @@ -225,12 +227,13 @@ TEST_F(URLRequestFtpJobPriorityTest, SetSubsequentTransactionPriority) {
|
| class URLRequestFtpJobTest : public testing::Test {
|
| public:
|
| URLRequestFtpJobTest()
|
| - : request_context_(&socket_factory_,
|
| - new ProxyService(
|
| - new SimpleProxyConfigService, NULL, NULL),
|
| - &network_delegate_,
|
| - &ftp_transaction_factory_) {
|
| - }
|
| + : request_context_(
|
| + &socket_factory_,
|
| + 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.
|
| @@ -295,8 +298,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(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;
|
|
|