drive: Stop using callback for ResourceMetadataStorage::Iterate

chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc

Index: chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
index a53b5b9d33843169420861be8de4573443309d0f..bbef7bfb05b7cf1948afd38f6b48e16cc3399f17 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ -15,16 +14,6 @@
 
 namespace drive {
 
-namespace {
-
-// Stores the entry to the map.
-void StoreEntryToMap(std::map<std::string,ResourceEntry>* out,
-                     const ResourceEntry& entry) {
-  (*out)[entry.resource_id()] = entry;
-}
-
-}  // namespace
-
 class ResourceMetadataStorageTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
@@ -143,7 +132,7 @@ TEST_F(ResourceMetadataStorageTest, PutEntry) {
   EXPECT_FALSE(storage_->GetEntry(key1));
 }
 
-TEST_F(ResourceMetadataStorageTest, Iterate) {
+TEST_F(ResourceMetadataStorageTest, Iterator) {
   // Prepare data.
   std::vector<ResourceEntry> entries;
   ResourceEntry entry;
@@ -160,9 +149,15 @@ TEST_F(ResourceMetadataStorageTest, Iterate) {
   for (size_t i = 0; i < entries.size(); ++i)
     EXPECT_TRUE(storage_->PutEntry(entries[i]));
 
-  // Call Iterate and check the result.
+  // Iterate and check the result.
   std::map<std::string, ResourceEntry> result;
-  storage_->Iterate(base::Bind(&StoreEntryToMap, base::Unretained(&result)));
+  scoped_ptr<ResourceMetadataStorage::Iterator> it = storage_->GetIterator();
+  ASSERT_TRUE(it);
+  for (; !it->IsAtEnd(); it->Advance()) {
+    const ResourceEntry& entry = it->Get();
+    result[entry.resource_id()] = entry;
+  }
+  EXPECT_FALSE(it->HasError());
 
   EXPECT_EQ(entries.size(), result.size());
   for (size_t i = 0; i < entries.size(); ++i)