Revert 235752 "Fix chrome upload with content uri"

trunk/src/net/base/file_stream_unittest.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.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
-#if defined(OS_ANDROID)
-#include "base/test/test_file_util.h"
-#endif
-
 namespace net {
 
 namespace {
 
 const char kTestData[] = "0123456789";
 const int kTestDataSize = arraysize(kTestData) - 1;
 
 // Creates an IOBufferWithSize that contains the kTestDataSize.
 IOBufferWithSize* CreateTestDataBuffer() {
   IOBufferWithSize* buf = new IOBufferWithSize(kTestDataSize);
@@ skipping 1132 matching lines @@
   scoped_refptr<IOBuffer> buf = new IOBuffer(1);
   TestCompletionCallback callback;
   int rv = stream->Read(buf.get(), 1, callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(rv, 0);
 
   base::ClosePlatformFile(file);
 }
 
-#if defined(OS_ANDROID)
-TEST_F(FileStreamTest, ContentUriAsyncRead) {
-  base::FilePath test_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
-  test_dir = test_dir.AppendASCII("net");
-  test_dir = test_dir.AppendASCII("data");
-  test_dir = test_dir.AppendASCII("file_stream_unittest");
-  ASSERT_TRUE(base::PathExists(test_dir));
-  base::FilePath image_file = test_dir.Append(FILE_PATH_LITERAL("red.png"));
-
-  // Insert the image into MediaStore. MediaStore will do some conversions, and
-  // return the content URI.
-  base::FilePath path = file_util::InsertImageIntoMediaStore(image_file);
-  EXPECT_TRUE(path.IsContentUri());
-  EXPECT_TRUE(base::PathExists(path));
-  int64 file_size;
-  EXPECT_TRUE(file_util::GetFileSize(path, &file_size));
-  EXPECT_LT(0, file_size);
-
-  FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
-  TestCompletionCallback callback;
-  int rv = stream.Open(path, flags, callback.callback());
-  EXPECT_EQ(ERR_IO_PENDING, rv);
-  EXPECT_EQ(OK, callback.WaitForResult());
-
-  int64 total_bytes_avail = stream.Available();
-  EXPECT_EQ(file_size, total_bytes_avail);
-
-  int total_bytes_read = 0;
-
-  std::string data_read;
-  for (;;) {
-    scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-    rv = stream.Read(buf.get(), buf->size(), callback.callback());
-    if (rv == ERR_IO_PENDING)
-      rv = callback.WaitForResult();
-    EXPECT_LE(0, rv);
-    if (rv <= 0)
-      break;
-    total_bytes_read += rv;
-    data_read.append(buf->data(), rv);
-  }
-  EXPECT_EQ(file_size, total_bytes_read);
-}
-#endif
-
 }  // namespace
 
 }  // namespace net