Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4713)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc

Issue 10581038: chromeos: Stop returning scoped_ptr from GDataCache::GetCacheEntry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/gdata/gdata_cache_metadata.cc ('K') | « chrome/browser/chromeos/gdata/gdata_cache_metadata.cc ('k') | chrome/browser/chromeos/gdata/gdata_file_system.cc » ('j') | chrome/browser/chromeos/gdata/gdata_file_system.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc b/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
index b4d112b71638545363fd24537f98b51abb787a6c..3c51dbfa3c8844573fc34afbb28e93458c50f520 100644
--- a/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.cc
@@ -52,28 +52,25 @@ TEST_F(GDataCacheMetadataMapTest, CacheTest) {
test_sub_dir_type, test_cache_state);
// Test that the entry can be retrieved.
- scoped_ptr<GDataCache::CacheEntry> cache_entry =
- metadata_->GetCacheEntry(test_resource_id, test_file_md5);
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
- EXPECT_EQ(test_sub_dir_type, cache_entry->sub_dir_type);
- EXPECT_EQ(test_cache_state, cache_entry->cache_state);
+ GDataCache::CacheEntry cache_entry;
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, test_file_md5, &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
+ EXPECT_EQ(test_sub_dir_type, cache_entry.sub_dir_type);
+ EXPECT_EQ(test_cache_state, cache_entry.cache_state);
// Empty md5 should also work.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, std::string(), &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
// resource_id doesn't exist.
- cache_entry = metadata_->GetCacheEntry("not_found_resource_id",
- std::string()).Pass();
- EXPECT_FALSE(cache_entry.get());
+ EXPECT_FALSE(metadata_->GetCacheEntry(
+ "not_found_resource_id", std::string(), &cache_entry));
// md5 doesn't match.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, "mismatch_md5").Pass();
- EXPECT_FALSE(cache_entry.get());
+ EXPECT_FALSE(metadata_->GetCacheEntry(
+ test_resource_id, "mismatch_md5", &cache_entry));
// Update all attributes.
test_file_md5 = "test_file_md5_2";
@@ -83,18 +80,16 @@ TEST_F(GDataCacheMetadataMapTest, CacheTest) {
test_cache_state);
// Make sure the values took.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
- EXPECT_EQ(test_sub_dir_type, cache_entry->sub_dir_type);
- EXPECT_EQ(test_cache_state, cache_entry->cache_state);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, test_file_md5, &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
+ EXPECT_EQ(test_sub_dir_type, cache_entry.sub_dir_type);
+ EXPECT_EQ(test_cache_state, cache_entry.cache_state);
// Empty m5 should work.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, std::string(), &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
// Test dirty cache.
test_file_md5 = "test_file_md5_3";
@@ -104,30 +99,26 @@ TEST_F(GDataCacheMetadataMapTest, CacheTest) {
test_cache_state);
// Make sure the values took.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
- EXPECT_EQ(test_sub_dir_type, cache_entry->sub_dir_type);
- EXPECT_EQ(test_cache_state, cache_entry->cache_state);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, test_file_md5, &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
+ EXPECT_EQ(test_sub_dir_type, cache_entry.sub_dir_type);
+ EXPECT_EQ(test_cache_state, cache_entry.cache_state);
// Empty md5 should work.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, std::string(), &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
// Mismatched md5 should also work for dirty entries.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, "mismatch_md5").Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, "mismatch_md5", &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
// Remove the entry.
metadata_->RemoveFromCache(test_resource_id);
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
- EXPECT_FALSE(cache_entry.get());
+ EXPECT_FALSE(metadata_->GetCacheEntry(
+ test_resource_id, std::string(), &cache_entry));
// Add another one.
test_resource_id = "test_resource_id_2";
@@ -138,12 +129,11 @@ TEST_F(GDataCacheMetadataMapTest, CacheTest) {
test_cache_state);
// Make sure the values took.
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
- ASSERT_TRUE(cache_entry.get());
- EXPECT_EQ(test_file_md5, cache_entry->md5);
- EXPECT_EQ(test_sub_dir_type, cache_entry->sub_dir_type);
- EXPECT_EQ(test_cache_state, cache_entry->cache_state);
+ ASSERT_TRUE(metadata_->GetCacheEntry(
+ test_resource_id, test_file_md5, &cache_entry));
+ EXPECT_EQ(test_file_md5, cache_entry.md5);
+ EXPECT_EQ(test_sub_dir_type, cache_entry.sub_dir_type);
+ EXPECT_EQ(test_cache_state, cache_entry.cache_state);
// Update with CACHE_STATE_NONE should evict the entry.
test_file_md5 = "test_file_md5_5";
@@ -152,9 +142,8 @@ TEST_F(GDataCacheMetadataMapTest, CacheTest) {
metadata_->UpdateCache(test_resource_id, test_file_md5, test_sub_dir_type,
test_cache_state);
- cache_entry =
- metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
- EXPECT_FALSE(cache_entry.get());
+ EXPECT_FALSE(metadata_->GetCacheEntry(
+ test_resource_id, std::string(), &cache_entry));
}
// Test GDataCacheMetadataMap::RemoveTemporaryFiles.
@@ -184,10 +173,11 @@ TEST_F(GDataCacheMetadataMapTest, RemoveTemporaryFilesTest) {
metadata_->cache_map_ = cache_map;
metadata_->RemoveTemporaryFiles();
// resource 1 and 4 should be gone, as these are CACHE_TYPE_TMP.
- EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_1>", "").get());
- EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_2>", "").get());
- EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_3>", "").get());
- EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_4>", "").get());
+ GDataCache::CacheEntry cache_entry;
+ EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_1>", "", &cache_entry));
+ EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_2>", "", &cache_entry));
+ EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_3>", "", &cache_entry));
+ EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_4>", "", &cache_entry));
}
} // namespace gdata
« chrome/browser/chromeos/gdata/gdata_cache_metadata.cc ('K') | « chrome/browser/chromeos/gdata/gdata_cache_metadata.cc ('k') | chrome/browser/chromeos/gdata/gdata_file_system.cc » ('j') | chrome/browser/chromeos/gdata/gdata_file_system.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698