Fix chrome upload with content uri

net/base/file_stream_context.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 "net/base/file_stream_context.h"
 
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream_net_log_parameters.h"
 #include "net/base/net_errors.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/content_uri_utils.h"
+#endif
+
 namespace {
 
 void CallInt64ToInt(const net::CompletionCallback& callback, int64 result) {
   callback.Run(static_cast<int>(result));
 }
 
 }
 
 namespace net {
 
@@ skipping 33 matching lines @@
   if (!async_in_progress_) {
     CloseAndDelete();
   } else if (file_ != base::kInvalidPlatformFileValue) {
     CancelIo(file_);
   }
 }
 
 void FileStream::Context::OpenAsync(const base::FilePath& path,
                                     int open_flags,
                                     const CompletionCallback& callback) {
+#if defined(OS_ANDROID)
+  if (path.IsContentUrl()) {
+    OpenContentUrlAsync(path, open_flags, callback);
+    return;
+  }
+#endif

[mmenke, 2013/11/05 02:33:19]

Can't you just move all content URL code  down into OpenFileImpl?

[qinmin, 2013/11/05 03:38:41]

Done.

   DCHECK(!async_in_progress_);
 
   BeginOpenEvent(path);
 
   const bool posted = base::PostTaskAndReplyWithResult(
       task_runner_.get(),
       FROM_HERE,
       base::Bind(
           &Context::OpenFileImpl, base::Unretained(this), path, open_flags),
       base::Bind(&Context::OnOpenCompleted, base::Unretained(this), callback));
   DCHECK(posted);
 
   async_in_progress_ = true;
 }
 
 int FileStream::Context::OpenSync(const base::FilePath& path, int open_flags) {
+#if defined(OS_ANDROID)
+  if (path.IsContentUrl())
+    return OpenContentUrlSync(path, open_flags);
+#endif
   DCHECK(!async_in_progress_);
 
   BeginOpenEvent(path);
   OpenResult result = OpenFileImpl(path, open_flags);
   file_ = result.file;
   if (file_ == base::kInvalidPlatformFileValue) {
     ProcessOpenError(result.error_code);
   } else {
     // TODO(satorux): Remove this once all async clients are migrated to use
     // Open(). crbug.com/114783
@@ skipping 166 matching lines @@
   // Reset this before Run() as Run() may issue a new async operation. Also it
   // should be reset before CloseAsync() because it shouldn't run if any async
   // operation is in progress.
   async_in_progress_ = false;
   if (orphaned_)
     CloseAndDelete();
   else
     callback.Run(result);
 }
 
+#if defined(OS_ANDROID)
+void FileStream::Context::OpenContentUrlAsync(
+    const base::FilePath& path,
+    int open_flags,
+    const CompletionCallback& callback) {
+  DCHECK(!async_in_progress_);
+  const bool posted = base::PostTaskAndReplyWithResult(
+      task_runner_.get(),
+      FROM_HERE,
+      base::Bind(&Context::OpenContentUrlImpl, base::Unretained(this),
+                 path, open_flags),
+      base::Bind(&Context::OnOpenCompleted, base::Unretained(this), callback));
+  DCHECK(posted);
+
+  async_in_progress_ = true;
+}
+
+int FileStream::Context::OpenContentUrlSync(
+    const base::FilePath& path, int open_flags) {
+  DCHECK(!async_in_progress_);
+
+  OpenResult result = OpenContentUrlImpl(path, open_flags);
+  file_ = result.file;
+  if (file_ == base::kInvalidPlatformFileValue) {
+    ProcessOpenError(result.error_code);
+  } else {
+    if (open_flags & base::PLATFORM_FILE_ASYNC)
+      OnAsyncFileOpened();
+  }
+  return result.error_code.result;
+}
+
+FileStream::Context::OpenResult FileStream::Context::OpenContentUrlImpl(
+    const base::FilePath& path, int open_flags) {
+  // Check that only Read flags are set.
+  DCHECK_EQ(open_flags & ~base::PLATFORM_FILE_ASYNC,
+            base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ);
+  base::PlatformFile file = base::OpenContentUrlForRead(path);
+  if (file == base::kInvalidPlatformFileValue)
+    return OpenResult(file, IOResult::FromOSError(GetLastErrno()));
+
+  return OpenResult(file, IOResult(OK, 0));
+}
+#endif
+
 }  // namespace net