gdata: Move ownership of GDataCache to GDataSystemService

chrome/browser/chromeos/gdata/gdata_file_system.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_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 359 matching lines @@
   virtual void RequestDirectoryRefresh(const FilePath& file_path) = 0;
 
   // Does server side content search for |search_query|. Search results will be
   // returned as gdata entries in temp directory proto, and their
   // title/file_name will be formatted as |<resource_id>.<original_file_name>|.
   //
   // Can be called from UI/IO thread. |callback| is run on the calling thread.
   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;
 
   // Pin or unpin file.
   virtual void SetPinState(const FilePath& file_path, bool to_pin,
                            const FileOperationCallback& callback) = 0;
 
   // Marks or unmarks a file as locally mounted.
   // When marked as mounted, the file is prevented from being modified
   // or evicted from cache.
   virtual void SetMountedState(const FilePath& file_path, bool to_mount,
                                const SetMountedStateCallback& callback) = 0;
 
   // Creates a new file from |entry| under |virtual_dir_path|. Stored its
   // content from |file_content_path| into the cache.
   virtual void AddUploadedFile(const FilePath& virtual_dir_path,
                                DocumentEntry* entry,
                                const FilePath& file_content_path,
                                FileOperationType cache_operation) = 0;
 
   // Returns true if hosted documents should be hidden.
   virtual bool hide_hosted_documents() = 0;
 };
 
 // The production implementation of 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.
   virtual void Initialize() OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual void StartUpdates() OVERRIDE;
   virtual void StopUpdates() OVERRIDE;
   virtual void CheckForUpdates() OVERRIDE;
   virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
@@ skipping 42 matching lines @@
       const FilePath& file_path,
       const GetEntryInfoCallback& callback) OVERRIDE;
   virtual void GetFileInfoByPathAsync(
       const FilePath& file_path,
       const GetFileInfoCallback& callback) OVERRIDE;
   virtual void ReadDirectoryByPathAsync(
       const FilePath& file_path,
       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|.
   virtual void SetPinState(const FilePath& file_path, bool pin,
                            const FileOperationCallback& callback) OVERRIDE;
   virtual void SetMountedState(
       const FilePath& file_path,
       bool to_mount,
       const SetMountedStateCallback& callback) OVERRIDE;
   virtual void AddUploadedFile(const FilePath& virtual_dir_path,
@@ skipping 964 matching lines @@
                                const GetCacheStateCallback& callback);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void SetPinStateOnUIThread(const FilePath& file_path, bool to_pin,
                              const FileOperationCallback& callback);
   void SetMountedStateOnUIThread(
       const FilePath& file_path,
       bool to_mount,
       const SetMountedStateCallback& callback);
 
   scoped_ptr<GDataRootDirectory> root_;
-  scoped_ptr<GDataCache> cache_;
 
   // This guards regular states.
   base::Lock lock_;
 
   // 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.

 
   // Waitable events used to block destructor until all the tasks on blocking
   // pool are run.
   scoped_ptr<base::WaitableEvent> on_io_completed_;
 
   // True if cache initialization has started, is in progress or has completed,
   // we only want to initialize cache once.
   bool cache_initialization_started_;
 
   // Number of pending tasks on the blocking pool.
@@ skipping 34 matching lines @@
 };
 
 // Sets the free disk space getter for testing.
 // The existing getter is deleted.
 void SetFreeDiskSpaceGetterForTesting(
     FreeDiskSpaceGetterInterface* getter);
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_