Index: webkit/browser/fileapi/sandbox_database_test_helper.cc |
diff --git a/webkit/browser/fileapi/sandbox_database_test_helper.cc b/webkit/browser/fileapi/sandbox_database_test_helper.cc |
index 5c9176c0878c8156fe597a9e754170f6fafed697..0c5ef14b068bdaec2e0f981549779b2f6bec3174 100644 |
--- a/webkit/browser/fileapi/sandbox_database_test_helper.cc |
+++ b/webkit/browser/fileapi/sandbox_database_test_helper.cc |
@@ -9,6 +9,7 @@ |
#include <vector> |
#include "base/file_util.h" |
+#include "base/files/file.h" |
#include "base/files/file_enumerator.h" |
#include "base/stl_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -41,19 +42,14 @@ void CorruptDatabase(const base::FilePath& db_path, |
EXPECT_FALSE(picked_file_path.empty()); |
EXPECT_NE(kuint64max, picked_file_number); |
- bool created = true; |
- base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED; |
- base::PlatformFile file = |
- CreatePlatformFile(picked_file_path, |
- base::PLATFORM_FILE_OPEN | |
- base::PLATFORM_FILE_READ | |
- base::PLATFORM_FILE_WRITE, |
- &created, &error); |
- EXPECT_EQ(base::PLATFORM_FILE_OK, error); |
- EXPECT_FALSE(created); |
+ base::File file(picked_file_path, |
+ base::File::FLAG_OPEN | base::File::FLAG_READ | |
+ base::File::FLAG_WRITE); |
+ ASSERT_TRUE(file.IsValid()); |
+ EXPECT_FALSE(file.created()); |
- base::PlatformFileInfo file_info; |
- EXPECT_TRUE(base::GetPlatformFileInfo(file, &file_info)); |
+ base::File::Info file_info; |
+ EXPECT_TRUE(file.GetInfo(&file_info)); |
if (offset < 0) |
offset += file_info.size; |
EXPECT_GE(offset, 0); |
@@ -62,8 +58,7 @@ void CorruptDatabase(const base::FilePath& db_path, |
size = std::min(size, static_cast<size_t>(file_info.size - offset)); |
std::vector<char> buf(size); |
- int read_size = base::ReadPlatformFile(file, offset, |
- vector_as_array(&buf), buf.size()); |
+ int read_size = file.Read(offset, vector_as_array(&buf), buf.size()); |
EXPECT_LT(0, read_size); |
EXPECT_GE(buf.size(), static_cast<size_t>(read_size)); |
buf.resize(read_size); |
@@ -71,12 +66,9 @@ void CorruptDatabase(const base::FilePath& db_path, |
std::transform(buf.begin(), buf.end(), buf.begin(), |
std::logical_not<char>()); |
- int written_size = base::WritePlatformFile(file, offset, |
- vector_as_array(&buf), buf.size()); |
+ int written_size = file.Write(offset, vector_as_array(&buf), buf.size()); |
EXPECT_GT(written_size, 0); |
EXPECT_EQ(buf.size(), static_cast<size_t>(written_size)); |
- |
- base::ClosePlatformFile(file); |
} |
void DeleteDatabaseFile(const base::FilePath& db_path, |