Change the API of disk_cache::CreateCacheBackend to use scoped_ptr

net/http/mock_http_cache.cc

 // Copyright (c) 2012 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 "net/http/mock_http_cache.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
@@ skipping 462 matching lines @@
 
 void MockDiskCache::CallbackLater(const net::CompletionCallback& callback,
                                   int result) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&CallbackForwader, callback, result));
 }
 
 //-----------------------------------------------------------------------------
 
 int MockBackendFactory::CreateBackend(net::NetLog* net_log,
-                                      disk_cache::Backend** backend,
+                                      scoped_ptr<disk_cache::Backend>* backend,
                                       const net::CompletionCallback& callback) {
-  *backend = new MockDiskCache();
+  backend->reset(new MockDiskCache());
   return net::OK;
 }
 
 //-----------------------------------------------------------------------------
 
 MockHttpCache::MockHttpCache()
     : http_cache_(new MockNetworkLayer(), NULL, new MockBackendFactory()) {
 }
 
 MockHttpCache::MockHttpCache(net::HttpCache::BackendFactory* disk_cache_factory)
@@ skipping 73 matching lines @@
 
 int MockDiskCacheNoCB::CreateEntry(const std::string& key,
                                    disk_cache::Entry** entry,
                                    const net::CompletionCallback& callback) {
   return net::ERR_IO_PENDING;
 }
 
 //-----------------------------------------------------------------------------
 
 int MockBackendNoCbFactory::CreateBackend(
-    net::NetLog* net_log, disk_cache::Backend** backend,
+    net::NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend,
     const net::CompletionCallback& callback) {
-  *backend = new MockDiskCacheNoCB();
+  backend->reset(new MockDiskCacheNoCB());
   return net::OK;
 }
 
 //-----------------------------------------------------------------------------
 
 MockBlockingBackendFactory::MockBlockingBackendFactory()
     : backend_(NULL),
       block_(true),
       fail_(false) {
 }
 
 MockBlockingBackendFactory::~MockBlockingBackendFactory() {
 }
 
 int MockBlockingBackendFactory::CreateBackend(
-    net::NetLog* net_log, disk_cache::Backend** backend,
+    net::NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend,
     const net::CompletionCallback& callback) {
   if (!block_) {
     if (!fail_)
-      *backend = new MockDiskCache();
+      backend->reset(new MockDiskCache());
     return Result();
   }
 
   backend_ =  backend;
   callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 void MockBlockingBackendFactory::FinishCreation() {
   block_ = false;
   if (!callback_.is_null()) {
     if (!fail_)
-      *backend_ = new MockDiskCache();
+      backend_->reset(new MockDiskCache());
     net::CompletionCallback cb = callback_;
     callback_.Reset();
     cb.Run(Result());  // This object can be deleted here.
   }
 }