Drive API: Simplify lifetime management of child requests in BatchUploadRequest.

chrome/browser/drive/drive_api_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/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 168 matching lines @@
     const base::FilePath& local_file_path,
     const UploadNewFileOptions& options,
     const google_apis::FileResourceCallback& callback,
     const google_apis::ProgressCallback& progress_callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   DCHECK(batch_request_);
 
   batch_request_->AddRequest(
-      new google_apis::drive::MultipartUploadNewFileRequest(
+      new google_apis::drive::MultipartUploadNewFileDelegate(
           batch_request_->sender(), title, parent_resource_id, content_type,
           content_length, options.modified_date, options.last_viewed_by_me_date,
           local_file_path, options.properties, batch_request_->url_generator(),
           callback, progress_callback));
   return cancel_callback_;
 }
 
 google_apis::CancelCallback
 BatchRequestConfigurator::MultipartUploadExistingFile(
     const std::string& content_type,
     int64 content_length,
     const std::string& resource_id,
     const base::FilePath& local_file_path,
     const UploadExistingFileOptions& options,
     const google_apis::FileResourceCallback& callback,
     const google_apis::ProgressCallback& progress_callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!callback.is_null());
   DCHECK(batch_request_);
 
   batch_request_->AddRequest(
-      new google_apis::drive::MultipartUploadExistingFileRequest(
+      new google_apis::drive::MultipartUploadExistingFileDelegate(
           batch_request_->sender(), options.title, resource_id,
           options.parent_resource_id, content_type, content_length,
           options.modified_date, options.last_viewed_by_me_date,
           local_file_path, options.etag, options.properties,
           batch_request_->url_generator(), callback, progress_callback));
   return cancel_callback_;
 }
 
 void BatchRequestConfigurator::Commit() {
   DCHECK(CalledOnValidThread());
@@ skipping 483 matching lines @@
     const std::string& parent_resource_id,
     const std::string& title,
     const base::FilePath& local_file_path,
     const drive::UploadNewFileOptions& options,
     const FileResourceCallback& callback,
     const google_apis::ProgressCallback& progress_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
-      new google_apis::drive::MultipartUploadNewFileRequest(
-          sender_.get(), title, parent_resource_id, content_type,
-          content_length, options.modified_date, options.last_viewed_by_me_date,
-          local_file_path, options.properties, url_generator_, callback,
-          progress_callback));
+      new google_apis::drive::SingleBatchableDelegateRequest(
+          sender_.get(),
+          new google_apis::drive::MultipartUploadNewFileDelegate(
+              sender_.get(), title, parent_resource_id, content_type,
+              content_length, options.modified_date,
+              options.last_viewed_by_me_date, local_file_path,
+              options.properties, url_generator_, callback,
+              progress_callback)));
 }
 
 CancelCallback DriveAPIService::MultipartUploadExistingFile(
     const std::string& content_type,
     int64 content_length,
     const std::string& resource_id,
     const base::FilePath& local_file_path,
     const drive::UploadExistingFileOptions& options,
     const FileResourceCallback& callback,
     const google_apis::ProgressCallback& progress_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
-      new google_apis::drive::MultipartUploadExistingFileRequest(
-          sender_.get(), options.title, resource_id, options.parent_resource_id,
-          content_type, content_length, options.modified_date,
-          options.last_viewed_by_me_date, local_file_path, options.etag,
-          options.properties, url_generator_, callback, progress_callback));
+      new google_apis::drive::SingleBatchableDelegateRequest(
+          sender_.get(),
+          new google_apis::drive::MultipartUploadExistingFileDelegate(
+              sender_.get(), options.title, resource_id,
+              options.parent_resource_id, content_type, content_length,
+              options.modified_date, options.last_viewed_by_me_date,
+              local_file_path, options.etag, options.properties, url_generator_,
+              callback, progress_callback)));
 }
 
 CancelCallback DriveAPIService::AuthorizeApp(
     const std::string& resource_id,
     const std::string& app_id,
     const AuthorizeAppCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   // Files.Authorize is only available for whitelisted clients like official
@@ skipping 109 matching lines @@
   // RequestSender before the request is committed because the request has a
   // reference to RequestSender and we should ensure to delete the request when
   // the sender is deleted. Resolve the circulating dependency and fix it.
   const google_apis::CancelCallback callback =
       sender_->StartRequestWithRetry(request.release());
   return make_scoped_ptr<BatchRequestConfiguratorInterface>(
       new BatchRequestConfigurator(weak_ref, callback));
 }
 
 }  // namespace drive