Extract GetResolveFile into DownloadOperation.

chrome/browser/chromeos/drive/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_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 151 matching lines @@
 
   // Used in tests to update the file system from |feed_list|.
   // See also the comment at ChangeListLoader::UpdateFromFeed().
   internal::ChangeListLoader* change_list_loader() {
     return change_list_loader_.get();
   }
 
  private:
   friend class DriveFileSystemTest;
 
-  // Defines set of parameters passed to an intermediate callback
-  // OnGetFileCompleteForOpen, during execution of OpenFile() method.
-  struct GetFileCompleteForOpenParams;
-
-  // Defines set of parameters for GetResolvedFileByPath().
-  struct GetResolvedFileParams;
-
   // Used to implement Reload().
   void ReloadAfterReset(FileError error);
 
   // Sets up ChangeListLoader.
   void SetupChangeListLoader();
 
   // Called on preference change.
   void OnDisableDriveHostedFilesChanged();
 
   // Part of Search(). Called after DriveOperations::Search is completed.
@@ skipping 14 matching lines @@
   // Used to implement Pin().
   void PinAfterGetResourceEntryByPath(const FileOperationCallback& callback,
                                       FileError error,
                                       scoped_ptr<ResourceEntry> entry);
 
   // Used to implement Unpin().
   void UnpinAfterGetResourceEntryByPath(const FileOperationCallback& callback,
                                         FileError error,
                                         scoped_ptr<ResourceEntry> entry);
 
-  // Invoked upon completion of GetResourceEntryByPath initiated by
-  // GetFileByPath. It then continues to invoke GetResolvedFileByPath.
-  // |callback| must not be null.
-  void OnGetResourceEntryCompleteForGetFileByPath(
-      const base::FilePath& file_path,
-      const GetFileCallback& callback,
-      FileError error,
-      scoped_ptr<ResourceEntry> file_info);
-
-  // Invoked upon completion of GetResourceEntryByPath initiated by OpenFile.
-  // It then continues to invoke GetResolvedFileByPath and proceeds to
-  // OnGetFileCompleteForOpenFile.
-  void OnGetResourceEntryCompleteForOpenFile(
+  // Part of OpenFile(). Called after the file downloading is completed.
+  void OpenFileAfterFileDownloaded(
       const base::FilePath& file_path,
       const OpenFileCallback& callback,
       FileError error,
-      scoped_ptr<ResourceEntry> file_info);
+      const base::FilePath& local_file_path,
+      scoped_ptr<ResourceEntry> entry);
+
+  // Part of OpenFile(). Called after the cache file is marked dirty.
+  void OpenFileAfterMarkDirty(
+      const std::string& resource_id,
+      const std::string& md5,
+      const OpenFileCallback& callback,
+      FileError error);
 
   // Invoked at the last step of OpenFile. It removes |file_path| from the
   // current set of opened files if |result| is an error, and then invokes the
   // |callback| function.
   void OnOpenFileFinished(const base::FilePath& file_path,
                           const OpenFileCallback& callback,
                           FileError result,
                           const base::FilePath& cache_file_path);
 
   // Invoked during the process of CloseFile. What is done here is as follows:
   // 1) Gets resource_id and md5 of the entry at |file_path|.
   // 2) Commits the modification to the cache system.
   // 3) Removes the |file_path| from the remembered set of opened files.
   // 4) Invokes the user-supplied |callback|.
   // |callback| must not be null.
   void CloseFileAfterGetResourceEntry(const base::FilePath& file_path,
                                       const FileOperationCallback& callback,
                                       FileError error,
                                       scoped_ptr<ResourceEntry> entry);
   void CloseFileFinalize(const base::FilePath& file_path,
                          const FileOperationCallback& callback,
                          FileError result);
 
-  // Invoked upon completion of GetFileByPath initiated by OpenFile. If
-  // GetFileByPath is successful, calls MarkDirtyInCache to mark the cache
-  // file as dirty for the file identified by |file_info.resource_id| and
-  // |file_info.md5|.
-  void OnGetFileCompleteForOpenFile(const GetFileCompleteForOpenParams& params,
-                                    FileError error,
-                                    const base::FilePath& file_path,
-                                    scoped_ptr<ResourceEntry> entry);
-
-  // Invoked upon completion of MarkDirtyInCache initiated by OpenFile.
-  void OnMarkDirtyInCacheCompleteForOpenFile(
-      const GetFileCompleteForOpenParams& params,
-      FileError error);
-
   // Callback for handling about resource fetch.
   void OnGetAboutResource(
       const GetAvailableSpaceCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Callback for handling results of ReloadFeedFromServerIfNeeded() initiated
   // from CheckForUpdates().
   void OnUpdateChecked(FileError error);
 
@@ skipping 38 matching lines @@
   // |callback| must not be null.
   void ReadDirectoryByPathAfterLoad(
       const base::FilePath& directory_path,
       const ReadDirectoryWithSettingCallback& callback,
       FileError error);
   void ReadDirectoryByPathAfterRead(
       const ReadDirectoryWithSettingCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntryVector> entries);
 
-  // Gets the file at |file_path| from the cache (if found in the cache),
-  // or the server (if not found in the cache) after the file info is
-  // already resolved with GetResourceEntryByPath() or GetResourceEntryById().
-  void GetResolvedFileByPath(scoped_ptr<GetResolvedFileParams> params);
-  void GetResolvedFileByPathAfterCreateDocumentJsonFile(
-      scoped_ptr<GetResolvedFileParams> params,
-      const base::FilePath* file_path,
-      FileError error);
-  void GetResolvedFileByPathAfterGetFileFromCache(
-      scoped_ptr<GetResolvedFileParams> params,
-      FileError error,
-      const base::FilePath& cache_file_path);
-  void GetResolvedFileByPathAfterGetResourceEntry(
-      scoped_ptr<GetResolvedFileParams> params,
-      google_apis::GDataErrorCode status,
-      scoped_ptr<google_apis::ResourceEntry> entry);
-  void GetResolvedFileByPathAfterRefreshEntry(
-      scoped_ptr<GetResolvedFileParams> params,
-      const GURL& download_url,
-      FileError error,
-      const base::FilePath& drive_file_path,
-      scoped_ptr<ResourceEntry> entry);
-  void GetResolvedFileByPathAfterFreeDiskSpace(
-      scoped_ptr<GetResolvedFileParams> params,
-      const GURL& download_url,
-      bool has_enough_space);
-  void GetResolveFileByPathAfterCreateTemporaryFile(
-      scoped_ptr<GetResolvedFileParams> params,
-      const GURL& download_url,
-      base::FilePath* temp_file,
-      bool success);
-  void GetResolvedFileByPathAfterDownloadFile(
-      scoped_ptr<GetResolvedFileParams> params,
-      google_apis::GDataErrorCode status,
-      const base::FilePath& downloaded_file_path);
-  void GetResolvedFileByPathAfterGetCacheEntryForCancel(
-      const std::string& resource_id,
-      const std::string& md5,
-      bool success,
-      const FileCacheEntry& cache_entry);
-  void GetResolvedFileByPathAfterStore(
-      scoped_ptr<GetResolvedFileParams> params,
-      const base::FilePath& downloaded_file_path,
-      FileError error);
-  void GetResolvedFileByPathAfterGetFile(
-      scoped_ptr<GetResolvedFileParams> params,
-      FileError error,
-      const base::FilePath& cache_file);
-
   // Part of GetResourceEntryById(). Called after
   // ResourceMetadata::GetResourceEntryById() is complete.
   // |callback| must not be null.
   void GetResourceEntryByIdAfterGetEntry(
       const GetResourceEntryWithFilePathCallback& callback,
       FileError error,
       const base::FilePath& file_path,
       scoped_ptr<ResourceEntry> entry);
 
   // Part of GetFileByResourceId(). Called after
   // ResourceMetadata::GetResourceEntryById() is complete.
   // |get_file_callback| must not be null.
   // |get_content_callback| may be null.
   void GetFileByResourceIdAfterGetEntry(
       const DriveClientContext& context,
       const GetFileCallback& get_file_callback,
       const google_apis::GetContentCallback& get_content_callback,
       FileError error,
       const base::FilePath& file_path,
       scoped_ptr<ResourceEntry> entry);
 
-  // Part of GetFileContentByPath(). Called after
-  // ResourceMetadata::GetResourceEntryByPath() is complete.
-  // |initialized_callback|, |get_content_callback| and |completion_callback|
-  // must not be null.
-  void GetFileContentByPathAfterGetEntry(
-      const base::FilePath& file_path,
-      const GetFileContentInitializedCallback& initialized_callback,
-      const google_apis::GetContentCallback& get_content_callback,
-      const FileOperationCallback& completion_callback,
-      FileError error,
-      scoped_ptr<ResourceEntry> entry);
-
   // Part of RefreshDirectory(). Called after
   // GetResourceEntryByPath() is complete.
   void RefreshDirectoryAfterGetResourceEntry(
       const base::FilePath& directory_path,
       const FileOperationCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntry> entry);
 
   // Part of GetEntryByResourceId and GetEntryByPath. Checks whether there is a
   // local dirty cache for the entry, and if there is, replace the
@@ skipping 65 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_