net: Update FileStream to use base::File instead of PlatformFile.

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/files/file.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"
 
@@ skipping 35 matching lines @@
   }
 
   const base::FilePath temp_file_path() const { return temp_file_path_; }
 
  private:
   base::FilePath temp_file_path_;
 };
 
 namespace {
 
-TEST_F(FileStreamTest, BasicOpenClose) {
-  base::PlatformFile file = base::kInvalidPlatformFileValue;
-  {
-    FileStream stream(NULL, base::MessageLoopProxy::current());
-    int rv = stream.OpenSync(temp_file_path(),
-        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ);
-    EXPECT_EQ(OK, rv);
-    EXPECT_TRUE(stream.IsOpen());
-    file = stream.GetPlatformFileForTesting();
-  }
-  EXPECT_NE(base::kInvalidPlatformFileValue, file);
-  base::PlatformFileInfo info;
-  // The file should be closed.
-  EXPECT_FALSE(base::GetPlatformFileInfo(file, &info));
-}
-
 TEST_F(FileStreamTest, BasicOpenExplicitClose) {
-  base::PlatformFile file = base::kInvalidPlatformFileValue;
   FileStream stream(NULL);
   int rv = stream.OpenSync(temp_file_path(),
-      base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ);
+                           base::File::FLAG_OPEN | base::File::FLAG_READ);
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(stream.IsOpen());
-  file = stream.GetPlatformFileForTesting();
-  EXPECT_NE(base::kInvalidPlatformFileValue, file);
+  EXPECT_TRUE(stream.GetFileForTesting().IsValid());
   EXPECT_EQ(OK, stream.CloseSync());
   EXPECT_FALSE(stream.IsOpen());
-  base::PlatformFileInfo info;
-  // The file should be closed.
-  EXPECT_FALSE(base::GetPlatformFileInfo(file, &info));
+  EXPECT_FALSE(stream.GetFileForTesting().IsValid());
 }
 
 TEST_F(FileStreamTest, AsyncOpenExplicitClose) {
-  base::PlatformFile file = base::kInvalidPlatformFileValue;
   TestCompletionCallback callback;
   FileStream stream(NULL);
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN |
+              base::File::FLAG_READ |
+              base::File::FLAG_ASYNC;
   int rv = stream.Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_TRUE(stream.IsOpen());
-  file = stream.GetPlatformFileForTesting();
+  EXPECT_TRUE(stream.GetFileForTesting().IsValid());
   EXPECT_EQ(ERR_IO_PENDING, stream.Close(callback.callback()));
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_FALSE(stream.IsOpen());
-  base::PlatformFileInfo info;
-  // The file should be closed.
-  EXPECT_FALSE(base::GetPlatformFileInfo(file, &info));
+  EXPECT_FALSE(stream.GetFileForTesting().IsValid());
 }
 
 TEST_F(FileStreamTest, AsyncOpenExplicitCloseOrphaned) {
-  base::PlatformFile file = base::kInvalidPlatformFileValue;
   TestCompletionCallback callback;
-  base::PlatformFileInfo info;
   scoped_ptr<FileStream> stream(new FileStream(
       NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_ASYNC;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_TRUE(stream->IsOpen());
-  file = stream->GetPlatformFileForTesting();
+  EXPECT_TRUE(stream->GetFileForTesting().IsValid());
   EXPECT_EQ(ERR_IO_PENDING, stream->Close(callback.callback()));
   stream.reset();
   // File isn't actually closed yet.
-  EXPECT_TRUE(base::GetPlatformFileInfo(file, &info));
   base::RunLoop runloop;
   runloop.RunUntilIdle();
   // The file should now be closed, though the callback has not been called.
-  EXPECT_FALSE(base::GetPlatformFileInfo(file, &info));
-}
-
-TEST_F(FileStreamTest, FileHandleNotLeftOpen) {
-  bool created = false;
-  ASSERT_EQ(kTestDataSize,
-      base::WriteFile(temp_file_path(), kTestData, kTestDataSize));
-  int flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_READ;
-  base::PlatformFile file = base::CreatePlatformFile(
-      temp_file_path(), flags, &created, NULL);
-
-  {
-    // Seek to the beginning of the file and read.
-    FileStream read_stream(file, flags, NULL,
-                           base::MessageLoopProxy::current());
-    EXPECT_TRUE(read_stream.IsOpen());
-  }
-
-  EXPECT_NE(base::kInvalidPlatformFileValue, file);
-  base::PlatformFileInfo info;
-  // The file should be closed.
-  EXPECT_FALSE(base::GetPlatformFileInfo(file, &info));
 }
 
 // Test the use of FileStream with a file handle provided at construction.
 TEST_F(FileStreamTest, UseFileHandle) {
-  bool created = false;
-
   // 1. Test reading with a file handle.
   ASSERT_EQ(kTestDataSize,
-      base::WriteFile(temp_file_path(), kTestData, kTestDataSize));
-  int flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_READ;
-  base::PlatformFile file = base::CreatePlatformFile(
-      temp_file_path(), flags, &created, NULL);
+            base::WriteFile(temp_file_path(), kTestData, kTestDataSize));
+  int flags = base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_READ;
+  base::File file(temp_file_path(), flags);
 
   // Seek to the beginning of the file and read.
   scoped_ptr<FileStream> read_stream(
-      new FileStream(file, flags, NULL, base::MessageLoopProxy::current()));
+      new FileStream(file.Pass(), NULL, base::MessageLoopProxy::current()));
   ASSERT_EQ(0, read_stream->SeekSync(FROM_BEGIN, 0));
   ASSERT_EQ(kTestDataSize, read_stream->Available());
   // Read into buffer and compare.
   char buffer[kTestDataSize];
   ASSERT_EQ(kTestDataSize,
             read_stream->ReadSync(buffer, kTestDataSize));
   ASSERT_EQ(0, memcmp(kTestData, buffer, kTestDataSize));
   read_stream.reset();
 
   // 2. Test writing with a file handle.
   base::DeleteFile(temp_file_path(), false);
-  flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_WRITE;
-  file = base::CreatePlatformFile(temp_file_path(), flags, &created, NULL);
+  flags = base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_WRITE;
+  file.Initialize(temp_file_path(), flags);
 
   scoped_ptr<FileStream> write_stream(
-      new FileStream(file, flags, NULL, base::MessageLoopProxy::current()));
+      new FileStream(file.Pass(), NULL, base::MessageLoopProxy::current()));
   ASSERT_EQ(0, write_stream->SeekSync(FROM_BEGIN, 0));
   ASSERT_EQ(kTestDataSize,
             write_stream->WriteSync(kTestData, kTestDataSize));
   write_stream.reset();
 
   // Read into buffer and compare to make sure the handle worked fine.
   ASSERT_EQ(kTestDataSize,
             base::ReadFile(temp_file_path(), buffer, kTestDataSize));
   ASSERT_EQ(0, memcmp(kTestData, buffer, kTestDataSize));
 }
