Change the API of disk_cache::CreateCacheBackend to use scoped_ptr

net/tools/dump_cache/simple_cache_dumper.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/tools/dump_cache/simple_cache_dumper.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/tools/dump_cache/cache_dumper.h"
 
 namespace net {
 
 SimpleCacheDumper::SimpleCacheDumper(base::FilePath input_path,
                                      base::FilePath output_path)
     : state_(STATE_NONE),
       input_path_(input_path),
       output_path_(output_path),
-      cache_(NULL),
       writer_(new DiskDumper(output_path)),
       cache_thread_(new base::Thread("CacheThead")),
       iter_(NULL),
       src_entry_(NULL),
       dst_entry_(NULL),
       io_callback_(base::Bind(&SimpleCacheDumper::OnIOComplete,
                               base::Unretained(this))),
       rv_(0) {
 }
 
 SimpleCacheDumper::~SimpleCacheDumper() {
-  delete(cache_);
 }
 
 int SimpleCacheDumper::Run() {
   base::MessageLoopForIO main_message_loop;
 
   LOG(INFO) << "Reading cache from: " << input_path_.value();
   LOG(INFO) << "Writing cache to: " << output_path_.value();
 
   if (!cache_thread_->StartWithOptions(
           base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) {
@@ skipping 83 matching lines @@
       cache_thread_->message_loop_proxy().get(),
       NULL,
       &cache_,
       io_callback_);
 }
 
 int SimpleCacheDumper::DoCreateCacheComplete(int rv) {
   if (rv < 0)
     return rv;
 
-  reinterpret_cast<disk_cache::BackendImpl*>(cache_)->SetUpgradeMode();
-  reinterpret_cast<disk_cache::BackendImpl*>(cache_)->SetFlags(
+  reinterpret_cast<disk_cache::BackendImpl*>(cache_.get())->SetUpgradeMode();
+  reinterpret_cast<disk_cache::BackendImpl*>(cache_.get())->SetFlags(
       disk_cache::kNoRandom);
 
   state_ = STATE_OPEN_ENTRY;
   return OK;
 }
 
 int SimpleCacheDumper::DoOpenEntry() {
   DCHECK(!dst_entry_);
   DCHECK(!src_entry_);
   state_ = STATE_OPEN_ENTRY_COMPLETE;
@@ skipping 105 matching lines @@
 
   state_ = STATE_OPEN_ENTRY;
   return OK;
 }
 
 void SimpleCacheDumper::OnIOComplete(int rv) {
   rv = DoLoop(rv);
 
   if (rv != ERR_IO_PENDING) {
     rv_ = rv;
-    delete cache_;
-    cache_ = NULL;
+    cache_.reset();
     base::MessageLoop::current()->Quit();
   }
 }
 
 }  // namespace net