Fix chrome upload with content uri

net/base/upload_file_element_reader.cc

Index: net/base/upload_file_element_reader.cc
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index d1f2a12ac8cd13c6d5037032f13cdd98baf2ea03..6f7778c4a593b8e1219f9c1ef031d21d67089392 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -12,6 +12,10 @@
 #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 net {
 
 namespace {
@@ -45,6 +49,14 @@ int InitInternal(const base::FilePath& path,
     }
   }
 
+#if defined(OS_ANDROID)
+  int64 length = std::max(0ll, GetContentUrlLengthSync(path));

[kinuko, 2013/10/31 06:10:51]

Can this part be factored out as a separate static method (e.g.
GetLengthFromPath(path, &length)) so that we don't need to have #if..else..endif
in the main code flow?

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

+1

Maybe even, bundling this logic into file_util::GetFileSize() would mean no
special content:// logic here at all. 


Was a design goal of this patch explicitly not to add generic content:// support
in file_util? else I could easily imagine having a generic
file_util::OpenFileDescriptor(FilePath) method and the content_uri_utils call
would just happen inside that if appropriate.

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

Done. GetFileInfo() should work for content url now. GetFileSize() calls
GetFileInfo(), so it will work too.
On 2013/10/31 06:42:39, joth wrote:

+  if (file_stream.get() && length > 0 &&
+      range_offset < static_cast<uint64>(length)) {

[mmenke, 2013/10/31 15:07:06]

This class is being modified to handle errors differently, see
https://codereview.chromium.org/39203004/diff/670001/net/base/upload_file_ele....
 If we keep the split logic here, whichever lands second will have to make this
return an error on the fail-to-get-length case.

I'm a fan of joth's idea to mover the logic into file_util, if we can, though.

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

Done.

+    // Compensate for the offset.
+    length = std::min(length - range_offset, range_length);
+  }
+#else
   int64 length = 0;
   if (file_stream.get() &&
       file_util::GetFileSize(path, &length) &&
@@ -52,6 +64,7 @@ int InitInternal(const base::FilePath& path,
     // Compensate for the offset.
     length = std::min(length - range_offset, range_length);
   }
+#endif
   *out_content_length = length;
   out_file_stream->reset(file_stream.release());