@@ skipping 12 matching lines @@
   EXPECT_EQ(ERR_UNEXPECTED, avail);
 
   // Try reading...
   char buf[10];
   int rv = stream.ReadSync(buf, arraysize(buf));
   EXPECT_EQ(ERR_UNEXPECTED, rv);
 }
 
 TEST_F(FileStreamTest, BasicRead) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
     rv = stream.ReadSync(buf, arraysize(buf));
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf, rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_EQ(kTestData, data_read);
 }
 
 TEST_F(FileStreamTest, AsyncRead) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream.Open(temp_file_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);
   EXPECT_EQ(kTestData, data_read);
 }
 
 TEST_F(FileStreamTest, AsyncRead_EarlyDelete) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_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);
 
   scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
   rv = stream->Read(buf.get(), buf->size(), callback.callback());
   stream.reset();  // Delete instead of closing it.
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     base::RunLoop().RunUntilIdle();
     EXPECT_FALSE(callback.have_result());
   } else {
     EXPECT_EQ(std::string(kTestData, rv), std::string(buf->data(), rv));
   }
 }
 
 TEST_F(FileStreamTest, BasicRead_FromOffset) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 3;
   int64 new_offset = stream.SeekSync(FROM_BEGIN, kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size - kOffset, total_bytes_avail);
 
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
     rv = stream.ReadSync(buf, arraysize(buf));
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf, rv);
   }
   EXPECT_EQ(file_size - kOffset, total_bytes_read);
   EXPECT_TRUE(data_read == kTestData + kOffset);
   EXPECT_EQ(kTestData + kOffset, data_read);
 }
 
 TEST_F(FileStreamTest, AsyncRead_FromOffset) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream.Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   TestInt64CompletionCallback callback64;
   const int64 kOffset = 3;
   rv = stream.Seek(FROM_BEGIN, kOffset, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   int64 new_offset = callback64.WaitForResult();
@@ skipping 15 matching lines @@
       break;
     total_bytes_read += rv;
     data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size - kOffset, total_bytes_read);
   EXPECT_EQ(kTestData + kOffset, data_read);
 }
 
 TEST_F(FileStreamTest, SeekAround) {
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 3;
   int64 new_offset = stream.SeekSync(FROM_BEGIN, kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   new_offset = stream.SeekSync(FROM_CURRENT, kOffset);
   EXPECT_EQ(2 * kOffset, new_offset);
 
   new_offset = stream.SeekSync(FROM_CURRENT, -kOffset);
   EXPECT_EQ(kOffset, new_offset);
 
   const int kTestDataLen = arraysize(kTestData) - 1;
 
   new_offset = stream.SeekSync(FROM_END, -kTestDataLen);
   EXPECT_EQ(0, new_offset);
 }
 
 TEST_F(FileStreamTest, AsyncSeekAround) {
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_ASYNC |
-              base::PLATFORM_FILE_READ;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_ASYNC |
+              base::File::FLAG_READ;
   TestCompletionCallback callback;
   int rv = stream.Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   TestInt64CompletionCallback callback64;
 
   const int64 kOffset = 3;
   rv = stream.Seek(FROM_BEGIN, kOffset, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
@@ skipping 14 matching lines @@
 
   rv = stream.Seek(FROM_END, -kTestDataLen, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   new_offset = callback64.WaitForResult();
   EXPECT_EQ(0, new_offset);
 }
 
 TEST_F(FileStreamTest, BasicWrite) {
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
-              base::PLATFORM_FILE_WRITE;
+  int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
   int rv = stream->OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(0, file_size);
 
   rv = stream->WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize, file_size);
 }
 
 TEST_F(FileStreamTest, AsyncWrite) {
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream.Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(0, file_size);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(
-        drainable.get(), drainable->BytesRemaining(), callback.callback());
+    rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
+                      callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(file_size, total_bytes_written);
 }
 
 TEST_F(FileStreamTest, AsyncWrite_EarlyDelete) {
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(0, file_size);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   rv = stream->Write(buf.get(), buf->size(), callback.callback());
   stream.reset();
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     base::RunLoop().RunUntilIdle();
     EXPECT_FALSE(callback.have_result());
   } else {
-    ok = base::GetFileSize(temp_file_path(), &file_size);
-    EXPECT_TRUE(ok);
+    EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
     EXPECT_EQ(file_size, rv);
   }
 }
 
 TEST_F(FileStreamTest, BasicWrite_FromOffset) {
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_WRITE;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE;
   int rv = stream->OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize, file_size);
 
   const int64 kOffset = 0;
   int64 new_offset = stream->SeekSync(FROM_END, kOffset);
   EXPECT_EQ(kTestDataSize, new_offset);
 
   rv = stream->WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
 TEST_F(FileStreamTest, AsyncWrite_FromOffset) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   FileStream stream(NULL, base::MessageLoopProxy::current());
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream.Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   TestInt64CompletionCallback callback64;
   const int64 kOffset = 0;
   rv = stream.Seek(FROM_END, kOffset, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   int64 new_offset = callback64.WaitForResult();
   EXPECT_EQ(kTestDataSize, new_offset);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(
-        drainable.get(), drainable->BytesRemaining(), callback.callback());
+    rv = stream.Write(drainable.get(), drainable->BytesRemaining(),
+                      callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(file_size, kTestDataSize * 2);
 }
 
 TEST_F(FileStreamTest, BasicReadWrite) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE;
   int rv = stream->OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
     rv = stream->ReadSync(buf, arraysize(buf));
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf, rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_TRUE(data_read == kTestData);
 
   rv = stream->WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
 TEST_F(FileStreamTest, BasicWriteRead) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE;
   int rv = stream->OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream->SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   rv = stream->WriteSync(kTestData, kTestDataSize);
   EXPECT_EQ(kTestDataSize, rv);
 
   offset = stream->SeekSync(FROM_BEGIN, 0);
   EXPECT_EQ(0, offset);
 
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     char buf[4];
     rv = stream->ReadSync(buf, arraysize(buf));
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf, rv);
   }
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
 
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 TEST_F(FileStreamTest, BasicAsyncReadWrite) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_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);
 
   int64 total_bytes_read = 0;
 
