Fix chrome upload with content uri

webkit/browser/blob/blob_storage_context.cc

Index: webkit/browser/blob/blob_storage_context.cc
diff --git a/webkit/browser/blob/blob_storage_context.cc b/webkit/browser/blob/blob_storage_context.cc
index f62a26dbe545aed3ab1bd27c1d6a83096670cd7e..eb8c2710982a713288f5d8d1172e5ffcba17c2b0 100644
--- a/webkit/browser/blob/blob_storage_context.cc
+++ b/webkit/browser/blob/blob_storage_context.cc
@@ -174,6 +174,15 @@ void BlobStorageContext::AppendBlobDataItem(
                                               item.length());
       break;
     }
+#if defined(OS_ANDROID)
+    case BlobData::Item::TYPE_CONTENT_URL:
+      AppendContentUrlItem(target_blob_data,
+                           item.content_url(),
+                           item.offset(),
+                           item.length(),
+                           item.expected_modification_time());
+      break;
+#endif
     default:
       NOTREACHED();
       break;
@@ -258,6 +267,14 @@ bool BlobStorageContext::ExpandStorageItems(
                      iter->offset() + offset,
                      new_length,
                      iter->expected_modification_time());
+#if defined(OS_ANDROID)
+    } else if (iter->type() == BlobData::Item::TYPE_CONTENT_URL) {
+      AppendContentUrlItem(target_blob_data,
+                           iter->content_url(),
+                           iter->offset() + offset,
+                           new_length,
+                           iter->expected_modification_time());
+#endif
     } else {
       DCHECK(iter->type() == BlobData::Item::TYPE_FILE_FILESYSTEM);
       AppendFileSystemFileItem(target_blob_data,
@@ -307,6 +324,16 @@ void BlobStorageContext::AppendFileSystemFileItem(
                                          expected_modification_time);
 }
 
+#if defined(OS_ANDROID)
+void BlobStorageContext::AppendContentUrlItem(
+    BlobData* target_blob_data,
+    const GURL& content_url, uint64 offset, uint64 length,
+    const base::Time& expected_modification_time) {
+  target_blob_data->AppendContentUrlFile(content_url, offset, length,
+                                         expected_modification_time);
+}
+#endif
+
 bool BlobStorageContext::IsInUse(const std::string& uuid) {
   return blob_map_.find(uuid) != blob_map_.end();
 }