Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(864)

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc

Issue 278113002: Remove PlatformFile from fileapi::AsyncFileUtil (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
index a02ce1c8889d42599c8e86dc0f4f648ab84bc9b7..4f80a4058192338f755947a01a2b3172235e42f2 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
@@ -10,7 +10,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/platform_file.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h"
#include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h"
@@ -47,10 +46,12 @@ class EventLogger {
error_.reset(new base::File::Error(error));
}
- void OnCreateOrOpen(base::File::Error error,
- base::PassPlatformFile platform_file,
+ void OnCreateOrOpen(base::File file,
const base::Closure& on_close_callback) {
- error_.reset(new base::File::Error(error));
+ if (file.IsValid())
+ error_.reset(new base::File::Error(base::File::FILE_OK));
+
+ error_.reset(new base::File::Error(file.error_details()));
}
void OnEnsureFileExists(base::File::Error error, bool created) {
@@ -185,7 +186,7 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_Create) {
async_file_util_->CreateOrOpen(
CreateOperationContext(),
file_url_,
- base::PLATFORM_FILE_CREATE,
+ base::File::FLAG_CREATE,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
ASSERT_TRUE(logger.error());
@@ -198,7 +199,7 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_CreateAlways) {
async_file_util_->CreateOrOpen(
CreateOperationContext(),
file_url_,
- base::PLATFORM_FILE_CREATE_ALWAYS,
+ base::File::FLAG_CREATE_ALWAYS,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
ASSERT_TRUE(logger.error());
@@ -211,7 +212,7 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_OpenAlways) {
async_file_util_->CreateOrOpen(
CreateOperationContext(),
file_url_,
- base::PLATFORM_FILE_OPEN_ALWAYS,
+ base::File::FLAG_OPEN_ALWAYS,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
ASSERT_TRUE(logger.error());
@@ -225,7 +226,7 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest,
async_file_util_->CreateOrOpen(
CreateOperationContext(),
file_url_,
- base::PLATFORM_FILE_OPEN_TRUNCATED,
+ base::File::FLAG_OPEN_TRUNCATED,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
ASSERT_TRUE(logger.error());
@@ -238,7 +239,7 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_Open) {
async_file_util_->CreateOrOpen(
CreateOperationContext(),
file_url_,
- base::PLATFORM_FILE_OPEN,
+ base::File::FLAG_OPEN,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
ASSERT_TRUE(logger.error());

Powered by Google App Engine
This is Rietveld 408576698