@@ skipping 11 matching lines @@
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_TRUE(data_read == kTestData);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream->Write(
-        drainable.get(), drainable->BytesRemaining(), callback.callback());
+    rv = stream->Write(drainable.get(), drainable->BytesRemaining(),
+                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
 TEST_F(FileStreamTest, BasicAsyncWriteRead) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_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);
 
   TestInt64CompletionCallback callback64;
   rv = stream->Seek(FROM_END, 0, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   int64 offset = callback64.WaitForResult();
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
       new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream->Write(
-        drainable.get(), drainable->BytesRemaining(), callback.callback());
+    rv = stream->Write(drainable.get(), drainable->BytesRemaining(),
+                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   EXPECT_EQ(kTestDataSize, total_bytes_written);
@@ skipping 12 matching lines @@
     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);
   }
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteReadCompletionCallback {
  public:
@@ skipping 82 matching lines @@
   std::string* data_read_;
   const CompletionCallback callback_;
   scoped_refptr<IOBufferWithSize> test_data_;
   scoped_refptr<DrainableIOBuffer> drainable_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWriteReadCompletionCallback);
 };
 
 TEST_F(FileStreamTest, AsyncWriteRead) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
   TestCompletionCallback open_callback;
   int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, open_callback.WaitForResult());
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream->SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   int total_bytes_read = 0;
   std::string data_read;
   TestWriteReadCompletionCallback callback(stream.get(), &total_bytes_written,
                                            &total_bytes_read, &data_read);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   rv = stream->Write(buf.get(), buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(0, rv);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteCloseCompletionCallback {
  public:
@@ skipping 53 matching lines @@
   int* total_bytes_written_;
   const CompletionCallback callback_;
   scoped_refptr<IOBufferWithSize> test_data_;
   scoped_refptr<DrainableIOBuffer> drainable_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWriteCloseCompletionCallback);
 };
 
 TEST_F(FileStreamTest, AsyncWriteClose) {
   int64 file_size;
-  bool ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
 
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-              base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
   TestCompletionCallback open_callback;
   int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, open_callback.WaitForResult());
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream->SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   TestWriteCloseCompletionCallback callback(stream.get(), &total_bytes_written);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   rv = stream->Write(buf.get(), buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     total_bytes_written = callback.WaitForResult();
   EXPECT_LT(0, total_bytes_written);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   stream.reset();
 
-  ok = base::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
+  EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
 // Tests truncating a file.
 TEST_F(FileStreamTest, Truncate) {
-  int flags = base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE;
+  int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
 
   scoped_ptr<FileStream> write_stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
   ASSERT_EQ(OK, write_stream->OpenSync(temp_file_path(), flags));
 
   // Write some data to the file.
   const char test_data[] = "0123456789";
   write_stream->WriteSync(test_data, arraysize(test_data));
 
   // Truncate the file.
   ASSERT_EQ(4, write_stream->Truncate(4));
 
   // Write again.
   write_stream->WriteSync(test_data, 4);
 
   // Close the stream.
   write_stream.reset();
 
   // Read in the contents and make sure we get back what we expected.
   std::string read_contents;
   EXPECT_TRUE(base::ReadFileToString(temp_file_path(), &read_contents));
 
   EXPECT_EQ("01230123", read_contents);
 }
 
 TEST_F(FileStreamTest, AsyncOpenAndDelete) {
   scoped_ptr<FileStream> stream(
       new FileStream(NULL, base::MessageLoopProxy::current()));
-  int flags = base::PLATFORM_FILE_OPEN |
-      base::PLATFORM_FILE_WRITE |
-      base::PLATFORM_FILE_ASYNC;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
+              base::File::FLAG_ASYNC;
   TestCompletionCallback open_callback;
   int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Delete the stream without waiting for the open operation to be
   // complete. Should be safe.
   stream.reset();
   // open_callback won't be called.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(open_callback.have_result());
 }
 
 // Verify that async Write() errors are mapped correctly.
 TEST_F(FileStreamTest, AsyncWriteError) {
   // Try opening file as read-only and then writing to it using FileStream.
-  base::PlatformFile file = base::CreatePlatformFile(
-      temp_file_path(),
-      base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ |
-          base::PLATFORM_FILE_ASYNC,
-      NULL,
-      NULL);
-  ASSERT_NE(base::kInvalidPlatformFileValue, file);
+  uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+                 base::File::FLAG_ASYNC;
 
-  int flags = base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE |
-              base::PLATFORM_FILE_ASYNC;
+  base::File file(temp_file_path(), flags);
+  ASSERT_TRUE(file.IsValid());
+
   scoped_ptr<FileStream> stream(
-      new FileStream(file, flags, NULL, base::MessageLoopProxy::current()));
+  new FileStream(file.Pass(), NULL, base::MessageLoopProxy::current()));
 
   scoped_refptr<IOBuffer> buf = new IOBuffer(1);
   buf->data()[0] = 0;
 
   TestCompletionCallback callback;
   int rv = stream->Write(buf.get(), 1, callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(rv, 0);
 
-  base::ClosePlatformFile(file);
+  stream.reset();
+  base::RunLoop().RunUntilIdle();
 }
 
 // Verify that async Read() errors are mapped correctly.
 TEST_F(FileStreamTest, AsyncReadError) {
   // Try opening file for write and then reading from it using FileStream.
-  base::PlatformFile file = base::CreatePlatformFile(
-      temp_file_path(),
-      base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE |
-          base::PLATFORM_FILE_ASYNC,
-      NULL,
-      NULL);
-  ASSERT_NE(base::kInvalidPlatformFileValue, file);
+  uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
+                 base::File::FLAG_ASYNC;
 
-  int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ |
-              base::PLATFORM_FILE_ASYNC;
+  base::File file(temp_file_path(), flags);
+  ASSERT_TRUE(file.IsValid());
+
   scoped_ptr<FileStream> stream(
-      new FileStream(file, flags, NULL, base::MessageLoopProxy::current()));
+  new FileStream(file.Pass(), NULL, base::MessageLoopProxy::current()));
 
   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);
+  stream.reset();
+  base::RunLoop().RunUntilIdle();
 }
 
 #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(base::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;
+  int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
+              base::File::FLAG_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