drive: Add ResourceMetadataStorage::Iterator::GetCacheEntry()

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 a1f31ad4e9dc24fab3fa8b6dea39352efccc355a..667f92014ef2678e75ced23e22b076dce1772116 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
@@ -151,24 +151,39 @@ TEST_F(ResourceMetadataStorageTest, Iterator) {
   for (size_t i = 0; i < entries.size(); ++i)
     EXPECT_TRUE(storage_->PutEntry(entries[i]));
 
-  // Insert some dummy cache entries.
-  FileCacheEntry cache_entry;
-  EXPECT_TRUE(storage_->PutCacheEntry(entries[0].resource_id(), cache_entry));
-  EXPECT_TRUE(storage_->PutCacheEntry(entries[1].resource_id(), cache_entry));
+  // Insert some cache entries.
+  std::map<std::string, FileCacheEntry> cache_entries;
+  cache_entries[entries[0].resource_id()].set_md5("aaaaaa");
+  cache_entries[entries[1].resource_id()].set_md5("bbbbbb");
+  for (std::map<std::string, FileCacheEntry>::iterator it =
+           cache_entries.begin(); it != cache_entries.end(); ++it)
+    EXPECT_TRUE(storage_->PutCacheEntry(it->first, it->second));
 
   // Iterate and check the result.
-  std::map<std::string, ResourceEntry> result;
+  std::map<std::string, ResourceEntry> found_entries;
+  std::map<std::string, FileCacheEntry> found_cache_entries;
   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;
+    found_entries[entry.resource_id()] = entry;
+
+    FileCacheEntry cache_entry;
+    if (it->GetCacheEntry(&cache_entry))
+      found_cache_entries[entry.resource_id()] = cache_entry;
   }
   EXPECT_FALSE(it->HasError());
 
-  EXPECT_EQ(entries.size(), result.size());
+  EXPECT_EQ(entries.size(), found_entries.size());
   for (size_t i = 0; i < entries.size(); ++i)
-    EXPECT_EQ(1U, result.count(entries[i].resource_id()));
+    EXPECT_EQ(1U, found_entries.count(entries[i].resource_id()));
+
+  EXPECT_EQ(cache_entries.size(), found_cache_entries.size());
+  for (std::map<std::string, FileCacheEntry>::iterator it =
+           cache_entries.begin(); it != cache_entries.end(); ++it) {
+    ASSERT_EQ(1U, found_cache_entries.count(it->first));
+    EXPECT_EQ(it->second.md5(), found_cache_entries[it->first].md5());
+  }
 }
 
 TEST_F(ResourceMetadataStorageTest, PutCacheEntry) {