Using scoped_ptr for URLRequestJobFactoryImpl::SetProtocolHandler

content/browser/appcache/appcache_update_job_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 556 matching lines @@
 
   void SetNewJobFactory(net::URLRequestJobFactory* job_factory) {
     DCHECK(job_factory);
     job_factory_.reset(job_factory);
     request_context_->set_job_factory(job_factory_.get());
   }
 
   void Init() override {
     scoped_ptr<net::URLRequestJobFactoryImpl> factory(
         new net::URLRequestJobFactoryImpl());
-    factory->SetProtocolHandler("http", new MockHttpServerJobFactory);
-    factory->SetProtocolHandler("https", new MockHttpServerJobFactory);
+    factory->SetProtocolHandler("http",
+                                make_scoped_ptr(new MockHttpServerJobFactory));
+    factory->SetProtocolHandler("https",
+                                make_scoped_ptr(new MockHttpServerJobFactory));
     job_factory_ = factory.Pass();
     request_context_.reset(new net::TestURLRequestContext());
     request_context_->set_job_factory(job_factory_.get());
   }
 
   void CleanUp() override {
     request_context_.reset();
     job_factory_.reset();
   }
 
@@ skipping 200 matching lines @@
     frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT);
 
     WaitForUpdateToFinish();
   }
 
   void ManifestRedirectTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RedirectFactory);
+    new_factory->SetProtocolHandler("http",
+                                    make_scoped_ptr(new RedirectFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(), GURL("http://testme"),
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
     MockFrontend* frontend = MakeMockFrontend();
@@ skipping 865 matching lines @@
   }
 
   void RetryRequestTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Set some large number of times to return retry.
     // Expect 1 manifest fetch and 3 retries.
     RetryRequestTestJob::Initialize(5, RetryRequestTestJob::RETRY_AFTER_0, 4);
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RetryRequestTestJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new RetryRequestTestJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(),
                                RetryRequestTestJob::kRetryUrl,
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
@@ skipping 12 matching lines @@
   }
 
   void RetryNoRetryAfterTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Set some large number of times to return retry.
     // Expect 1 manifest fetch and 0 retries.
     RetryRequestTestJob::Initialize(5, RetryRequestTestJob::NO_RETRY_AFTER, 1);
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RetryRequestTestJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new RetryRequestTestJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(),
                                RetryRequestTestJob::kRetryUrl,
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
@@ skipping 13 matching lines @@
 
   void RetryNonzeroRetryAfterTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Set some large number of times to return retry.
     // Expect 1 request and 0 retry attempts.
     RetryRequestTestJob::Initialize(
         5, RetryRequestTestJob::NONZERO_RETRY_AFTER, 1);
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RetryRequestTestJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new RetryRequestTestJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(),
                                RetryRequestTestJob::kRetryUrl,
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
@@ skipping 12 matching lines @@
   }
 
   void RetrySuccessTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Set 2 as the retry limit (does not exceed the max).
     // Expect 1 manifest fetch, 2 retries, 1 url fetch, 1 manifest refetch.
     RetryRequestTestJob::Initialize(2, RetryRequestTestJob::RETRY_AFTER_0, 5);
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RetryRequestTestJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new RetryRequestTestJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(),
                                RetryRequestTestJob::kRetryUrl,
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
@@ skipping 12 matching lines @@
   }
 
   void RetryUrlTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Set 1 as the retry limit (does not exceed the max).
     // Expect 1 manifest fetch, 1 url fetch, 1 url retry, 1 manifest refetch.
     RetryRequestTestJob::Initialize(1, RetryRequestTestJob::RETRY_AFTER_0, 4);
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new RetryRequestTestJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new RetryRequestTestJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(service_->storage(), GURL("http://retryurl"),
                                service_->storage()->NewGroupId());
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
     MockFrontend* frontend = MakeMockFrontend();
@@ skipping 844 matching lines @@
     // Group status will be APPCACHE_STATUS_IDLE so cannot call
     // WaitForUpdateToFinish.
     group_->AddUpdateObserver(this);
   }
 
   void IfModifiedSinceTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new IfModifiedSinceJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(
         service_->storage(), GURL("http://headertest"), 111);
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
     // First test against a cache attempt. Will start manifest fetch
@@ skipping 50 matching lines @@
     UpdateFinished();
   }
 
   void IfModifiedSinceUpgradeTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT",
                                           std::string());
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new IfModifiedSinceJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(
         service_->storage(),
         MockHttpServer::GetMockUrl("files/manifest1"),
         111);
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
@@ skipping 42 matching lines @@
 
     // Start update after data write completes asynchronously.
   }
 
   void IfNoneMatchUpgradeTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\"");
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new IfModifiedSinceJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(
         service_->storage(),
         MockHttpServer::GetMockUrl("files/manifest1"),
         111);
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
@@ skipping 42 matching lines @@
 
     // Start update after data write completes asynchronously.
   }
 
   void IfNoneMatchRefetchTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\"");
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new IfModifiedSinceJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(
         service_->storage(), GURL("http://headertest"), 111);
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
     // Simulate a refetch manifest request that uses an ETag header.
@@ skipping 17 matching lines @@
   }
 
   void MultipleHeadersRefetchTest() {
     ASSERT_TRUE(base::MessageLoopForIO::IsCurrent());
 
     // Verify that code is correct when building multiple extra headers.
     HttpHeadersRequestTestJob::Initialize(
         "Sat, 29 Oct 1994 19:43:31 GMT", "\"LadeDade\"");
     net::URLRequestJobFactoryImpl* new_factory(
         new net::URLRequestJobFactoryImpl);
-    new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
+    new_factory->SetProtocolHandler(
+        "http", make_scoped_ptr(new IfModifiedSinceJobFactory));
     io_thread_->SetNewJobFactory(new_factory);
 
     MakeService();
     group_ = new AppCacheGroup(
         service_->storage(), GURL("http://headertest"), 111);
     AppCacheUpdateJob* update =
         new AppCacheUpdateJob(service_.get(), group_.get());
     group_->update_job_ = update;
 
     // Simulate a refetch manifest request that uses an ETag header.
@@ skipping 779 matching lines @@
 
 TEST_F(AppCacheUpdateJobTest, CrossOriginHttpsSuccess) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::CrossOriginHttpsSuccessTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, CrossOriginHttpsDenied) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::CrossOriginHttpsDeniedTest);
 }
 
 }  // namespace content