chromeos: Stop returning scoped_ptr from GDataCache::GetCacheEntry

chrome/browser/chromeos/gdata/gdata_cache_metadata.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_
 
 #include <map>
 #include <string>
 
@@ skipping 25 matching lines @@
   virtual ~GDataCacheMetadata();
 
   // Adds a new cache entry corresponding to |resource_id| if it doesn't
   // exist, otherwise update the existing entry.
   virtual void AddOrUpdateCacheEntry(const std::string& resource_id,
                                      const GDataCacheEntry& cache_entry) = 0;
 
   // Removes entry corresponding to |resource_id| from cache map.
   virtual void RemoveCacheEntry(const std::string& resource_id) = 0;
 
-  // Returns the cache entry for file corresponding to |resource_id| and |md5|
-  // if entry exists in cache map.  Otherwise, returns NULL.
+  // Gets the cache entry for file corresponding to |resource_id| and |md5|
+  // and returns true if entry exists in cache map.  Otherwise, returns false.
   // |md5| can be empty if only matching |resource_id| is desired, which may
   // happen when looking for pinned entries where symlinks' filenames have no
   // extension and hence no md5.
-  virtual scoped_ptr<GDataCacheEntry> GetCacheEntry(
-      const std::string& resource_id,
-      const std::string& md5) = 0;
+  virtual bool GetCacheEntry(const std::string& resource_id,
+                             const std::string& md5,
+                             GDataCacheEntry* entry) = 0;
 
   // Removes temporary files (files in CACHE_TYPE_TMP) from the cache map.
   virtual void RemoveTemporaryFiles() = 0;
 
   // Iterates over all the cache entries synchronously. |callback| is called
   // on each cache entry.
   virtual void Iterate(const IterateCallback& callback) = 0;
 
  protected:
   // Checks whether the current thread is on the right sequenced worker pool
@@ skipping 16 matching lines @@
   virtual ~GDataCacheMetadataMap();
 
   // Initializes the data.
   void Initialize(const std::vector<FilePath>& cache_paths);
 
   // GDataCacheMetadata overrides:
   virtual void AddOrUpdateCacheEntry(
       const std::string& resource_id,
       const GDataCacheEntry& cache_entry) OVERRIDE;
   virtual void RemoveCacheEntry(const std::string& resource_id) OVERRIDE;
-  virtual scoped_ptr<GDataCacheEntry> GetCacheEntry(
-      const std::string& resource_id,
-      const std::string& md5) OVERRIDE;
+  virtual bool GetCacheEntry(const std::string& resource_id,
+                             const std::string& md5,
+                             GDataCacheEntry* cache_entry) OVERRIDE;
   virtual void RemoveTemporaryFiles() OVERRIDE;
   virtual void Iterate(const IterateCallback& callback) OVERRIDE;
 
   // A map table of cache file's resource id to its CacheEntry* entry.
   typedef std::map<std::string, GDataCacheEntry> CacheMap;
 
   // A map table of resource ID to file path.
   typedef std::map<std::string, FilePath> ResourceIdToFilePathMap;
 
  private:
@@ skipping 17 matching lines @@
                                 const GDataCacheEntry& cache_entry);
 
   CacheMap cache_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataCacheMetadataMap);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_METADATA_H_