gdata: Simplify InitiateUpload() and ResumeUpload()

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 <sys/stat.h>
 
@@ skipping 568 matching lines @@
   GDataEntry* GetGDataEntryByPath(const FilePath& file_path);
 
   // Inits cache directory paths in the provided root.
   // Should be called before cache is initialized.
   void SetCachePaths(const FilePath& root_path);
 
   // Initiates upload operation of file defined with |file_name|,
   // |content_type| and |content_length|. The operation will place the newly
   // created file entity into |destination_directory|.
   //
-  // Can be called from UI/IO thread. |callback| is run on the calling thread.
+  // Can be called from *UI* thread. |callback| is run on the calling thread.
   void InitiateUpload(const std::string& file_name,

[achuithb, 2012/04/24 23:46:14]

Could you also please add a TODO to remove these pass through functions
entirely?

[satorux1, 2012/04/24 23:54:19]

Done.

                       const std::string& content_type,
                       int64 content_length,
                       const FilePath& destination_directory,
                       const FilePath& virtual_path,
                       const InitiateUploadCallback& callback);
 
   // Resumes upload operation for chunk of file defined in |params..
   //
-  // Can be called from UI/IO thread. |callback| is run on the calling thread.
+  // Can be called from *UI* thread. |callback| is run on the calling thread.
   void ResumeUpload(const ResumeUploadParams& params,
                     const ResumeFileUploadCallback& callback);
 
   // Unsafe (unlocked) version of FindEntryByPathSync method.
   void UnsafeFindEntryByPath(const FilePath& file_path,
                              FindEntryDelegate* delegate);
 
   // Converts document feed from gdata service into DirectoryInfo. On failure,
   // returns NULL and fills in |error| with an appropriate value.
   GDataDirectory* ParseGDataFeed(GDataErrorCode status,
@@ skipping 171 matching lines @@
       const GURL& content_url,
       const FilePath& downloaded_file_path,
       bool* has_enough_space);
 
   // Callback for handling internal StoreToCache() calls after downloading
   // file content.
   void OnDownloadStoredToCache(base::PlatformFileError error,
                                const std::string& resource_id,
                                const std::string& md5);
 
-  // Callback for handling file upload initialization requests.
-  void OnUploadLocationReceived(
-      const InitiateUploadCallback& callback,
-      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
-      GDataErrorCode code,
-      const GURL& upload_location);
-
-  // Callback for handling file upload resume requests.
-  void OnResumeUpload(
-      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
-      const ResumeFileUploadCallback& callback,
-      const ResumeUploadResponse& response,
-      scoped_ptr<DocumentEntry> new_entry);
-
   // Renames a file or directory at |file_path| on in-memory snapshot
   // of the file system. Returns PLATFORM_FILE_OK if successful.
   base::PlatformFileError RenameFileOnFilesystem(
       const FilePath& file_path, const FilePath::StringType& new_name,
       FilePath* updated_file_path);
 
   // Adds a file or directory at |file_path| to another directory at
   // |dir_path| on in-memory snapshot of the file system.
   // Returns PLATFORM_FILE_OK if successful.
   base::PlatformFileError AddEntryToDirectoryOnFilesystem(
@@ skipping 529 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_