Drive: Add BatchableRequest subclass.

google_apis/drive/base_requests.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 "google_apis/drive/base_requests.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
@@ skipping 538 matching lines @@
 
 void UrlFetchRequestBase::OnAuthFailed(DriveApiErrorCode code) {
   CompleteRequestWithError(code);
 }
 
 base::WeakPtr<AuthenticatedRequestInterface>
 UrlFetchRequestBase::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
+//============================ BatchableRequestBase ============================
+
+net::URLFetcher::RequestType BatchableRequestBase::GetRequestType() const {
+  return UrlFetchRequestBase::GetRequestType();
+}
+
+std::vector<std::string> BatchableRequestBase::GetExtraRequestHeaders() const {
+  return UrlFetchRequestBase::GetExtraRequestHeaders();
+}
+
+void BatchableRequestBase::Prepare(const PrepareCallback& callback) {
+  return UrlFetchRequestBase::Prepare(callback);
+}
+
+bool BatchableRequestBase::GetContentData(
+    std::string* upload_content_type, std::string* upload_content) {
+  return UrlFetchRequestBase::GetContentData(
+      upload_content_type, upload_content);
+}
+
+void BatchableRequestBase::ProcessURLFetchResults(
+    const net::URLFetcher* source) {
+  ProcessURLFetchResults(GetErrorCode(), response_writer()->data());
+}
+
 //============================ EntryActionRequest ============================
 
 EntryActionRequest::EntryActionRequest(RequestSender* sender,
                                        const EntryActionCallback& callback)
     : UrlFetchRequestBase(sender),
       callback_(callback) {
   DCHECK(!callback_.is_null());
 }
 
 EntryActionRequest::~EntryActionRequest() {}
@@ skipping 256 matching lines @@
 //========================= MultipartUploadRequestBase ========================
 
 MultipartUploadRequestBase::MultipartUploadRequestBase(
     RequestSender* sender,
     const std::string& metadata_json,
     const std::string& content_type,
     int64 content_length,
     const base::FilePath& local_file_path,
     const FileResourceCallback& callback,
     const ProgressCallback& progress_callback)
-    : UrlFetchRequestBase(sender),
+    : BatchableRequestBase(sender),
       metadata_json_(metadata_json),
       content_type_(content_type),
       local_path_(local_file_path),
       callback_(callback),
       progress_callback_(progress_callback),
       weak_ptr_factory_(this) {
   DCHECK(!content_type.empty());
   DCHECK_GE(content_length, 0);
   DCHECK(!local_file_path.empty());
   DCHECK(!callback.is_null());
@@ skipping 40 matching lines @@
 bool MultipartUploadRequestBase::GetContentData(
     std::string* upload_content_type,
     std::string* upload_content_data) {
   // TODO(hirono): Pass stream instead of actual data to reduce memory usage.
   upload_content_type->swap(upload_content_type_);
   upload_content_data->swap(upload_content_data_);
   return true;
 }
 
 void MultipartUploadRequestBase::ProcessURLFetchResults(
-    const URLFetcher* source) {
+    DriveApiErrorCode code, const std::string& body) {
   // The upload is successfully done. Parse the response which should be
   // the entry's metadata.
-  const DriveApiErrorCode code = GetErrorCode();
   if (code == HTTP_CREATED || code == HTTP_SUCCESS) {
     ParseJsonOnBlockingPool(
-        blocking_task_runner(), response_writer()->data(),
+        blocking_task_runner(), body,
         base::Bind(&MultipartUploadRequestBase::OnDataParsed,
                    weak_ptr_factory_.GetWeakPtr(), code));
   } else {
     OnDataParsed(code, scoped_ptr<base::Value>());
   }
 }
 
 void MultipartUploadRequestBase::RunCallbackOnPrematureFailure(
     DriveApiErrorCode code) {
   callback_.Run(code, scoped_ptr<FileResource>());
@@ skipping 73 matching lines @@
   download_action_callback_.Run(code, temp_file);
   OnProcessURLFetchResultsComplete();
 }
 
 void DownloadFileRequestBase::RunCallbackOnPrematureFailure(
     DriveApiErrorCode code) {
   download_action_callback_.Run(code, base::FilePath());
 }
 
 }  // namespace google_apis