Split InitiateUpload method into two.

chrome/browser/google_apis/gdata_wapi_service.cc

 // 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.
 
 #include "chrome/browser/google_apis/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 390 matching lines @@
 
   runner_->StartOperationWithRetry(
       new RemoveResourceFromDirectoryOperation(operation_registry(),
                                                url_request_context_getter_,
                                                url_generator_,
                                                callback,
                                                parent_resource_id,
                                                resource_id));
 }
 
-void GDataWapiService::InitiateUpload(
-    const InitiateUploadParams& params,
+void GDataWapiService::InitiateUploadNewFile(
+    const FilePath& drive_file_path,
+    const std::string& content_type,
+    int64 content_length,
+    const GURL& parent_upload_url,
+    const std::string& title,
     const InitiateUploadCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  if (params.upload_location.is_empty()) {
+  if (parent_upload_url.is_empty()) {

[hashimoto, 2013/02/08 10:14:57]

nit: DriveUploader is DCHECKing that url is not empty.
How about just DCHECKing here too?
The same goes for the existing case.

[hidehiko, 2013/02/08 12:01:50]

Can I keep this as is at the moment, because I'm about sending another CL to
remove this?

[hashimoto, 2013/02/08 12:45:02]

OK.
Please go ahead.

     callback.Run(HTTP_BAD_REQUEST, GURL());
     return;
   }
 
-  // TODO(hidehiko): Remove this if-statement by splitting the InitiateUpload
-  // method into two InitiateUploadNewFile and InitiateUploadExistingFile.
-  if (params.upload_mode == UPLOAD_NEW_FILE) {
-    runner_->StartOperationWithRetry(
-        new InitiateUploadNewFileOperation(
-            operation_registry(),
-            url_request_context_getter_,
-            callback,
-            params.drive_file_path,
-            params.content_type,
-            params.content_length,
-            params.upload_location,  // Here, upload_location has parent's URL.
-            params.title));
-  } else {
-    DCHECK_EQ(params.upload_mode, UPLOAD_EXISTING_FILE);
-    runner_->StartOperationWithRetry(
-        new InitiateUploadExistingFileOperation(
-            operation_registry(),
-            url_request_context_getter_,
-            callback,
-            params.drive_file_path,
-            params.content_type,
-            params.content_length,
-            params.upload_location,  // Here, upload_location has file's URL.
-            params.etag));
+  runner_->StartOperationWithRetry(
+      new InitiateUploadNewFileOperation(operation_registry(),
+                                         url_request_context_getter_,
+                                         callback,
+                                         drive_file_path,
+                                         content_type,
+                                         content_length,
+                                         parent_upload_url,
+                                         title));
+}
+
+void GDataWapiService::InitiateUploadExistingFile(
+    const FilePath& drive_file_path,
+    const std::string& content_type,
+    int64 content_length,
+    const GURL& upload_url,
+    const std::string& etag,
+    const InitiateUploadCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  if (upload_url.is_empty()) {
+    callback.Run(HTTP_BAD_REQUEST, GURL());
+    return;
   }
+
+  runner_->StartOperationWithRetry(
+      new InitiateUploadExistingFileOperation(operation_registry(),
+                                              url_request_context_getter_,
+                                              callback,
+                                              drive_file_path,
+                                              content_type,
+                                              content_length,
+                                              upload_url,
+                                              etag));
 }
 
 void GDataWapiService::ResumeUpload(const ResumeUploadParams& params,
                                     const UploadRangeCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new ResumeUploadOperation(operation_registry(),
                                 url_request_context_getter_,
@@ skipping 68 matching lines @@
 }
 
 void GDataWapiService::OnProgressUpdate(
     const OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 }  // namespace google_apis