drive: Stop using callback for ResourceMetadataStorage::Iterate

chrome/browser/chromeos/drive/resource_metadata.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 "chrome/browser/chromeos/drive/resource_metadata.h"
 
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
@@ skipping 809 matching lines @@
       child_directories->insert(GetFilePath(entry->resource_id()));
       GetDescendantDirectoryPaths(entry->resource_id(), child_directories);
     }
   }
 }
 
 void ResourceMetadata::IterateEntries(const IterateCallback& callback) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(!callback.is_null());
 
-  storage_->Iterate(callback);
+  scoped_ptr<ResourceMetadataStorage::Iterator> it = storage_->GetIterator();
+  for (; it->IsValid(); it->MoveForward())
+    callback.Run(it->Get());
+  DCHECK(!it->HasError());  // TODO(hashimoto): Report error correctly.
 }
 
 void ResourceMetadata::GetEntryInfoPairByPathsOnUIThreadAfterGetFirst(
     const base::FilePath& first_path,
     const base::FilePath& second_path,
     const GetEntryInfoPairCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 99 matching lines @@
   for (size_t i = 0; i < children.size(); ++i) {
     scoped_ptr<ResourceEntry> child = storage_->GetEntry(children[i]);
     DCHECK(child);
     entries->push_back(*child);
   }
   return entries.Pass();
 }
 
 }  // namespace internal
 }  // namespace drive