drive: Stop using callback for ResourceMetadataStorage::Iterate

chrome/browser/chromeos/drive/resource_metadata_storage.cc

 // Copyright 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 "chrome/browser/chromeos/drive/resource_metadata_storage.h"
 
-#include "base/callback.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 namespace drive {
 
@@ skipping 40 matching lines @@
     return DB_INIT_NOT_FOUND;
   if (status.IsCorruption())
     return DB_INIT_CORRUPTION;
   if (status.IsIOError())
     return DB_INIT_IO_ERROR;
   return DB_INIT_FAILED;
 }
 
 }  // namespace
 
+ResourceMetadataStorage::Iterator::Iterator(scoped_ptr<leveldb::Iterator> it)
+  : it_(it.Pass()) {
+  DCHECK(it_);
+
+  // Skip the header entry.
+  // Note: The header entry comes before all other entries because its key
+  // starts with kDBKeyDelimeter. (i.e. '\0')
+  it_->Seek(leveldb::Slice(GetHeaderDBKey()));
+
+  MoveForward();
+}
+
+ResourceMetadataStorage::Iterator::~Iterator() {
+}
+
+bool ResourceMetadataStorage::Iterator::IsValid() const {
+  return it_->Valid();
+}
+
+const ResourceEntry& ResourceMetadataStorage::Iterator::Get() const {
+  DCHECK(IsValid());
+  return entry_;
+}
+
+void ResourceMetadataStorage::Iterator::MoveForward() {
+  DCHECK(IsValid());
+
+  for (it_->Next() ; it_->Valid(); it_->Next()) {
+    if (!IsChildEntryKey(it_->key()) &&
+        entry_.ParseFromArray(it_->value().data(), it_->value().size()))
+      break;
+  }
+}
+
+bool ResourceMetadataStorage::Iterator::HasError() const {
+  return !it_->status().ok();
+}
+
 ResourceMetadataStorage::ResourceMetadataStorage(
     const base::FilePath& directory_path)
     : directory_path_(directory_path) {
 }
 
 ResourceMetadataStorage::~ResourceMetadataStorage() {
   base::ThreadRestrictions::AssertIOAllowed();
 }
 
 bool ResourceMetadataStorage::Initialize() {
@@ skipping 164 matching lines @@
                                   entry->base_name()));
   }
   // Remove the entry itself.
   batch.Delete(resource_id);
 
   const leveldb::Status status = resource_map_->Write(leveldb::WriteOptions(),
                                                       &batch);
   return status.ok();
 }
 
-void ResourceMetadataStorage::Iterate(const IterateCallback& callback) {
+scoped_ptr<ResourceMetadataStorage::Iterator>
+ResourceMetadataStorage::GetIterator() {
   base::ThreadRestrictions::AssertIOAllowed();
-  DCHECK(!callback.is_null());
 
   scoped_ptr<leveldb::Iterator> it(
       resource_map_->NewIterator(leveldb::ReadOptions()));
-
-  // Skip the header entry.
-  // Note: The header entry comes before all other entries because its key
-  // starts with kDBKeyDelimeter. (i.e. '\0')
-  it->Seek(leveldb::Slice(GetHeaderDBKey()));
-  it->Next();
-
-  ResourceEntry entry;
-  for (; it->Valid(); it->Next()) {
-    if (!IsChildEntryKey(it->key()) &&
-        entry.ParseFromArray(it->value().data(), it->value().size()))
-      callback.Run(entry);
-  }
+  return make_scoped_ptr(new Iterator(it.Pass()));
 }
 
 std::string ResourceMetadataStorage::GetChild(
     const std::string& parent_resource_id,
     const std::string& child_name) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   std::string child_resource_id;
   resource_map_->Get(
       leveldb::ReadOptions(),
@@ skipping 132 matching lines @@
   }
   if (!it->status().ok() || num_child_entries != num_entries_with_parent) {
     DLOG(ERROR) << "Error during checking resource map. status = "
                 << it->status().ToString();
     return false;
   }
   return true;
 }
 
 }  // namespace drive