Fix chrome upload with content uri

content/browser/loader/upload_data_stream_builder.cc

 // Copyright 2013 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 "content/browser/loader/upload_data_stream_builder.h"
 
 #include "base/logging.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "webkit/browser/blob/blob_data_handle.h"
 #include "webkit/browser/blob/blob_storage_context.h"
 #include "webkit/browser/fileapi/upload_file_system_file_element_reader.h"
 #include "webkit/common/resource_request_body.h"
 
+#if defined(OS_ANDROID)
+#include "net/base/upload_content_url_element_reader_android.h"
+#endif
+
 using webkit_blob::BlobData;
 using webkit_blob::BlobDataHandle;
 using webkit_blob::BlobStorageContext;
 using webkit_glue::ResourceRequestBody;
 
 namespace content {
 namespace {
 
 // A subclass of net::UploadBytesElementReader which owns ResourceRequestBody.
 class BytesElementReader : public net::UploadBytesElementReader {
@@ skipping 31 matching lines @@
   }
 
   virtual ~FileElementReader() {}
 
  private:
   scoped_refptr<ResourceRequestBody> resource_request_body_;
 
   DISALLOW_COPY_AND_ASSIGN(FileElementReader);
 };
 
+#if defined(OS_ANDROID)
+// A subclass of net::UploadContentUrlElementReader which owns
+// ResourceRequestBody.
+class ContentUrlFileElementReader : public net::UploadContentUrlElementReader {
+ public:
+  ContentUrlFileElementReader(ResourceRequestBody* resource_request_body,
+                              base::TaskRunner* task_runner,
+                              const ResourceRequestBody::Element& element)
+      : net::UploadContentUrlElementReader(
+          task_runner,

[kinuko, 2013/10/29 02:52:31]

nit: usually we indent not from ':' but from where class name / var name starts
in the previous line

SubClass(foo, bar)
    : BaseClass(
          foo,
          bar)

[qinmin, 2013/10/29 19:14:21]

Done.

+          element.content_url(),
+          element.offset(),
+          element.length(),
+          element.expected_modification_time()),
+          resource_request_body_(resource_request_body) {
+    DCHECK_EQ(ResourceRequestBody::Element::TYPE_CONTENT_URL, element.type());
+  }
+
+  virtual ~ContentUrlFileElementReader() {}
+
+ private:
+  scoped_refptr<ResourceRequestBody> resource_request_body_;
+
+  DISALLOW_COPY_AND_ASSIGN(ContentUrlFileElementReader);
+};
+#endif
+
 void ResolveBlobReference(
     ResourceRequestBody* body,
     webkit_blob::BlobStorageContext* blob_context,
     const ResourceRequestBody::Element& element,
     std::vector<const ResourceRequestBody::Element*>* resolved_elements) {
   DCHECK(blob_context);
   scoped_ptr<webkit_blob::BlobDataHandle> handle =
       blob_context->GetBlobDataFromUUID(element.blob_uuid());
   DCHECK(handle);
   if (!handle)
@@ skipping 46 matching lines @@
         break;
       case ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM:
         element_readers.push_back(
             new fileapi::UploadFileSystemFileElementReader(
                 file_system_context,
                 element.filesystem_url(),
                 element.offset(),
                 element.length(),
                 element.expected_modification_time()));
         break;
+#if defined(OS_ANDROID)
+      case ResourceRequestBody::Element::TYPE_CONTENT_URL:
+        element_readers.push_back(
+            new ContentUrlFileElementReader(body, file_task_runner, element));
+        break;
+#endif
       case ResourceRequestBody::Element::TYPE_BLOB:
         // Blob elements should be resolved beforehand.
         NOTREACHED();
         break;
       case ResourceRequestBody::Element::TYPE_UNKNOWN:
         NOTREACHED();
         break;
     }
   }
 
   return make_scoped_ptr(
       new net::UploadDataStream(element_readers.Pass(), body->identifier()));
 }
 
 }  // namespace content