gdata: Move ownership of GDataCache to GDataSystemService

chrome/browser/chromeos/gdata/gdata_file_system.h

Index: chrome/browser/chromeos/gdata/gdata_file_system.h
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h
index 5ad5996c43f8cdb9da9156ab5633a0091de7e207..5daf26a32c4d754a0ec75131c795f73cb9a97821 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.h
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.h
@@ -377,22 +377,6 @@ class GDataFileSystemInterface {
   virtual void SearchAsync(const std::string& search_query,
                            const ReadDirectoryCallback& callback) = 0;
 
-  // Returns true if the given path is under gdata cache directory, i.e.
-  // <user_profile_dir>/GCache/v1
-  virtual bool IsUnderGDataCacheDirectory(const FilePath& path) const = 0;
-
-  // Returns the sub-directory under gdata cache directory for the given sub
-  // directory type. Example:  <user_profile_dir>/GCache/v1/tmp
-  virtual FilePath GetCacheDirectoryPath(
-      GDataCache::CacheSubDirectoryType sub_dir_type) const = 0;
-
-  // Returns absolute path of the file if it were cached or to be cached.
-  virtual FilePath GetCacheFilePath(
-      const std::string& resource_id,
-      const std::string& md5,
-      GDataCache::CacheSubDirectoryType sub_dir_type,
-      GDataCache::CachedFileOrigin file_orign) const = 0;
-
   // Fetches the user's Account Metadata to find out current quota information
   // and returns it to the callback.
   virtual void GetAvailableSpace(const GetAvailableSpaceCallback& callback) = 0;
@@ -422,8 +406,11 @@ class GDataFileSystemInterface {
 class GDataFileSystem : public GDataFileSystemInterface,
                         public content::NotificationObserver {
  public:
-  GDataFileSystem(Profile* profile,
-                  DocumentsServiceInterface* documents_service);
+  GDataFileSystem(
+      Profile* profile,
+      GDataCache* cache,

[achuithb, 2012/06/11 21:58:10]

Why not pass in GDataSystemService* instead of GDataCache* and
DocumentsServiceInterface*? We can write convenience functions to access the
cache and the doc service.

[hashimoto, 2012/06/12 06:20:12]

See my comment in gdata_sync_client.h

+      DocumentsServiceInterface* documents_service,
+      const base::SequencedWorkerPool::SequenceToken& sequence_token);
   virtual ~GDataFileSystem();
 
   // GDataFileSystem overrides.
@@ -486,14 +473,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
       const ReadDirectoryCallback& callback) OVERRIDE;
   virtual void RequestDirectoryRefresh(
       const FilePath& file_path) OVERRIDE;
-  virtual bool IsUnderGDataCacheDirectory(const FilePath& path) const OVERRIDE;
-  virtual FilePath GetCacheDirectoryPath(
-      GDataCache::CacheSubDirectoryType sub_dir_type) const OVERRIDE;
-  virtual FilePath GetCacheFilePath(
-      const std::string& resource_id,
-      const std::string& md5,
-      GDataCache::CacheSubDirectoryType sub_dir_type,
-      GDataCache::CachedFileOrigin file_orign) const OVERRIDE;
   virtual void GetAvailableSpace(
       const GetAvailableSpaceCallback& callback) OVERRIDE;
   // Calls private Pin or Unpin methods with |callback|.
@@ -1478,7 +1457,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
       const SetMountedStateCallback& callback);
 
   scoped_ptr<GDataRootDirectory> root_;
-  scoped_ptr<GDataCache> cache_;
 
   // This guards regular states.
   base::Lock lock_;
@@ -1486,6 +1464,8 @@ class GDataFileSystem : public GDataFileSystemInterface,
   // The profile hosts the GDataFileSystem via GDataSystemService.
   Profile* profile_;
 
+  GDataCache* cache_;  // Owned by GDataSystemService.
+
   // The document service for the GDataFileSystem.
   DocumentsServiceInterface* documents_service_;

[achuithb, 2012/06/12 08:17:43]

Can we also add a comment here that this is owned by GDataSystemService.

[hashimoto, 2012/06/12 08:25:22]

Done.