Base: Rename File::error() to File::error_details()
BUG=322664
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/126453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243676 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: ee8808c5d8d188be99eb69c6efbd27135ccb2956
diff --git a/base/files/file.cc b/base/files/file.cc
index 508103a..478f902 100644
--- a/base/files/file.cc
+++ b/base/files/file.cc
@@ -20,7 +20,7 @@
File::File()
: file_(kInvalidPlatformFileValue),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
}
@@ -28,7 +28,7 @@
#if !defined(OS_NACL)
File::File(const FilePath& name, uint32 flags)
: file_(kInvalidPlatformFileValue),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
Initialize(name, flags);
@@ -37,14 +37,14 @@
File::File(PlatformFile platform_file)
: file_(platform_file),
- error_(FILE_OK),
+ error_details_(FILE_OK),
created_(false),
async_(false) {
}
File::File(RValue other)
: file_(other.object->TakePlatformFile()),
- error_(other.object->error()),
+ error_details_(other.object->error_details()),
created_(other.object->created()),
async_(other.object->async_) {
}
@@ -57,7 +57,7 @@
if (this != other.object) {
Close();
SetPlatformFile(other.object->TakePlatformFile());
- error_ = other.object->error();
+ error_details_ = other.object->error_details();
created_ = other.object->created();
async_ = other.object->async_;
}
@@ -67,7 +67,7 @@
#if !defined(OS_NACL)
void File::Initialize(const FilePath& name, uint32 flags) {
if (name.ReferencesParent()) {
- error_ = FILE_ERROR_ACCESS_DENIED;
+ error_details_ = FILE_ERROR_ACCESS_DENIED;
return;
}
InitializeUnsafe(name, flags);
diff --git a/base/files/file.h b/base/files/file.h
index e87dd7b..a8cb16c 100644
--- a/base/files/file.h
+++ b/base/files/file.h
@@ -172,7 +172,7 @@
bool created() const { return created_; }
// Returns the OS result of opening this file.
- Error error() const { return error_; }
+ Error error_details() const { return error_details_; }
PlatformFile GetPlatformFile() const { return file_; }
PlatformFile TakePlatformFile();
@@ -276,7 +276,7 @@
PlatformFile file_;
#endif
- Error error_;
+ Error error_details_;
bool created_;
bool async_;
};
diff --git a/base/files/file_posix.cc b/base/files/file_posix.cc
index e8b4d77..a37de53 100644
--- a/base/files/file_posix.cc
+++ b/base/files/file_posix.cc
@@ -147,7 +147,7 @@
if (!open_flags && !(flags & FLAG_OPEN) && !(flags & FLAG_OPEN_ALWAYS)) {
NOTREACHED();
errno = EOPNOTSUPP;
- error_ = FILE_ERROR_FAILED;
+ error_details_ = FILE_ERROR_FAILED;
return;
}
@@ -198,9 +198,9 @@
unlink(name.value().c_str());
if (descriptor >= 0)
- error_ = FILE_OK;
+ error_details_ = FILE_OK;
else
- error_ = File::OSErrorToFileError(errno);
+ error_details_ = File::OSErrorToFileError(errno);
file_ = descriptor;
}
diff --git a/base/files/file_unittest.cc b/base/files/file_unittest.cc
index 224776f..18ba340 100644
--- a/base/files/file_unittest.cc
+++ b/base/files/file_unittest.cc
@@ -20,7 +20,7 @@
// Open a file that doesn't exist.
File file(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
EXPECT_FALSE(file.IsValid());
- EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, file.error());
+ EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, file.error_details());
}
{
@@ -28,7 +28,7 @@
File file(file_path, base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_READ);
EXPECT_TRUE(file.IsValid());
EXPECT_TRUE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
}
{
@@ -36,7 +36,7 @@
File file(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
EXPECT_TRUE(file.IsValid());
EXPECT_FALSE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
// This time verify closing the file.
file.Close();
@@ -49,7 +49,7 @@
file.Initialize(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
EXPECT_TRUE(file.IsValid());
EXPECT_FALSE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
// This time verify closing the file.
file.Close();
@@ -61,7 +61,7 @@
File file(file_path, base::File::FLAG_CREATE | base::File::FLAG_READ);
EXPECT_FALSE(file.IsValid());
EXPECT_FALSE(file.created());
- EXPECT_EQ(base::File::FILE_ERROR_EXISTS, file.error());
+ EXPECT_EQ(base::File::FILE_ERROR_EXISTS, file.error_details());
}
{
@@ -70,7 +70,7 @@
base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ);
EXPECT_TRUE(file.IsValid());
EXPECT_TRUE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
}
{
@@ -81,7 +81,7 @@
base::File::FLAG_DELETE_ON_CLOSE);
EXPECT_TRUE(file.IsValid());
EXPECT_TRUE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
}
EXPECT_FALSE(base::PathExists(file_path));
@@ -98,7 +98,7 @@
base::File::FLAG_SHARE_DELETE);
EXPECT_TRUE(file.IsValid());
EXPECT_TRUE(file.created());
- EXPECT_EQ(base::File::FILE_OK, file.error());
+ EXPECT_EQ(base::File::FILE_OK, file.error_details());
// Open an existing file and mark it as delete on close.
File same_file(file_path,
@@ -106,7 +106,7 @@
base::File::FLAG_READ);
EXPECT_TRUE(file.IsValid());
EXPECT_FALSE(same_file.created());
- EXPECT_EQ(base::File::FILE_OK, same_file.error());
+ EXPECT_EQ(base::File::FILE_OK, same_file.error_details());
// Close both handles and check that the file is gone.
file.Close();