Index: content/browser/fileapi/file_system_operation_runner_unittest.cc |
diff --git a/content/browser/fileapi/file_system_operation_runner_unittest.cc b/content/browser/fileapi/file_system_operation_runner_unittest.cc |
index e2c4b48d1f3b145081da5e737bf3405a27358b94..571ddd1b1682fde4547eff21ea752e6f24443f09 100644 |
--- a/content/browser/fileapi/file_system_operation_runner_unittest.cc |
+++ b/content/browser/fileapi/file_system_operation_runner_unittest.cc |
@@ -20,8 +20,8 @@ using fileapi::FileSystemURL; |
namespace content { |
void GetStatus(bool* done, |
- base::PlatformFileError *status_out, |
- base::PlatformFileError status) { |
+ base::File::Error *status_out, |
+ base::File::Error status) { |
ASSERT_FALSE(*done); |
*done = true; |
*status_out = status; |
@@ -29,8 +29,8 @@ void GetStatus(bool* done, |
void GetCancelStatus(bool* operation_done, |
bool* cancel_done, |
- base::PlatformFileError *status_out, |
- base::PlatformFileError status) { |
+ base::File::Error *status_out, |
+ base::File::Error status) { |
// Cancel callback must be always called after the operation's callback. |
ASSERT_TRUE(*operation_done); |
ASSERT_FALSE(*cancel_done); |
@@ -75,7 +75,7 @@ class FileSystemOperationRunnerTest : public testing::Test { |
TEST_F(FileSystemOperationRunnerTest, NotFoundError) { |
bool done = false; |
- base::PlatformFileError status = base::PLATFORM_FILE_ERROR_FAILED; |
+ base::File::Error status = base::File::FILE_ERROR_FAILED; |
// Regular NOT_FOUND error, which is called asynchronously. |
operation_runner()->Truncate(URL("foo"), 0, |
@@ -83,12 +83,12 @@ TEST_F(FileSystemOperationRunnerTest, NotFoundError) { |
ASSERT_FALSE(done); |
base::RunLoop().RunUntilIdle(); |
ASSERT_TRUE(done); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status); |
+ ASSERT_EQ(base::File::FILE_ERROR_NOT_FOUND, status); |
} |
TEST_F(FileSystemOperationRunnerTest, InvalidURLError) { |
bool done = false; |
- base::PlatformFileError status = base::PLATFORM_FILE_ERROR_FAILED; |
+ base::File::Error status = base::File::FILE_ERROR_FAILED; |
// Invalid URL error, which calls DidFinish synchronously. |
operation_runner()->Truncate(FileSystemURL(), 0, |
@@ -98,14 +98,14 @@ TEST_F(FileSystemOperationRunnerTest, InvalidURLError) { |
base::RunLoop().RunUntilIdle(); |
ASSERT_TRUE(done); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_URL, status); |
+ ASSERT_EQ(base::File::FILE_ERROR_INVALID_URL, status); |
} |
TEST_F(FileSystemOperationRunnerTest, NotFoundErrorAndCancel) { |
bool done = false; |
bool cancel_done = false; |
- base::PlatformFileError status = base::PLATFORM_FILE_ERROR_FAILED; |
- base::PlatformFileError cancel_status = base::PLATFORM_FILE_ERROR_FAILED; |
+ base::File::Error status = base::File::FILE_ERROR_FAILED; |
+ base::File::Error cancel_status = base::File::FILE_ERROR_FAILED; |
// Call Truncate with non-existent URL, and try to cancel it immediately |
// after that (before its callback is fired). |
@@ -122,15 +122,15 @@ TEST_F(FileSystemOperationRunnerTest, NotFoundErrorAndCancel) { |
ASSERT_TRUE(done); |
ASSERT_TRUE(cancel_done); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, cancel_status); |
+ ASSERT_EQ(base::File::FILE_ERROR_NOT_FOUND, status); |
+ ASSERT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, cancel_status); |
} |
TEST_F(FileSystemOperationRunnerTest, InvalidURLErrorAndCancel) { |
bool done = false; |
bool cancel_done = false; |
- base::PlatformFileError status = base::PLATFORM_FILE_ERROR_FAILED; |
- base::PlatformFileError cancel_status = base::PLATFORM_FILE_ERROR_FAILED; |
+ base::File::Error status = base::File::FILE_ERROR_FAILED; |
+ base::File::Error cancel_status = base::File::FILE_ERROR_FAILED; |
// Call Truncate with invalid URL, and try to cancel it immediately |
// after that (before its callback is fired). |
@@ -147,21 +147,21 @@ TEST_F(FileSystemOperationRunnerTest, InvalidURLErrorAndCancel) { |
ASSERT_TRUE(done); |
ASSERT_TRUE(cancel_done); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_URL, status); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, cancel_status); |
+ ASSERT_EQ(base::File::FILE_ERROR_INVALID_URL, status); |
+ ASSERT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, cancel_status); |
} |
TEST_F(FileSystemOperationRunnerTest, CancelWithInvalidId) { |
const FileSystemOperationRunner::OperationID kInvalidId = -1; |
bool done = true; // The operation is not running. |
bool cancel_done = false; |
- base::PlatformFileError cancel_status = base::PLATFORM_FILE_ERROR_FAILED; |
+ base::File::Error cancel_status = base::File::FILE_ERROR_FAILED; |
operation_runner()->Cancel(kInvalidId, base::Bind(&GetCancelStatus, |
&done, &cancel_done, |
&cancel_status)); |
ASSERT_TRUE(cancel_done); |
- ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, cancel_status); |
+ ASSERT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, cancel_status); |
} |
} // namespace content |