Change google_apis::DriveUploader interface to return CancelCallback.

chrome/browser/google_apis/drive_uploader.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/drive_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 88 matching lines @@
   scoped_ptr<content::PowerSaveBlocker> power_save_blocker;
 };
 
 DriveUploader::DriveUploader(DriveServiceInterface* drive_service)
     : drive_service_(drive_service),
       weak_ptr_factory_(this) {
 }
 
 DriveUploader::~DriveUploader() {}
 
-void DriveUploader::UploadNewFile(const std::string& parent_resource_id,
-                                  const base::FilePath& drive_file_path,
-                                  const base::FilePath& local_file_path,
-                                  const std::string& title,
-                                  const std::string& content_type,
-                                  const UploadCompletionCallback& callback,
-                                  const ProgressCallback& progress_callback) {
+CancelCallback DriveUploader::UploadNewFile(
+    const std::string& parent_resource_id,
+    const base::FilePath& drive_file_path,
+    const base::FilePath& local_file_path,
+    const std::string& title,
+    const std::string& content_type,
+    const UploadCompletionCallback& callback,
+    const ProgressCallback& progress_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!parent_resource_id.empty());
   DCHECK(!drive_file_path.empty());
   DCHECK(!local_file_path.empty());
   DCHECK(!title.empty());
   DCHECK(!content_type.empty());
   DCHECK(!callback.is_null());
 
   StartUploadFile(
       scoped_ptr<UploadFileInfo>(new UploadFileInfo(drive_file_path,
                                                     local_file_path,
                                                     content_type,
                                                     callback,
                                                     progress_callback)),
       base::Bind(&DriveUploader::StartInitiateUploadNewFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  parent_resource_id,
                  title));
+  // TODO(kinaba): crbug.com/250712 Return a proper CancelCallback.
+  return CancelCallback();
 }
 
-void DriveUploader::UploadExistingFile(
+CancelCallback DriveUploader::UploadExistingFile(
     const std::string& resource_id,
     const base::FilePath& drive_file_path,
     const base::FilePath& local_file_path,
     const std::string& content_type,
     const std::string& etag,
     const UploadCompletionCallback& callback,
     const ProgressCallback& progress_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!resource_id.empty());
   DCHECK(!drive_file_path.empty());
   DCHECK(!local_file_path.empty());
   DCHECK(!content_type.empty());
   DCHECK(!callback.is_null());
 
   StartUploadFile(
       scoped_ptr<UploadFileInfo>(new UploadFileInfo(drive_file_path,
                                                     local_file_path,
                                                     content_type,
                                                     callback,
                                                     progress_callback)),
       base::Bind(&DriveUploader::StartInitiateUploadExistingFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  resource_id,
                  etag));
+  // TODO(kinaba): crbug.com/250712 Return a proper CancelCallback.
+  return CancelCallback();
 }
 
-void DriveUploader::ResumeUploadFile(
+CancelCallback DriveUploader::ResumeUploadFile(
     const GURL& upload_location,
     const base::FilePath& drive_file_path,
     const base::FilePath& local_file_path,
     const std::string& content_type,
     const UploadCompletionCallback& callback,
     const ProgressCallback& progress_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!drive_file_path.empty());
   DCHECK(!local_file_path.empty());
   DCHECK(!content_type.empty());
   DCHECK(!callback.is_null());
 
   scoped_ptr<UploadFileInfo> upload_file_info(new UploadFileInfo(
       drive_file_path, local_file_path, content_type,
       callback, progress_callback));
   upload_file_info->upload_location = upload_location;
 
   StartUploadFile(
       upload_file_info.Pass(),
       base::Bind(&DriveUploader::StartGetUploadStatus,
                  weak_ptr_factory_.GetWeakPtr()));
+  // TODO(kinaba): crbug.com/250712 Return a proper CancelCallback.
+  return CancelCallback();
 }
 
 void DriveUploader::StartUploadFile(
     scoped_ptr<UploadFileInfo> upload_file_info,
     const StartInitiateUploadCallback& start_initiate_upload_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "Uploading file: " << upload_file_info->DebugString();
 
   // Passing a raw net::FileStream* to the blocking pool is safe, because it is
   // owned by |upload_file_info| in the reply callback.
@@ skipping 212 matching lines @@
                                  GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   LOG(ERROR) << "Upload failed " << upload_file_info->DebugString();
 
   upload_file_info->completion_callback.Run(
       error, upload_file_info->upload_location, scoped_ptr<ResourceEntry>());
 }
 
 }  // namespace google_apis