Change google_apis::DriveUploader interface to return CancelCallback.

chrome/browser/chromeos/drive/job_scheduler.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/chromeos/drive/job_scheduler.h"
 
 #include <math.h>
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 24 matching lines @@
   std::string title;
   std::string content_type;
   google_apis::UploadCompletionCallback callback;
   google_apis::ProgressCallback progress_callback;
 };
 
 // Helper function to work around the arity limitation of base::Bind.
 google_apis::CancelCallback RunUploadNewFile(
     google_apis::DriveUploaderInterface* uploader,
     const UploadNewFileParams& params) {
-  uploader->UploadNewFile(params.parent_resource_id,
-                          params.drive_file_path,
-                          params.local_file_path,
-                          params.title,
-                          params.content_type,
-                          params.callback,
-                          params.progress_callback);
-  // TODO(kinaba): crbug.com/231209 Return a proper CancelCallback.
-  return google_apis::CancelCallback();
+  return uploader->UploadNewFile(params.parent_resource_id,
+                                 params.drive_file_path,
+                                 params.local_file_path,
+                                 params.title,
+                                 params.content_type,
+                                 params.callback,
+                                 params.progress_callback);
 }
 
 // Parameter struct for RunUploadExistingFile.
 struct UploadExistingFileParams {
   std::string resource_id;
   base::FilePath drive_file_path;
   base::FilePath local_file_path;
   std::string content_type;
   std::string etag;
   google_apis::UploadCompletionCallback callback;
   google_apis::ProgressCallback progress_callback;
 };
 
 // Helper function to work around the arity limitation of base::Bind.
 google_apis::CancelCallback RunUploadExistingFile(
     google_apis::DriveUploaderInterface* uploader,
     const UploadExistingFileParams& params) {
-  uploader->UploadExistingFile(params.resource_id,
-                               params.drive_file_path,
-                               params.local_file_path,
-                               params.content_type,
-                               params.etag,
-                               params.callback,
-                               params.progress_callback);
-  // TODO(kinaba): crbug.com/231209 Return a proper CancelCallback.
-  return google_apis::CancelCallback();
+  return uploader->UploadExistingFile(params.resource_id,
+                                      params.drive_file_path,
+                                      params.local_file_path,
+                                      params.content_type,
+                                      params.etag,
+                                      params.callback,
+                                      params.progress_callback);
 }
 
 // Parameter struct for RunResumeUploadFile.
 struct ResumeUploadFileParams {
   GURL upload_location;
   base::FilePath drive_file_path;
   base::FilePath local_file_path;
   std::string content_type;
   google_apis::UploadCompletionCallback callback;
   google_apis::ProgressCallback progress_callback;
 };
 
 // Helper function to adjust the return type.
 google_apis::CancelCallback RunResumeUploadFile(
     google_apis::DriveUploaderInterface* uploader,
     const ResumeUploadFileParams& params) {
-  uploader->ResumeUploadFile(params.upload_location,
-                             params.drive_file_path,
-                             params.local_file_path,
-                             params.content_type,
-                             params.callback,
-                             params.progress_callback);
-  // TODO(kinaba): crbug.com/231209 Return a proper CancelCallback.
-  return google_apis::CancelCallback();
+  return uploader->ResumeUploadFile(params.upload_location,
+                                    params.drive_file_path,
+                                    params.local_file_path,
+                                    params.content_type,
+                                    params.callback,
+                                    params.progress_callback);
 }
 
 }  // namespace
 
 const int JobScheduler::kMaxJobCount[] = {
   5,  // METADATA_QUEUE
   1,  // FILE_QUEUE
 };
 
 JobScheduler::JobEntry::JobEntry(JobType type)
@@ skipping 874 matching lines @@
     case FILE_QUEUE:
       return "FILE_QUEUE";
     case NUM_QUEUES:
       break;  // This value is just a sentinel. Should never be used.
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive