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/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 using content::BrowserThread;
 using net::URLFetcher;
 
+namespace google_apis {
+
 namespace {
 
 // etag matching header.
 const char kIfMatchAllHeader[] = "If-Match: *";
 const char kIfMatchHeaderPrefix[] = "If-Match: ";
 
 const char kUploadContentRange[] = "Content-Range: bytes ";
 
 const char kFeedField[] = "feed";
 
 // Returns If-Match header string for |etag|.
 // If |etag| is empty, the returned header should match any etag.
 std::string GenerateIfMatchHeader(const std::string& etag) {
   return etag.empty() ? kIfMatchAllHeader : (kIfMatchHeaderPrefix + etag);
 }
 
+// Parses the |value| to ResourceEntry with error handling.
+// This is designed to be used for ResumeUploadOperation and
+// GetUploadStatusOperation.
+scoped_ptr<ResourceEntry> ParseResourceEntry(scoped_ptr<base::Value> value) {
+  scoped_ptr<ResourceEntry> entry;
+  if (value.get()) {
+    entry = ResourceEntry::ExtractAndParse(*value);
+
+    // Note: |value| may be NULL, in particular if the callback is for a
+    // failure.
+    if (!entry.get())
+      LOG(WARNING) << "Invalid entry received on upload.";
+  }
+
+  return entry.Pass();
+}
+
 }  // namespace
 
-namespace google_apis {
-
 //============================ Structs ===========================
 
 UploadRangeResponse::UploadRangeResponse()
     : code(HTTP_SUCCESS),
       start_position_received(0),
       end_position_received(0) {
 }
 
 UploadRangeResponse::UploadRangeResponse(GDataErrorCode code,
                                          int64 start_position_received,
@@ skipping 546 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_);
 }
 
 void ResumeUploadOperation::OnRangeOperationComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
-  scoped_ptr<ResourceEntry> entry;
-  if (value.get()) {
-    entry = ResourceEntry::ExtractAndParse(*value);
+  callback_.Run(response, ParseResourceEntry(value.Pass()));
+}
 
-    // Note: |value| may be NULL, in particular if the callback is for a
-    // failure.
-    if (!entry.get())
-      LOG(WARNING) << "Invalid entry received on upload.";
-  }
+//========================== GetUploadStatusOperation ==========================
 
-  callback_.Run(response, entry.Pass());
+GetUploadStatusOperation::GetUploadStatusOperation(
+    OperationRegistry* registry,
+    net::URLRequestContextGetter* url_request_context_getter,
+    const UploadRangeCallback& callback,
+    UploadMode upload_mode,
+    const base::FilePath& drive_file_path,
+    const GURL& upload_url,
+    int64 content_length)
+  : UploadRangeOperationBase(registry,
+                             url_request_context_getter,
+                             upload_mode,
+                             drive_file_path,
+                             upload_url),
+    callback_(callback),
+    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;
+}
+
+void GetUploadStatusOperation::OnRangeOperationComplete(
+    const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
+  callback_.Run(response, ParseResourceEntry(value.Pass()));
 }
 
 }  // namespace google_apis