gdata: Convert GDataFileSystem::AddUploadFile() 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 355 matching lines @@
   // 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;
 
   // 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,
-      GDataCache::FileOperationType cache_operation) = 0;
+  //
+  // |callback| will be called on the UI thread upon completion of operation.
+  virtual void AddUploadedFile(const FilePath& virtual_dir_path,
+                               DocumentEntry* entry,
+                               const FilePath& file_content_path,
+                               GDataCache::FileOperationType cache_operation,
+                               const base::Closure& callback) = 0;
 };
 
 // The production implementation of GDataFileSystemInterface.
 class GDataFileSystem : public GDataFileSystemInterface,
                         public content::NotificationObserver {
  public:
   GDataFileSystem(
       Profile* profile,
       GDataCache* cache,
       DocumentsServiceInterface* documents_service,
@@ skipping 59 matching lines @@
   virtual void ReadDirectoryByPathAsync(
       const FilePath& file_path,
       const ReadDirectoryCallback& callback) OVERRIDE;
   virtual void RequestDirectoryRefresh(
       const FilePath& file_path) 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 AddUploadedFile(
-      const FilePath& virtual_dir_path,
-      DocumentEntry* entry,
-      const FilePath& file_content_path,
-      GDataCache::FileOperationType cache_operation) OVERRIDE;
+  virtual void AddUploadedFile(const FilePath& virtual_dir_path,
+                               DocumentEntry* entry,
+                               const FilePath& file_content_path,
+                               GDataCache::FileOperationType cache_operation,
+                               const base::Closure& callback) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Used in tests to inject mock document service.
   void SetDocumentsServiceForTesting(DocumentsServiceInterface*
       new_document_service) {
     documents_service_ = new_document_service;
@@ skipping 523 matching lines @@
   // Notifies events to observers on UI thread.
   void NotifyDirectoryChanged(const FilePath& directory_path);
   void NotifyInitialLoadFinished();
   void NotifyDocumentFeedFetched(int num_accumulated_entries);
 
   // Helper function that completes bookkeeping tasks related to
   // completed file transfer.
   void OnTransferCompleted(
       const FileOperationCallback& callback,
       base::PlatformFileError error,
-      UploadFileInfo* upload_file_info);
+      scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Kicks off file upload once it receives |upload_file_info|.
   void StartFileUploadOnUIThread(
       const FileOperationCallback& callback,
       base::PlatformFileError* error,
       UploadFileInfo* upload_file_info);
 
   // Cache intermediate callbacks, that run on calling thread, for above cache
   // tasks that were run on blocking pool.
 
@@ skipping 113 matching lines @@
   void RequestDirectoryRefreshOnUIThread(
       const FilePath& file_path);
   void OnRequestDirectoryRefresh(GetDocumentsParams* params,
                                  base::PlatformFileError error);
   void GetCacheStateOnUIThread(const std::string& resource_id,
                                const std::string& md5,
                                const GetCacheStateCallback& callback);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void SetPinStateOnUIThread(const FilePath& file_path, bool to_pin,
                              const FileOperationCallback& callback);
+  void AddUploadedFileOnUIThread(const FilePath& virtual_dir_path,
+                                 DocumentEntry* entry,
+                                 const FilePath& file_content_path,
+                                 GDataCache::FileOperationType cache_operation,
+                                 const base::Closure& callback);
 
   // All members should be accessed only on UI thread. Do not post tasks to
   // other threads with base::Unretained(this).
 
   scoped_ptr<GDataRootDirectory> root_;
 
   // The profile hosts the GDataFileSystem via GDataSystemService.
   Profile* profile_;
 
   // The cache owned by GDataSystemService.
@@ skipping 16 matching lines @@
 
   ObserverList<Observer> observers_;
 
   // The token is used to post tasks to the blocking pool in sequence.
   const base::SequencedWorkerPool::SequenceToken sequence_token_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_