Implement GetUploadStatusOperation on GData WAPI.

chrome/browser/google_apis/gdata_wapi_operations.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/gdata_wapi_operations.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
@@ skipping 616 matching lines @@
   return URLFetcher::PUT;
 }
 
 void UploadRangeOperationBase::ProcessURLFetchResults(
     const URLFetcher* source) {
   GDataErrorCode code = GetErrorCode(source);
   net::HttpResponseHeaders* hdrs = source->GetResponseHeaders();
 
   if (code == HTTP_RESUME_INCOMPLETE) {
     // Retrieve value of the first "Range" header.
-    int64 start_position_received = -1;
-    int64 end_position_received = -1;
+    // The Range header is appeared only if there is at least one received
+    // byte. So, initialize the positions by 0 so that the [0,0) will be
+    // returned via the |callback_| for empty data case.
+    int64 start_position_received = 0;
+    int64 end_position_received = 0;
     std::string range_received;
     hdrs->EnumerateHeader(NULL, kUploadResponseRange, &range_received);
     if (!range_received.empty()) {  // Parse the range header.
       std::vector<net::HttpByteRange> ranges;
       if (net::HttpUtil::ParseRangeHeader(range_received, &ranges) &&
           !ranges.empty() ) {
         // We only care about the first start-end pair in the range.
         //
         // Range header represents the range inclusively, while we are treating
         // ranges exclusively (i.e., end_position_received should be one passed
         // the last valid index). So "+ 1" is added.
         start_position_received = ranges[0].first_byte_position();
         end_position_received = ranges[0].last_byte_position() + 1;
       }
     }
+    // The Range header has the received data range, so the start position
+    // should be always 0.
+    DCHECK_EQ(start_position_received, 0);
     DVLOG(1) << "Got response for [" << drive_file_path_.value()
              << "]: code=" << code
              << ", range_hdr=[" << range_received
              << "], range_parsed=" << start_position_received
              << "," << end_position_received;
 
     callback_.Run(UploadRangeResponse(code,
                                       start_position_received,
                                       end_position_received),
                   scoped_ptr<ResourceEntry>());
@@ skipping 80 matching lines @@
     // For uploading an empty document, just PUT an empty content.
     DCHECK_EQ(start_position_, 0);
     DCHECK_EQ(end_position_, 0);
     return std::vector<std::string>();
   }
 
   // The header looks like
   // Content-Range: bytes <start_position>-<end_position>/<content_length>
   // for example:
   // Content-Range: bytes 7864320-8388607/13851821
-  // Use * for unknown/streaming content length.
   // The header takes inclusive range, so we adjust by "end_position - 1".
   DCHECK_GE(start_position_, 0);
   DCHECK_GT(end_position_, 0);
-  DCHECK_GE(content_length_, -1);
+  DCHECK_GE(content_length_, 0);
 
   std::vector<std::string> headers;
   headers.push_back(
       std::string(kUploadContentRange) +
       base::Int64ToString(start_position_) + "-" +
       base::Int64ToString(end_position_ - 1) + "/" +
-      (content_length_ == -1 ? "*" :
-          base::Int64ToString(content_length_)));
+      base::Int64ToString(content_length_));
   return headers;
 }
 
 bool ResumeUploadOperation::GetContentData(std::string* upload_content_type,
                                            std::string* upload_content) {
   *upload_content_type = content_type_;
   *upload_content = std::string(buf_->data(), end_position_ - start_position_);
   return true;
 }
 
 void ResumeUploadOperation::OnURLFetchUploadProgress(
     const URLFetcher* source, int64 current, int64 total) {
   // Adjust the progress values according to the range currently uploaded.
   NotifyProgress(start_position_ + current, content_length_);
 }
 
+//========================== GetUploadStatusOperation ==========================
+
+GetUploadStatusOperation::GetUploadStatusOperation(
+    OperationRegistry* registry,
+    net::URLRequestContextGetter* url_request_context_getter,
+    const UploadRangeCallback& callback,
+    UploadMode upload_mode,
+    const FilePath& drive_file_path,
+    const GURL& upload_url,
+    int64 content_length)
+  : UploadRangeOperationBase(registry,
+                             url_request_context_getter,
+                             callback,
+                             upload_mode,
+                             drive_file_path,
+                             upload_url),
+    content_length_(content_length) {}
+
+GetUploadStatusOperation::~GetUploadStatusOperation() {}
+
+std::vector<std::string>
+GetUploadStatusOperation::GetExtraRequestHeaders() const {
+  // The header looks like
+  // Content-Range: bytes */<content_length>
+  // for example:
+  // Content-Range: bytes */13851821
+  DCHECK_GE(content_length_, 0);
+
+  std::vector<std::string> headers;
+  headers.push_back(
+      std::string(kUploadContentRange) + "*/" +
+      base::Int64ToString(content_length_));
+  return headers;
+}
+
 }  // namespace google_apis