Fix chrome upload with content uri

webkit/browser/blob/local_file_stream_reader.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/local_file_stream_reader.h"
 
 #include "base/file_util.h"
 #include "base/files/file_util_proxy.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/task_runner.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
+#if defined(OS_ANDROID)
+#include "net/android/content_uri_utils.h"
+#endif
+
 namespace webkit_blob {
 
 namespace {
 
 const int kOpenFlagsForRead = base::PLATFORM_FILE_OPEN |
                               base::PLATFORM_FILE_READ |
                               base::PLATFORM_FILE_ASYNC;
 
 // Verify if the underlying file has not been modified.
 bool VerifySnapshotTime(const base::Time& expected_modification_time,
@@ skipping 22 matching lines @@
   DCHECK(!has_pending_open_);
   if (stream_impl_)
     return stream_impl_->Read(buf, buf_len, callback);
   return Open(base::Bind(&LocalFileStreamReader::DidOpenForRead,
                          weak_factory_.GetWeakPtr(),
                          make_scoped_refptr(buf), buf_len, callback));
 }
 
 int64 LocalFileStreamReader::GetLength(
     const net::Int64CompletionCallback& callback) {
+#if defined(OS_ANDROID)
+  if (file_path_.IsContentUrl()) {
+    net::GetContentUrlLength(
+        task_runner_.get(),
+        file_path_,
+        base::Bind(&LocalFileStreamReader::DidGetContentUrlLength,
+                   weak_factory_.GetWeakPtr(),
+                   callback));
+    return net::ERR_IO_PENDING;
+  }
+#endif

[joth, 2013/10/31 06:42:39]

...again if file_util::GetFileInfo() knew how to deal with content:// path then
this edit would not be needed at all

[qinmin, 2013/11/05 01:41:31]

Done.

   const bool posted = base::FileUtilProxy::GetFileInfo(
       task_runner_.get(),
       file_path_,
       base::Bind(&LocalFileStreamReader::DidGetFileInfoForGetLength,
                  weak_factory_.GetWeakPtr(),
                  callback));
   DCHECK(posted);
   return net::ERR_IO_PENDING;
 }
 
@@ skipping 99 matching lines @@
     callback.Run(net::PlatformFileErrorToNetError(error));
     return;
   }
   if (!VerifySnapshotTime(expected_modification_time_, file_info)) {
     callback.Run(net::ERR_UPLOAD_FILE_CHANGED);
     return;
   }
   callback.Run(file_info.size);
 }
 
+#if defined(OS_ANDROID)
+void LocalFileStreamReader::DidGetContentUrlLength(
+    const net::Int64CompletionCallback& callback,
+    int64 result) {
+  if (result < 0) {
+    callback.Run(net::ERR_FILE_NOT_FOUND);
+    return;
+  }
+  callback.Run(result);
+}
+#endif
+
 }  // namespace webkit_blob