diff options
| author | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 19:58:54 +0000 |
|---|---|---|
| committer | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 19:58:54 +0000 |
| commit | 4735522f8b30a06dce580b770f79020adc730352 (patch) | |
| tree | 4d1c26f9b609a6da573a2b8f5fc31969aa7a51d7 /base/files | |
| parent | 7867196e5e9623794e547571364f6b77e146d462 (diff) | |
| download | chromium_src-4735522f8b30a06dce580b770f79020adc730352.zip chromium_src-4735522f8b30a06dce580b770f79020adc730352.tar.gz chromium_src-4735522f8b30a06dce580b770f79020adc730352.tar.bz2 | |
Remove CreatePlatformFile from file_util_proxy
Most of file_util_proxy is going to be deleted soon (users have to migrate to
FileProxy) so this CL is quite superficial. It is intended to remove the last
uses of CreatePlatformFile so that the method can be removed and no new code
can ignore base::File.
BUG=322664
Review URL: https://codereview.chromium.org/227433006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/files')
| -rw-r--r-- | base/files/file_util_proxy.cc | 25 | ||||
| -rw-r--r-- | base/files/file_util_proxy_unittest.cc | 9 |
2 files changed, 18 insertions, 16 deletions
diff --git a/base/files/file_util_proxy.cc b/base/files/file_util_proxy.cc index 447552d..0a86393 100644 --- a/base/files/file_util_proxy.cc +++ b/base/files/file_util_proxy.cc @@ -90,15 +90,15 @@ class CreateTemporaryHelper { PLATFORM_FILE_CREATE_ALWAYS | additional_file_flags; - error_ = File::FILE_OK; - // TODO(rvargas): Convert this code to use File. - file_handle_ = - CreatePlatformFile(file_path_, file_flags, NULL, - reinterpret_cast<PlatformFileError*>(&error_)); - if (error_ != File::FILE_OK) { + File file(file_path_, file_flags); + if (!file.IsValid()) { base::DeleteFile(file_path_, false); file_path_.clear(); + error_ = file.error_details(); + return; } + error_ = File::FILE_OK; + file_handle_ = file.TakePlatformFile(); } void Reply(const FileUtilProxy::CreateTemporaryCallback& callback) { @@ -212,11 +212,14 @@ File::Error CreateOrOpenAdapter( // If its parent does not exist, should return NOT_FOUND error. return File::FILE_ERROR_NOT_FOUND; } - File::Error error = File::FILE_OK; - *file_handle = - CreatePlatformFile(file_path, file_flags, created, - reinterpret_cast<PlatformFileError*>(&error)); - return error; + + File file(file_path, file_flags); + if (!file.IsValid()) + return file.error_details(); + + *file_handle = file.TakePlatformFile(); + *created = file.created(); + return File::FILE_OK; } File::Error CloseAdapter(PlatformFile file_handle) { diff --git a/base/files/file_util_proxy_unittest.cc b/base/files/file_util_proxy_unittest.cc index 8d8c8eb..4fa6890 100644 --- a/base/files/file_util_proxy_unittest.cc +++ b/base/files/file_util_proxy_unittest.cc @@ -88,11 +88,10 @@ class FileUtilProxyTest : public testing::Test { PlatformFile GetTestPlatformFile(int flags) { if (file_ != kInvalidPlatformFileValue) return file_; - bool created; - PlatformFileError error; - file_ = CreatePlatformFile(test_path(), flags, &created, &error); - EXPECT_EQ(PLATFORM_FILE_OK, error); - EXPECT_NE(kInvalidPlatformFileValue, file_); + + File file(test_path(), flags); + EXPECT_TRUE(file.IsValid()); + file_ = file.TakePlatformFile(); return file_; } |