Fix chrome upload with content uri

webkit/browser/blob/blob_url_request_job.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 "webkit/browser/blob/blob_url_request_job.h"
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_status.h"
 #include "webkit/browser/blob/file_stream_reader.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
+#if defined(OS_ANDROID)
+#include "webkit/browser/blob/content_url_stream_reader_android.h"
+#endif
+
 namespace webkit_blob {
 
 namespace {
 
 bool IsFileType(BlobData::Item::Type type) {
   switch (type) {
     case BlobData::Item::TYPE_FILE:
     case BlobData::Item::TYPE_FILE_FILESYSTEM:
+#if defined(OS_ANDROID)
+    case BlobData::Item::TYPE_CONTENT_URL:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace
 
 BlobURLRequestJob::BlobURLRequestJob(
     net::URLRequest* request,
@@ skipping 508 matching lines @@
           item.offset() + additional_offset,
           item.expected_modification_time());
       break;
     case BlobData::Item::TYPE_FILE_FILESYSTEM:
       reader = file_system_context_->CreateFileStreamReader(
           fileapi::FileSystemURL(
               file_system_context_->CrackURL(item.filesystem_url())),
           item.offset() + additional_offset,
           item.expected_modification_time()).release();
       break;
+#if defined(OS_ANDROID)
+    case BlobData::Item::TYPE_CONTENT_URL:
+      reader = FileStreamReader::CreateForContentUrl(
+          file_thread_proxy_.get(),
+          item.content_url(),
+          item.offset() + additional_offset);
+      break;
+#endif
     default:
       NOTREACHED();
   }
   DCHECK(reader);
   index_to_reader_[index] = reader;
 }
 
 }  // namespace webkit_blob