chromeos: Stop returning scoped_ptr from GDataCache::GetCacheEntry

chrome/browser/chromeos/gdata/gdata_cache_metadata_unittest.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/gdata/gdata_cache_metadata.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gdata {
 
@@ skipping 34 matching lines @@
   // Save an initial entry.
   std::string test_resource_id("test_resource_id");
   std::string test_file_md5("test_file_md5");
   GDataCache::CacheSubDirectoryType test_sub_dir_type(
       GDataCache::CACHE_TYPE_PERSISTENT);
   int test_cache_state(GDataCache::CACHE_STATE_PRESENT);
   metadata_->UpdateCache(test_resource_id, test_file_md5,
                          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";
   test_sub_dir_type = GDataCache::CACHE_TYPE_PINNED;
   test_cache_state = GDataCache::CACHE_STATE_PINNED;
   metadata_->UpdateCache(test_resource_id, test_file_md5, test_sub_dir_type,
                          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";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP;
   test_cache_state = GDataCache::CACHE_STATE_DIRTY;
   metadata_->UpdateCache(test_resource_id, test_file_md5, test_sub_dir_type,
                          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";
   test_file_md5 = "test_file_md5_4";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP_DOWNLOADS;
   test_cache_state = GDataCache::CACHE_STATE_PRESENT;
   metadata_->UpdateCache(test_resource_id, test_file_md5, test_sub_dir_type,
                          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";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP_DOCUMENTS;
   test_cache_state = GDataCache::CACHE_STATE_NONE;
   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.
 TEST_F(GDataCacheMetadataMapTest, RemoveTemporaryFilesTest) {
   GDataCacheMetadataMap::CacheMap cache_map;
   InsertIntoMap(&cache_map,
                 "<resource_id_1>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_TMP,
                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_2>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_PINNED,
                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_3>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_OUTGOING,
                 GDataCache::CACHE_STATE_PRESENT);
   InsertIntoMap(&cache_map,
                 "<resource_id_4>",
                 "<md5>",
                 GDataCache::CACHE_TYPE_TMP,
                 GDataCache::CACHE_STATE_PRESENT);
 
   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