drive: Stop using callback for ResourceMetadataStorage::Iterate

chrome/browser/chromeos/drive/resource_metadata_storage_unittest.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 <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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 
 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 {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     storage_.reset(new ResourceMetadataStorage(temp_dir_.path()));
     ASSERT_TRUE(storage_->Initialize());
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 98 matching lines @@
 
   // Remove entries.
   EXPECT_TRUE(storage_->RemoveEntry(key3));
   EXPECT_FALSE(storage_->GetEntry(key3));
   EXPECT_TRUE(storage_->RemoveEntry(key2));
   EXPECT_FALSE(storage_->GetEntry(key2));
   EXPECT_TRUE(storage_->RemoveEntry(key1));
   EXPECT_FALSE(storage_->GetEntry(key1));
 }
 
-TEST_F(ResourceMetadataStorageTest, Iterate) {
+TEST_F(ResourceMetadataStorageTest, Iterator) {
   // Prepare data.
   std::vector<ResourceEntry> entries;
   ResourceEntry entry;
 
   entry.set_resource_id("entry1");
   entries.push_back(entry);
   entry.set_resource_id("entry2");
   entries.push_back(entry);
   entry.set_resource_id("entry3");
   entries.push_back(entry);
   entry.set_resource_id("entry4");
   entries.push_back(entry);
 
   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)
     EXPECT_EQ(1U, result.count(entries[i].resource_id()));
 }
 
 TEST_F(ResourceMetadataStorageTest, GetChildren) {
   const std::string parents_id[] = { "mercury", "venus", "mars", "jupiter",
                                      "saturn" };
   std::vector<std::vector<std::pair<std::string, std::string> > >
@@ skipping 177 matching lines @@
   EXPECT_FALSE(CheckValidity());
   EXPECT_TRUE(storage_->RemoveEntry(key3));
   EXPECT_TRUE(CheckValidity());
 
   // Remove key1.
   EXPECT_TRUE(storage_->RemoveEntry(key1));
   EXPECT_TRUE(CheckValidity());
 }
 
 }  // namespace drive