Reland of "Remove void** from disk_cache interface" w/ blockfile iter fix.

content/browser/gpu/shader_disk_cache.cc

 // Copyright (c) 2013 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 "content/browser/gpu/shader_disk_cache.h"
 
 #include "base/threading/thread_checker.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace content {
 
 namespace {
 
 static const base::FilePath::CharType kGpuCachePath[] =
     FILE_PATH_LITERAL("GPUCache");
 
 void EntryCloser(disk_cache::Entry* entry) {
   entry->Close();
 }
 
+void FreeDiskCacheIterator(scoped_ptr<disk_cache::Backend::Iterator> iterator) {
+}
+
 }  // namespace
 
 // ShaderDiskCacheEntry handles the work of caching/updating the cached
 // shaders.
 class ShaderDiskCacheEntry
     : public base::ThreadChecker,
       public base::RefCounted<ShaderDiskCacheEntry> {
  public:
   ShaderDiskCacheEntry(base::WeakPtr<ShaderDiskCache> cache,
                        const std::string& key,
@@ skipping 52 matching lines @@
 
   void OnOpComplete(int rv);
 
   int OpenNextEntry();
   int OpenNextEntryComplete(int rv);
   int ReadComplete(int rv);
   int IterationComplete(int rv);
 
   base::WeakPtr<ShaderDiskCache> cache_;
   OpType op_type_;
-  void* iter_;
+  scoped_ptr<disk_cache::Backend::Iterator> iter_;
   scoped_refptr<net::IOBufferWithSize> buf_;
   int host_id_;
   disk_cache::Entry* entry_;
 
   DISALLOW_COPY_AND_ASSIGN(ShaderDiskReadHelper);
 };
 
 class ShaderClearHelper
     : public base::RefCounted<ShaderClearHelper>,
       public base::SupportsWeakPtr<ShaderClearHelper> {
@@ skipping 127 matching lines @@
   cache_->EntryComplete(this);
   op_type_ = TERMINATE;
   return rv;
 }
 
 ShaderDiskReadHelper::ShaderDiskReadHelper(
     base::WeakPtr<ShaderDiskCache> cache,
     int host_id)
     : cache_(cache),
       op_type_(OPEN_NEXT),
-      iter_(NULL),
       buf_(NULL),
       host_id_(host_id),
       entry_(NULL) {
 }
 
 void ShaderDiskReadHelper::LoadCache() {
   DCHECK(CalledOnValidThread());
   if (!cache_.get())
     return;
   OnOpComplete(net::OK);
@@ skipping 27 matching lines @@
         rv = net::ERR_FAILED;
         break;
     }
   } while (rv != net::ERR_IO_PENDING);
 }
 
 int ShaderDiskReadHelper::OpenNextEntry() {
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   op_type_ = OPEN_NEXT_COMPLETE;
-  return cache_->backend()->OpenNextEntry(
-      &iter_,
-      &entry_,
-      base::Bind(&ShaderDiskReadHelper::OnOpComplete, this));
+  if (!iter_)
+    iter_ = cache_->backend()->CreateIterator();
+  return iter_->OpenNextEntry(
+      &entry_, base::Bind(&ShaderDiskReadHelper::OnOpComplete, this));
 }
 
 int ShaderDiskReadHelper::OpenNextEntryComplete(int rv) {
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   if (rv == net::ERR_FAILED) {
+    iter_.reset();
     op_type_ = ITERATION_FINISHED;
     return net::OK;
   }
 
   if (rv < 0)
     return rv;
 
   op_type_ = READ_COMPLETE;
   buf_ = new net::IOBufferWithSize(entry_->GetDataSize(1));
   return entry_->ReadData(
@@ skipping 18 matching lines @@
   entry_->Close();
   entry_ = NULL;
 
   op_type_ = OPEN_NEXT;
   return net::OK;
 }
 
 int ShaderDiskReadHelper::IterationComplete(int rv) {
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
-  cache_->backend()->EndEnumeration(&iter_);
-  iter_ = NULL;
+  iter_.reset();
   op_type_ = TERMINATE;
   return net::OK;
 }
 
 ShaderDiskReadHelper::~ShaderDiskReadHelper() {
-  if (entry_)
+  if (entry_) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&EntryCloser, entry_));
+  }
+  if (iter_) {
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                            base::Bind(&FreeDiskCacheIterator,
+                                       base::Passed(&iter_)));
+  }
 }
 
 ShaderClearHelper::ShaderClearHelper(scoped_refptr<ShaderDiskCache> cache,
                     const base::FilePath& path,
                     const base::Time& delete_begin,
                     const base::Time& delete_end,
                     const base::Closure& callback)
     : cache_(cache),
       op_type_(VERIFY_CACHE_SETUP),
       path_(path),
@@ skipping 246 matching lines @@
     const net::CompletionCallback& callback) {
   if (entry_map_.empty()) {
     return net::OK;
   }
   cache_complete_callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 }  // namespace content