gdata: Move GDataCache::CacheEntry out of GDataCache

chrome/browser/chromeos/gdata/gdata_cache_metadata.h

Index: chrome/browser/chromeos/gdata/gdata_cache_metadata.h
diff --git a/chrome/browser/chromeos/gdata/gdata_cache_metadata.h b/chrome/browser/chromeos/gdata/gdata_cache_metadata.h
index d0bdbcf79b8ea064c92f88ebd86265d709bd1c96..fbcbfc096a6eafbdbe905741701ba99ca88fcace 100644
--- a/chrome/browser/chromeos/gdata/gdata_cache_metadata.h
+++ b/chrome/browser/chromeos/gdata/gdata_cache_metadata.h
@@ -22,7 +22,7 @@ class GDataCacheMetadata {
  public:
   // Callback for Iterate().
   typedef base::Callback<void(const std::string& resource_id,
-                              const GDataCache::CacheEntry& cache_entry)>
+                              const GDataCacheEntry& cache_entry)>
       IterateCallback;
 
   // |pool| and |sequence_token| are used to assert that the functions are
@@ -38,7 +38,7 @@ class GDataCacheMetadata {
   // Updates cache map with entry corresponding to |resource_id|.
   // Creates new entry if it doesn't exist, otherwise update the entry.
   virtual void UpdateCache(const std::string& resource_id,
-                           const GDataCache::CacheEntry& cache_entry) = 0;
+                           const GDataCacheEntry& cache_entry) = 0;
 
   // Removes entry corresponding to |resource_id| from cache map.
   virtual void RemoveFromCache(const std::string& resource_id) = 0;
@@ -48,7 +48,7 @@ class GDataCacheMetadata {
   // |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<GDataCache::CacheEntry> GetCacheEntry(
+  virtual scoped_ptr<GDataCacheEntry> GetCacheEntry(
       const std::string& resource_id,
       const std::string& md5) = 0;
 
@@ -85,16 +85,16 @@ class GDataCacheMetadataMap : public GDataCacheMetadata {
   // GDataCacheMetadata overrides:
   virtual void UpdateCache(
       const std::string& resource_id,
-      const GDataCache::CacheEntry& cache_entry) OVERRIDE;
+      const GDataCacheEntry& cache_entry) OVERRIDE;
   virtual void RemoveFromCache(const std::string& resource_id) OVERRIDE;
-  virtual scoped_ptr<GDataCache::CacheEntry> GetCacheEntry(
+  virtual scoped_ptr<GDataCacheEntry> GetCacheEntry(
       const std::string& resource_id,
       const std::string& md5) 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, GDataCache::CacheEntry> CacheMap;
+  typedef std::map<std::string, GDataCacheEntry> CacheMap;
 
   // A map table of resource ID to file path.
   typedef std::map<std::string, FilePath> ResourceIdToFilePathMap;
@@ -117,7 +117,7 @@ class GDataCacheMetadataMap : public GDataCacheMetadata {
   // Returns true if |md5| matches the one in |cache_entry| with some
   // exceptions. See the function definition for details.
   static bool CheckIfMd5Matches(const std::string& md5,
-                                const GDataCache::CacheEntry& cache_entry);
+                                const GDataCacheEntry& cache_entry);
 
   CacheMap cache_map_;