Fix chrome upload with content uri

base/file_util_posix.cc

Index: base/file_util_posix.cc
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 296950bebd8bd69d06ee978bcb5a56971643e971..ea9905cf3d354e95d011764398b302cf0648b5dd 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -48,6 +48,7 @@
 #include "base/time/time.h"
 
 #if defined(OS_ANDROID)
+#include "base/android/content_uri_utils.h"
 #include "base/os_compat_android.h"
 #endif
 
@@ -79,6 +80,12 @@ static int CallLstat(const char *path, stat_wrapper_t *sb) {
   ThreadRestrictions::AssertIOAllowed();
   return lstat64(path, sb);
 }
+#if defined(OS_ANDROID)
+static int CallFstat(int fd, stat_wrapper_t *sb) {
+  ThreadRestrictions::AssertIOAllowed();
+  return fstat64(fd, sb);
+}
+#endif
 #endif
 
 // Helper for NormalizeFilePath(), defined below.
@@ -308,6 +315,11 @@ bool CopyDirectory(const FilePath& from_path,
 
 bool PathExists(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
+#if defined(OS_ANDROID)
+  if (path.IsContentUrl()) {
+    return ContentUrlExists(path);
+  }

[kinuko, 2013/11/06 01:42:05]

nit: usually we use no { } for single-line block in chromium

[qinmin, 2013/11/07 01:13:35]

Done.

+#endif
   return access(path.value().c_str(), F_OK) == 0;
 }
 
@@ -569,8 +581,21 @@ bool IsLink(const FilePath& file_path) {
 
 bool GetFileInfo(const FilePath& file_path, base::PlatformFileInfo* results) {
   stat_wrapper_t file_info;
+#if defined(OS_ANDROID)
+  if (file_path.IsContentUrl()) {
+    int fd = OpenContentUrlForRead(file_path);
+    if (fd < 0)
+      return false;
+    ScopedFD scoped_fd(&fd);
+    if (base::CallFstat(fd, &file_info) != 0)
+      return false;
+  } else {
+#endif
   if (CallStat(file_path.value().c_str(), &file_info) != 0)

[joth, 2013/11/06 00:27:08]

It looks like CallStat() is already intended to have different implementation
per-platform up top of file.
Can't we push the ifdef logic into that?

[qinmin, 2013/11/07 01:13:35]

I think I would rather keep it separate. CallStat() will set errno, so we have
to do the same when fd < 0 and it looks ugly. If other platforms later decided
to add Fstat(), they can just reuse the FStat() function we added. Having
something like file_path.IsContentUrl() inside CallStat() makes it not reusable.

On 2013/11/06 00:27:08, joth wrote:

     return false;
+#if defined(OS_ANDROID)
+  }
+#endif
   results->is_directory = S_ISDIR(file_info.st_mode);
   results->size = file_info.st_size;
 #if defined(OS_MACOSX)