gdata: Convert public synchronous functions in GDataFileSystem to asynchronous.

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 96 matching lines @@
 
 // Used by GDataFileSystem::GetDocumentResourceIdOnBlockingPool to return
 // the resource ID read from a document JSON file on the local file system.
 typedef base::Callback<void(const std::string& resource_id)>
     GetDocumentResourceIdCallback;
 
 // Callback for GetCacheState operation.
 typedef base::Callback<void(base::PlatformFileError error,
                             int cache_state)> GetCacheStateCallback;
 
-// Helper structure used for extracting key properties from GDataFile object.
-// TODO(satorux): Remove this as part of crosbug.com/30066
-struct GDataFileProperties {
-  GDataFileProperties();
-  ~GDataFileProperties();
-
-  base::PlatformFileInfo file_info;
-  std::string resource_id;
-  std::string file_md5;
-  std::string mime_type;
-  GURL content_url;
-  GURL alternate_url;
-  bool is_hosted_document;
-};
-
 // GData file system abstraction layer.
 // The interface is defined to make GDataFileSystem mockable.
 class GDataFileSystemInterface {
  public:
   virtual ~GDataFileSystemInterface() {}
 
   // Used to notify events on the file system.
   // All events are notified on UI thread.
   class Observer {
    public:
@@ skipping 243 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;
 
-
-  // Finds a file (not a directory) by |file_path| and returns its key
-  // |properties|.  Returns true if file was found.
-  // TODO(satorux): Remove this: crosbug.com/30066.
-  virtual bool GetFileInfoByPath(const FilePath& file_path,
-                                 GDataFileProperties* properties) = 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.
@@ skipping 89 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 GetFileInfoByPath(const FilePath& file_path,
-                                 GDataFileProperties* properties) 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;
@@ skipping 162 matching lines @@
   // Initiates transfer of |local_file_path| to |remote_dest_file_path|.
   // |local_file_path| must be a regular file (i.e. not a hosted document) from
   // the local file system, |remote_dest_file_path| is the virtual destination
   // path within gdata file system.
   //
   // Must be called from *UI* thread. |callback| is run on the calling thread.
   void TransferRegularFile(const FilePath& local_file_path,
                            const FilePath& remote_dest_file_path,
                            const FileOperationCallback& callback);
 
+  // Invoked upon completion of GetFileInfoByPathAsync initiated by
+  // GetFileByPath. It then continues to invoke GetResolvedFileByPath.
+  void OnGetFileInfoCompleteForGetFileByPath(
+      const FilePath& file_path,
+      const GetFileCallback& get_file_callback,
+      const GetDownloadDataCallback& get_download_data_callback,
+      base::PlatformFileError error,
+      scoped_ptr<GDataFileProto> file_info);
   // Invoked upon completion of GetFileInfoByPathAsync initiated by OpenFile.
-  // It then continues to invoke GetFileByPath and processed to
+  // It then continues to invoke GetResolvedFileByPath and proceeds to
   // OnGetFileCompleteForOpenFile.
   void OnGetFileInfoCompleteForOpenFile(const FilePath& file_path,
                                         const OpenFileCallback& callback,
                                         base::PlatformFileError error,
                                         scoped_ptr<GDataFileProto> file_info);
   // Invoked upon completion of GetFileInfoByPathAsync initiated by CloseFile.
-  // It then continues to invoke GetFileByPath and processed to
-  // OnGetFileCompleteForCloseFile.
+  // It then continues to invoke CommitDirtyInCache and proceeds to
+  // OnCommitDirtyInCacheCompleteForCloseFile.
   void OnGetFileInfoCompleteForCloseFile(const FilePath& file_path,
                                          const CloseFileCallback& callback,
                                          base::PlatformFileError error,
                                          scoped_ptr<GDataFileProto> file_info);
 
   // Invoked upon completion of GetFileByPath initiated by Copy. If
   // GetFileByPath reports no error, calls TransferRegularFile to transfer
   // |local_file_path| to |remote_dest_file_path|.
   //
   // Can be called from UI/IO thread. |callback| is run on the calling thread.
@@ skipping 697 matching lines @@
   // Called when an entry is found for ReadDirectoryByPathAsync().
   void OnReadDirectory(const ReadDirectoryCallback& callback,
                        base::PlatformFileError error,
                        GDataEntry* entry);
 
   // Finds file info by using virtual |file_path|. This call will also
   // retrieve and refresh file system content from server and disk cache.
   void FindEntryByPathAsyncOnUIThread(const FilePath& search_file_path,
                                       const FindEntryCallback& callback);
 
+  // Gets |file_path| from the file system after the file info is already
+  // resolved with GetFileInfoByPathAsync(). This function is called by
+  // OnGetFileInfoCompleteForGetFileByPath and OnGetFileInfoCompleteForOpenFile.
+  void GetResolvedFileByPath(
+      const FilePath& file_path,
+      const GetFileCallback& get_file_callback,
+      const GetDownloadDataCallback& get_download_data_callback,
+      base::PlatformFileError error,
+      const GDataFileProto* file_proto);
+
   // The following functions are used to forward calls to asynchronous public
   // member functions to UI thread.
   void SearchAsyncOnUIThread(const std::string& search_query,
                              const ReadDirectoryCallback& callback);
   void OpenFileOnUIThread(const FilePath& file_path,
                           const OpenFileCallback& callback);
   void CloseFileOnUIThread(const FilePath& file_path,
                            const CloseFileCallback& callback);
   void CopyOnUIThread(const FilePath& src_file_path,
                       const FilePath& dest_file_path,
@@ skipping 101 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_