Revert 235752 "Fix chrome upload with content uri"

trunk/src/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 162 matching lines @@
 }
 
 void FileStream::Context::BeginOpenEvent(const base::FilePath& path) {
   std::string file_name = path.AsUTF8Unsafe();
   bound_net_log_.BeginEvent(NetLog::TYPE_FILE_STREAM_OPEN,
                             NetLog::StringCallback("file_name", &file_name));
 }
 
 FileStream::Context::OpenResult FileStream::Context::OpenFileImpl(
     const base::FilePath& path, int open_flags) {
-  base::PlatformFile file;
-#if defined(OS_ANDROID)
-  if (path.IsContentUri()) {
-    // Check that only Read flags are set.
-    DCHECK_EQ(open_flags & ~base::PLATFORM_FILE_ASYNC,
-              base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ);
-    file = base::OpenContentUriForRead(path);
-  } else {
-#endif  // defined(OS_ANDROID)
-    // FileStream::Context actually closes the file asynchronously,
-    // independently from FileStream's destructor. It can cause problems for
-    // users wanting to delete the file right after FileStream deletion. Thus
-    // we are always adding SHARE_DELETE flag to accommodate such use case.
-    open_flags |= base::PLATFORM_FILE_SHARE_DELETE;
-    file = base::CreatePlatformFile(path, open_flags, NULL, NULL);
-#if defined(OS_ANDROID)
-  }
-#endif  // defined(OS_ANDROID)
+  // FileStream::Context actually closes the file asynchronously, independently
+  // from FileStream's destructor. It can cause problems for users wanting to
+  // delete the file right after FileStream deletion. Thus we are always
+  // adding SHARE_DELETE flag to accommodate such use case.
+  open_flags |= base::PLATFORM_FILE_SHARE_DELETE;
+  base::PlatformFile file =
+      base::CreatePlatformFile(path, open_flags, NULL, NULL);
   if (file == base::kInvalidPlatformFileValue)
     return OpenResult(file, IOResult::FromOSError(GetLastErrno()));
 
   return OpenResult(file, IOResult(OK, 0));
 }
 
 void FileStream::Context::ProcessOpenError(const IOResult& error_code) {
   bound_net_log_.EndEvent(NetLog::TYPE_FILE_STREAM_OPEN);
   RecordError(error_code, FILE_ERROR_SOURCE_OPEN);
 }
@@ skipping 48 matching lines @@
   // operation is in progress.
   async_in_progress_ = false;
   if (orphaned_)
     CloseAndDelete();
   else
     callback.Run(result);
 }
 
 }  // namespace net