Remove PlatformFile from fileapi::FileSystemFileUtil

content/browser/fileapi/local_file_util_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/platform_file.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/test/async_file_test_helper.h"
 #include "content/public/test/test_file_system_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_util_adapter.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
@@ skipping 68 matching lines @@
   bool DirectoryExists(const char *file_name) {
     return base::DirectoryExists(LocalPath(file_name));
   }
 
   int64 GetSize(const char *file_name) {
     base::File::Info info;
     base::GetFileInfo(LocalPath(file_name), &info);
     return info.size;
   }
 
-  base::File::Error CreateFile(const char* file_name,
-                               base::PlatformFile* file_handle,
-                               bool* created) {
-    int file_flags = base::PLATFORM_FILE_CREATE |
-        base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_ASYNC;
+  base::File CreateFile(const char* file_name) {
+    int file_flags = base::File::FLAG_CREATE |
+                     base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
 
     scoped_ptr<FileSystemOperationContext> context(NewContext());
-    return file_util()->CreateOrOpen(
-        context.get(),
-        CreateURL(file_name),
-        file_flags, file_handle, created);
+    return file_util()->CreateOrOpen(context.get(), CreateURL(file_name),
+                                     file_flags);
   }
 
   base::File::Error EnsureFileExists(const char* file_name,
-      bool* created) {
+                                     bool* created) {
     scoped_ptr<FileSystemOperationContext> context(NewContext());
-    return file_util()->EnsureFileExists(
-        context.get(),
-        CreateURL(file_name), created);
+    return file_util()->EnsureFileExists(context.get(),
+                                         CreateURL(file_name), created);
   }
 
   FileSystemContext* file_system_context() {
     return file_system_context_.get();
   }
 
  private:
   base::MessageLoop message_loop_;
   scoped_refptr<FileSystemContext> file_system_context_;
   base::ScopedTempDir data_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileUtilTest);
 };
 
 TEST_F(LocalFileUtilTest, CreateAndClose) {
   const char *file_name = "test_file";
-  base::PlatformFile file_handle;
-  bool created;
-  ASSERT_EQ(base::File::FILE_OK,
-            CreateFile(file_name, &file_handle, &created));
-  ASSERT_TRUE(created);
+  base::File file = CreateFile(file_name);
+  ASSERT_TRUE(file.IsValid());
+  ASSERT_TRUE(file.created());
 
   EXPECT_TRUE(FileExists(file_name));
   EXPECT_EQ(0, GetSize(file_name));
 
   scoped_ptr<FileSystemOperationContext> context(NewContext());
-  EXPECT_EQ(base::File::FILE_OK,
-            file_util()->Close(context.get(), file_handle));
 }
 
 // base::CreateSymbolicLink is only supported on POSIX.
 #if defined(OS_POSIX)
 TEST_F(LocalFileUtilTest, CreateFailForSymlink) {
   // Create symlink target file.
   const char *target_name = "symlink_target";
-  base::PlatformFile target_handle;
-  bool symlink_target_created = false;
-  ASSERT_EQ(base::File::FILE_OK,
-            CreateFile(target_name, &target_handle, &symlink_target_created));
-  ASSERT_TRUE(symlink_target_created);
+  base::File target_file = CreateFile(target_name);
+  ASSERT_TRUE(target_file.IsValid());
+  ASSERT_TRUE(target_file.created());
   base::FilePath target_path = LocalPath(target_name);
 
   // Create symlink where target must be real file.
   const char *symlink_name = "symlink_file";
   base::FilePath symlink_path = LocalPath(symlink_name);
   ASSERT_TRUE(base::CreateSymbolicLink(target_path, symlink_path));
   ASSERT_TRUE(FileExists(symlink_name));
 
   // Try to open the symlink file which should fail.
   scoped_ptr<FileSystemOperationContext> context(NewContext());
   FileSystemURL url = CreateURL(symlink_name);
-  int file_flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
-  base::PlatformFile file_handle;
-  bool created = false;
-  EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND,
-            file_util()->CreateOrOpen(context.get(), url, file_flags,
-                                      &file_handle, &created));
-  EXPECT_FALSE(created);
+  int file_flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
+  base::File file = file_util()->CreateOrOpen(context.get(), url, file_flags);
+  ASSERT_FALSE(file.IsValid());
+  EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, file.error_details());
 }
 #endif
 
 TEST_F(LocalFileUtilTest, EnsureFileExists) {
   const char *file_name = "foobar";
   bool created;
   ASSERT_EQ(base::File::FILE_OK, EnsureFileExists(file_name, &created));
   ASSERT_TRUE(created);
 
   EXPECT_TRUE(FileExists(file_name));
   EXPECT_EQ(0, GetSize(file_name));
 
   ASSERT_EQ(base::File::FILE_OK, EnsureFileExists(file_name, &created));
   EXPECT_FALSE(created);
 }
 
 TEST_F(LocalFileUtilTest, TouchFile) {
   const char *file_name = "test_file";
-  base::PlatformFile file_handle;
-  bool created;
-  ASSERT_EQ(base::File::FILE_OK,
-            CreateFile(file_name, &file_handle, &created));
-  ASSERT_TRUE(created);
+  base::File file = CreateFile(file_name);
+  ASSERT_TRUE(file.IsValid());
+  ASSERT_TRUE(file.created());
 
   scoped_ptr<FileSystemOperationContext> context(NewContext());
 
   base::File::Info info;
   ASSERT_TRUE(base::GetFileInfo(LocalPath(file_name), &info));
   const base::Time new_accessed =
       info.last_accessed + base::TimeDelta::FromHours(10);
   const base::Time new_modified =
       info.last_modified + base::TimeDelta::FromHours(5);
 
   EXPECT_EQ(base::File::FILE_OK,
             file_util()->Touch(context.get(), CreateURL(file_name),
                               new_accessed, new_modified));
 
   ASSERT_TRUE(base::GetFileInfo(LocalPath(file_name), &info));
   EXPECT_EQ(new_accessed, info.last_accessed);
   EXPECT_EQ(new_modified, info.last_modified);
-
-  EXPECT_EQ(base::File::FILE_OK,
-            file_util()->Close(context.get(), file_handle));
 }
 
 TEST_F(LocalFileUtilTest, TouchDirectory) {
   const char *dir_name = "test_dir";
   scoped_ptr<FileSystemOperationContext> context(NewContext());
   ASSERT_EQ(base::File::FILE_OK,
             file_util()->CreateDirectory(context.get(),
                                         CreateURL(dir_name),
                                         false /* exclusive */,
                                         false /* recursive */));
@@ skipping 158 matching lines @@
                                       CreateURL(from_dir),
                                       CreateURL(to_dir)));
 
   EXPECT_FALSE(DirectoryExists(from_dir));
   EXPECT_TRUE(DirectoryExists(to_dir));
   EXPECT_TRUE(FileExists(to_file));
   EXPECT_EQ(1020, GetSize(to_file));
 }
 
 }  // namespace content