Fix chrome upload with content uri

webkit/common/data_element.h

 // 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.
 
 #ifndef WEBKIT_COMMON_DATA_ELEMENT_H_
 #define WEBKIT_COMMON_DATA_ELEMENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "url/gurl.h"
 #include "webkit/common/webkit_common_export.h"
 
 namespace webkit_common {
 
 // Represents a base Web data element. This could be either one of
 // bytes, file or blob data.
 class WEBKIT_COMMON_EXPORT DataElement {
  public:
   enum Type {
     TYPE_UNKNOWN = -1,
     TYPE_BYTES,
     TYPE_FILE,
     TYPE_BLOB,
     TYPE_FILE_FILESYSTEM,
+#if defined(OS_ANDROID)
+    TYPE_CONTENT_URL,
+#endif
   };
 
   DataElement();
   ~DataElement();
 
   Type type() const { return type_; }
   const char* bytes() const { return bytes_ ? bytes_ : &buf_[0]; }
   const base::FilePath& path() const { return path_; }
   const GURL& filesystem_url() const { return filesystem_url_; }
+#if defined(OS_ANDROID)
+  const GURL& content_url() const { return content_url_; }
+#endif
   const std::string& blob_uuid() const { return blob_uuid_; }
   uint64 offset() const { return offset_; }
   uint64 length() const { return length_; }
   const base::Time& expected_modification_time() const {
     return expected_modification_time_;
   }
 
   // Sets TYPE_BYTES data. This copies the given data into the element.
   void SetToBytes(const char* bytes, int bytes_len) {
     type_ = TYPE_BYTES;
@@ skipping 26 matching lines @@
 
   // Sets TYPE_BLOB data with range.
   void SetToBlobRange(const std::string& blob_uuid,
                       uint64 offset, uint64 length);
 
   // Sets TYPE_FILE_FILESYSTEM with range.
   void SetToFileSystemUrlRange(const GURL& filesystem_url,
                                uint64 offset, uint64 length,
                                const base::Time& expected_modification_time);
 
+#if defined(OS_ANDROID)
+  // Sets TYPE_CONTENT_URL with range.
+  void SetToContentUrlRange(const GURL& content_url,
+                            uint64 offset, uint64 length,
+                            const base::Time& expected_modification_time);
+#endif
+
  private:
   Type type_;
   std::vector<char> buf_;  // For TYPE_BYTES.
   const char* bytes_;  // For TYPE_BYTES.
   base::FilePath path_;  // For TYPE_FILE.
   GURL filesystem_url_;  // For TYPE_FILE_FILESYSTEM.
+#if defined(OS_ANDROID)
+  GURL content_url_;  // For TYPE_CONTENT_URL.
+#endif
   std::string blob_uuid_;
   uint64 offset_;
   uint64 length_;
   base::Time expected_modification_time_;
 };
 
 #if defined(UNIT_TEST)
 inline bool operator==(const DataElement& a, const DataElement& b) {
   if (a.type() != b.type() ||
       a.offset() != b.offset() ||
       a.length() != b.length())
     return false;
   switch (a.type()) {
     case DataElement::TYPE_BYTES:
       return memcmp(a.bytes(), b.bytes(), b.length()) == 0;
     case DataElement::TYPE_FILE:
       return a.path() == b.path() &&
              a.expected_modification_time() == b.expected_modification_time();
     case DataElement::TYPE_BLOB:
       return a.blob_uuid() == b.blob_uuid();
     case DataElement::TYPE_FILE_FILESYSTEM:
       return a.filesystem_url() == b.filesystem_url();
+#if defined(OS_ANDROID)
+    case DataElement::TYPE_CONTENT_URL:
+      return a.content_url() == b.content_url();
+#endif
     case DataElement::TYPE_UNKNOWN:
       NOTREACHED();
       return false;
   }
   return false;
 }
 
 inline bool operator!=(const DataElement& a, const DataElement& b) {
   return !(a == b);
 }
 #endif  // defined(UNIT_TEST)
 
 }  // namespace webkit_common
 
 #endif  // WEBKIT_COMMON_DATA_ELEMENT_H_