Notify upload progress from batch request to its child requests.

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 110 matching lines @@
                          std::string* upload_content_type,
                          std::string* upload_content_data) {
   std::vector<google_apis::ContentTypeAndData> parts(2);
   parts[0].type = kJsonMimeType;
   parts[0].data = metadata_json;
   parts[1].type = content_type;
   if (!ReadFileToString(path, &parts[1].data))
     return false;
 
   google_apis::ContentTypeAndData output;
-  GenerateMultipartBody(
-      google_apis::MULTIPART_RELATED, predetermined_boundary, parts, &output);
+  GenerateMultipartBody(google_apis::MULTIPART_RELATED, predetermined_boundary,
+                        parts, &output, nullptr);
   upload_content_type->swap(output.type);
   upload_content_data->swap(output.data);
   return true;
 }
 
 }  // namespace
 
 namespace google_apis {
 
 scoped_ptr<base::Value> ParseJson(const std::string& json) {
@@ skipping 16 matching lines @@
     }
     LOG(WARNING) << "Error while parsing entry response: " << error_message
                  << ", code: " << error_code << ", json:\n" << trimmed_json;
   }
   return value.Pass();
 }
 
 void GenerateMultipartBody(MultipartType multipart_type,
                            const std::string& predetermined_boundary,
                            const std::vector<ContentTypeAndData>& parts,
-                           ContentTypeAndData* output) {
+                           ContentTypeAndData* output,
+                           std::vector<uint64>* data_offset) {
   std::string boundary;
   // Generate random boundary.
   if (predetermined_boundary.empty()) {
     while (true) {
       boundary.resize(kBoundarySize);
       for (int i = 0; i < kBoundarySize; ++i) {
         // Subtract 2 from the array size to exclude '\0', and to turn the size
         // into the last index.
         const int last_char_index = arraysize(kBoundaryCharacters) - 2;
         boundary[i] = kBoundaryCharacters[base::RandInt(0,  last_char_index)];
@@ skipping 15 matching lines @@
   switch (multipart_type) {
     case MULTIPART_RELATED:
       output->type = kMultipartRelatedMimeTypePrefix + boundary;
       break;
     case MULTIPART_MIXED:
       output->type = kMultipartMixedMimeTypePrefix + boundary;
       break;
   }
 
   output->data.clear();
+  if (data_offset)
+    data_offset->clear();
   for (auto& part : parts) {
     output->data.append(base::StringPrintf(
         kMultipartItemHeaderFormat, boundary.c_str(), part.type.c_str()));
+    if (data_offset)
+      data_offset->push_back(output->data.size());
     output->data.append(part.data);
     output->data.append("\n");
   }
   output->data.append(
       base::StringPrintf(kMultipartFooterFormat, boundary.c_str()));
 }
 
 //=========================== ResponseWriter ==================================
 ResponseWriter::ResponseWriter(base::SequencedTaskRunner* file_task_runner,
                                const base::FilePath& file_path,
@@ skipping 792 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