Split InitiateUpload method into two.

chrome/browser/google_apis/drive_uploader.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_GOOGLE_APIS_DRIVE_UPLOADER_H_
 #define CHROME_BROWSER_GOOGLE_APIS_DRIVE_UPLOADER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 68 matching lines @@
                                   const std::string& etag,
                                   const UploadCompletionCallback& callback) = 0;
 };
 
 class DriveUploader : public DriveUploaderInterface {
  public:
   explicit DriveUploader(DriveServiceInterface* drive_service);
   virtual ~DriveUploader();
 
   // DriveUploaderInterface overrides.
-  virtual void UploadNewFile(const GURL& upload_location,
+  virtual void UploadNewFile(const GURL& parent_upload_url,
                              const base::FilePath& drive_file_path,
                              const base::FilePath& local_file_path,
                              const std::string& title,
                              const std::string& content_type,
                              const UploadCompletionCallback& callback) OVERRIDE;
   virtual void UploadExistingFile(
-      const GURL& upload_location,
+      const GURL& upload_url,
       const base::FilePath& drive_file_path,
       const base::FilePath& local_file_path,
       const std::string& content_type,
       const std::string& etag,
       const UploadCompletionCallback& callback) OVERRIDE;
 
  private:
   struct UploadFileInfo;
+  typedef base::Callback<void(scoped_ptr<UploadFileInfo> upload_file_info)>
+      StartInitiateUploadCallback;
 
   // Starts uploading a file with |upload_file_info|.
-  void StartUploadFile(scoped_ptr<UploadFileInfo> upload_file_info);
+  void StartUploadFile(
+      scoped_ptr<UploadFileInfo> upload_file_info,
+      const StartInitiateUploadCallback& start_initiate_upload_callback);
 
   // net::FileStream::Open completion callback. The result of the file open
   // operation is passed as |result|, and the size is stored in |file_size|.
-  void OpenCompletionCallback(scoped_ptr<UploadFileInfo> upload_file_info,
-                              int64 file_size);
+  void OpenCompletionCallback(
+      scoped_ptr<UploadFileInfo> upload_file_info,
+      const StartInitiateUploadCallback& start_initiate_upload_callback,
+      int64 file_size);
+
+  // Starts to initate the new file uploading.
+  // Upon completion, OnUploadLocationReceived should be called.
+  void StartInitiateUploadNewFile(
+      const GURL& parent_upload_url,
+      const std::string& title,
+      scoped_ptr<UploadFileInfo> upload_file_info);
+
+  // Starts to initate the existing file uploading.
+  // Upon completion, OnUploadLocationReceived should be called.
+  void StartInitiateUploadExistingFile(
+      const GURL& upload_url,
+      const std::string& etag,
+      scoped_ptr<UploadFileInfo> upload_file_info);
 
   // DriveService callback for InitiateUpload.
   void OnUploadLocationReceived(scoped_ptr<UploadFileInfo> upload_file_info,
                                 GDataErrorCode code,
                                 const GURL& upload_location);
 
   // Uploads the next chunk of data from the file.
   void UploadNextChunk(scoped_ptr<UploadFileInfo> upload_file_info);
 
   // net::FileStream::Read completion callback.
@@ skipping 26 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DriveUploader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveUploader);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_UPLOADER_H_