Change google_apis::DriveUploader interface to return CancelCallback.

chrome/browser/sync_file_system/drive/api_util_unittest.cc

 // Copyright 2013 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/sync_file_system/drive/api_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 105 matching lines @@
  public:
   explicit FakeDriveUploader(FakeDriveServiceWrapper* fake_drive_service)
       : fake_drive_service_(fake_drive_service),
         make_file_conflict_(false) {}
   virtual ~FakeDriveUploader() {}
 
   // DriveUploaderInterface overrides.
 
   // Pretends that a new file was uploaded successfully, and returns the
   // contents of "chromeos/gdata/file_entry.json" to the caller.
-  virtual void UploadNewFile(
+  virtual google_apis::CancelCallback 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 google_apis::UploadCompletionCallback& callback,
       const google_apis::ProgressCallback& progress_callback) OVERRIDE {
     DCHECK(!callback.is_null());
 
     scoped_ptr<base::Value> file_entry_data(
         LoadJSONFile("chromeos/gdata/file_entry.json"));
     scoped_ptr<ResourceEntry> file_entry(
         ResourceEntry::ExtractAndParse(*file_entry_data));
 
     if (make_file_conflict_) {
       fake_drive_service_->LoadResourceListForWapi(
           "chromeos/sync_file_system/conflict_with_file.json");
     } else {
       fake_drive_service_->LoadResourceListForWapi(
           "chromeos/sync_file_system/upload_new_file.json");
     }
 
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(callback,
                    google_apis::HTTP_SUCCESS,
                    GURL(),
                    base::Passed(&file_entry)));
+    return google_apis::CancelCallback();
   }
 
   // Pretends that an existing file ("file:resource_id") was uploaded
   // successfully, and returns the contents of "chromeos/gdata/file_entry.json"
   // to the caller.
-  virtual void UploadExistingFile(
+  virtual google_apis::CancelCallback 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 google_apis::UploadCompletionCallback& callback,
       const google_apis::ProgressCallback& progress_callback) OVERRIDE {
     DCHECK(!callback.is_null());
 
     scoped_ptr<base::Value> file_entry_data(
         LoadJSONFile("chromeos/gdata/file_entry.json"));
     scoped_ptr<ResourceEntry> file_entry(
         ResourceEntry::ExtractAndParse(*file_entry_data));
 
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(callback,
                    google_apis::HTTP_SUCCESS,
                    GURL(),
                    base::Passed(&file_entry)));
+    return google_apis::CancelCallback();
   }
 
   // At the moment, sync file system doesn't support resuming of the uploading.
   // So this method shouldn't be reached.
-  virtual void ResumeUploadFile(
+  virtual google_apis::CancelCallback ResumeUploadFile(
       const GURL& upload_location,
       const base::FilePath& drive_file_path,
       const base::FilePath& local_file_path,
       const std::string& content_type,
       const google_apis::UploadCompletionCallback& callback,
       const google_apis::ProgressCallback& progress_callback) OVERRIDE {
     NOTREACHED();
+    return google_apis::CancelCallback();
   }
 
   void set_make_file_conflict(bool enable) {
     make_file_conflict_ = enable;
   }
 
  private:
   FakeDriveServiceWrapper* fake_drive_service_;
   bool make_file_conflict_;
 
@@ skipping 634 matching lines @@
                  FROM_HERE,
                  resource_id,
                  google_apis::ENTRY_KIND_FOLDER));
   message_loop()->RunUntilIdle();
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace drive
 }  // namespace sync_file_system