chromeos: Stop returning scoped_ptr from GDataCache::GetCacheEntry

chrome/browser/chromeos/gdata/gdata_cache_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 "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
@@ skipping 319 matching lines @@
           ToCacheEntry(resource.cache_state).IsPresent() ?
           base::PLATFORM_FILE_OK :
           base::PLATFORM_FILE_ERROR_NOT_FOUND,
           resource.expected_file_extension);
       EXPECT_EQ(1, num_callback_invocations_);
 
       // Verify cache state.
       std::string md5;
       if (ToCacheEntry(resource.cache_state).IsPresent())
          md5 = resource.md5;
-      scoped_ptr<GDataCacheEntry> cache_entry =
-          GetCacheEntryFromOriginThread(resource.resource_id, md5);
-      ASSERT_TRUE(cache_entry.get());
-      EXPECT_EQ(resource.cache_state, cache_entry->cache_state());
+      GDataCacheEntry cache_entry;
+      ASSERT_TRUE(GetCacheEntryFromOriginThread(
+          resource.resource_id, md5, &cache_entry));
+      EXPECT_EQ(resource.cache_state, cache_entry.cache_state());
       EXPECT_EQ(resource.expected_sub_dir_type,
-                GDataCache::GetSubDirectoryType(*cache_entry));
+                GDataCache::GetSubDirectoryType(cache_entry));
     }
   }
 
   void TestGetFileFromCacheByResourceIdAndMd5(
       const std::string& resource_id,
       const std::string& md5,
       base::PlatformFileError expected_error,
       const std::string& expected_file_extension) {
     expected_error_ = expected_error;
     expected_file_extension_ = expected_file_extension;
@@ skipping 61 matching lines @@
   }
 
   void VerifyRemoveFromCache(base::PlatformFileError error,
                              const std::string& resource_id,
                              const std::string& md5) {
     ++num_callback_invocations_;
 
     EXPECT_EQ(expected_error_, error);
 
     // Verify cache map.
-    scoped_ptr<GDataCacheEntry> cache_entry =
-        GetCacheEntryFromOriginThread(resource_id, md5);
-    if (cache_entry.get())
-      EXPECT_TRUE(cache_entry->IsDirty());
+    GDataCacheEntry cache_entry;
+    const bool cache_entry_found =
+        GetCacheEntryFromOriginThread(resource_id, md5, &cache_entry);
+    if (cache_entry_found)
+      EXPECT_TRUE(cache_entry.IsDirty());
 
     // If entry doesn't exist, verify that:
     // - no files with "<resource_id>.* exists in persistent and tmp dirs
     // - no "<resource_id>" symlink exists in pinned and outgoing dirs.
     std::vector<PathToVerify> paths_to_verify;
     paths_to_verify.push_back(  // Index 0: CACHE_TYPE_TMP.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "*",
                      GDataCache::CACHE_TYPE_TMP,
                      GDataCache::CACHED_FILE_FROM_SERVER), FilePath()));
     paths_to_verify.push_back(  // Index 1: CACHE_TYPE_PERSISTENT.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "*",
                      GDataCache::CACHE_TYPE_PERSISTENT,
                      GDataCache::CACHED_FILE_FROM_SERVER), FilePath()));
     paths_to_verify.push_back(  // Index 2: CACHE_TYPE_TMP, but STATE_PINNED.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "",
                      GDataCache::CACHE_TYPE_PINNED,
                      GDataCache::CACHED_FILE_FROM_SERVER), FilePath()));
     paths_to_verify.push_back(  // Index 3: CACHE_TYPE_OUTGOING.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "",
                      GDataCache::CACHE_TYPE_OUTGOING,
                      GDataCache::CACHED_FILE_FROM_SERVER), FilePath()));
-    if (!cache_entry.get()) {
+    if (!cache_entry_found) {
       for (size_t i = 0; i < paths_to_verify.size(); ++i) {
         file_util::FileEnumerator enumerator(
             paths_to_verify[i].path_to_scan.DirName(), false /* not recursive*/,
             static_cast<file_util::FileEnumerator::FileType>(
                 file_util::FileEnumerator::FILES |
                 file_util::FileEnumerator::SHOW_SYM_LINKS),
             paths_to_verify[i].path_to_scan.BaseName().value());
         EXPECT_TRUE(enumerator.Next().empty());
       }
     } else {
@@ skipping 10 matching lines @@
                            GDataCache::CACHE_TYPE_PERSISTENT,
                            GDataCache::CACHED_FILE_LOCALLY_MODIFIED);
 
       // Change expected_existing_path of CACHE_TYPE_OUTGOING (index 3).
       paths_to_verify[3].expected_existing_path =
           GetCacheFilePath(resource_id,
                            std::string(),
                            GDataCache::CACHE_TYPE_OUTGOING,
                            GDataCache::CACHED_FILE_FROM_SERVER);
 
-      if (cache_entry->IsPinned()) {
+      if (cache_entry.IsPinned()) {
          // Change expected_existing_path of CACHE_TYPE_TMP but STATE_PINNED
          // (index 2).
          paths_to_verify[2].expected_existing_path =
              GetCacheFilePath(resource_id,
                               std::string(),
                               GDataCache::CACHE_TYPE_PINNED,
                               GDataCache::CACHED_FILE_FROM_SERVER);
       }
 
       for (size_t i = 0; i < paths_to_verify.size(); ++i) {
@@ skipping 191 matching lines @@
   }
 
   void VerifyCacheFileState(base::PlatformFileError error,
                             const std::string& resource_id,
                             const std::string& md5) {
     ++num_callback_invocations_;
 
     EXPECT_EQ(expected_error_, error);
 
     // Verify cache map.
-    scoped_ptr<GDataCacheEntry> cache_entry =
-        GetCacheEntryFromOriginThread(resource_id, md5);
+    GDataCacheEntry cache_entry;
+    const bool cache_entry_found =
+        GetCacheEntryFromOriginThread(resource_id, md5, &cache_entry);
     if (ToCacheEntry(expected_cache_state_).IsPresent() ||
         ToCacheEntry(expected_cache_state_).IsPinned()) {
-      ASSERT_TRUE(cache_entry.get());
-      EXPECT_EQ(expected_cache_state_, cache_entry->cache_state());
+      ASSERT_TRUE(cache_entry_found);
+      EXPECT_EQ(expected_cache_state_, cache_entry.cache_state());
       EXPECT_EQ(expected_sub_dir_type_,
-                GDataCache::GetSubDirectoryType(*cache_entry));
+                GDataCache::GetSubDirectoryType(cache_entry));
     } else {
-      EXPECT_FALSE(cache_entry.get());
+      EXPECT_FALSE(cache_entry_found);
     }
 
     // Verify actual cache file.
     FilePath dest_path = cache_->GetCacheFilePath(
         resource_id,
         md5,
         ToCacheEntry(expected_cache_state_).IsPinned() ||
         ToCacheEntry(expected_cache_state_).IsDirty() ?
                 GDataCache::CACHE_TYPE_PERSISTENT :
                 GDataCache::CACHE_TYPE_TMP,
@@ skipping 49 matching lines @@
 
   FilePath GetCacheFilePath(const std::string& resource_id,
                             const std::string& md5,
                             GDataCache::CacheSubDirectoryType sub_dir_type,
                             GDataCache::CachedFileOrigin file_origin) {
     return cache_->GetCacheFilePath(resource_id, md5, sub_dir_type,
                                     file_origin);
   }
 
   // Helper function to call GetCacheEntry from origin thread.
-  scoped_ptr<GDataCacheEntry> GetCacheEntryFromOriginThread(
-      const std::string& resource_id,
-      const std::string& md5) {
-    scoped_ptr<GDataCacheEntry> cache_entry;
+  bool GetCacheEntryFromOriginThread(const std::string& resource_id,
+                                     const std::string& md5,
+                                     GDataCacheEntry* cache_entry) {
+    bool result = false;
     content::BrowserThread::GetBlockingPool()
         ->GetSequencedTaskRunner(sequence_token_)->PostTask(
             FROM_HERE,
             base::Bind(
                 &GDataCacheTest::GetCacheEntryFromOriginThreadInternal,
                 base::Unretained(this),
                 resource_id,
                 md5,
-                &cache_entry));
+                cache_entry,
+                &result));
     test_util::RunBlockingPoolTask();
-    return cache_entry.Pass();
+    return result;
   }
 
   // Used to implement GetCacheEntry.
   void GetCacheEntryFromOriginThreadInternal(
       const std::string& resource_id,
       const std::string& md5,
-      scoped_ptr<GDataCacheEntry>* cache_entry) {
-    cache_entry->reset(cache_->GetCacheEntry(resource_id, md5).release());
+      GDataCacheEntry* cache_entry,
+      bool* result) {
+    *result = cache_->GetCacheEntry(resource_id, md5, cache_entry);
   }
 
   // Returns true if the cache entry exists for the given resource ID and MD5.
   bool CacheEntryExists(const std::string& resource_id,
                         const std::string& md5) {
-    return GetCacheEntryFromOriginThread(resource_id, md5).get();
+    GDataCacheEntry cache_entry;
+    return GetCacheEntryFromOriginThread(resource_id, md5, &cache_entry);
   }
 
   void TestGetCacheFilePath(const std::string& resource_id,
                             const std::string& md5,
                             const std::string& expected_filename) {
     FilePath actual_path = cache_->GetCacheFilePath(
         resource_id,
         md5,
         GDataCache::CACHE_TYPE_TMP,
         GDataCache::CACHED_FILE_FROM_SERVER);
@@ skipping 767 matching lines @@
   EXPECT_EQ(1, num_callback_invocations_);
   EXPECT_TRUE(CacheEntryExists(resource_id, md5));
 
   // Try to remove the file.
   num_callback_invocations_ = 0;
   TestRemoveFromCache(resource_id, base::PLATFORM_FILE_OK);
   EXPECT_EQ(1, num_callback_invocations_);
 }
 
 }   // namespace gdata