Index: base/file_util_unittest.cc |
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc |
index e7c43ff4533ff42c5b057b5b2a29b3be5b5ca65a..2506fb7f1a356508c3ae1807ff0d465c4186722f 100644 |
--- a/base/file_util_unittest.cc |
+++ b/base/file_util_unittest.cc |
@@ -697,7 +697,7 @@ TEST_F(FileUtilTest, ChangeFilePermissionsAndRead) { |
// Write file. |
EXPECT_EQ(static_cast<int>(kData.length()), |
- file_util::WriteFile(file_name, kData.data(), kData.length())); |
+ WriteFile(file_name, kData.data(), kData.length())); |
EXPECT_TRUE(PathExists(file_name)); |
// Make sure the file is readable. |
@@ -736,7 +736,7 @@ TEST_F(FileUtilTest, ChangeFilePermissionsAndWrite) { |
// Write file. |
EXPECT_EQ(static_cast<int>(kData.length()), |
- file_util::WriteFile(file_name, kData.data(), kData.length())); |
+ WriteFile(file_name, kData.data(), kData.length())); |
EXPECT_TRUE(PathExists(file_name)); |
// Make sure the file is writable. |
@@ -750,8 +750,7 @@ TEST_F(FileUtilTest, ChangeFilePermissionsAndWrite) { |
EXPECT_TRUE(GetPosixFilePermissions(file_name, &mode)); |
EXPECT_FALSE(mode & FILE_PERMISSION_WRITE_BY_USER); |
// Make sure the file can't be write. |
- EXPECT_EQ(-1, |
- file_util::WriteFile(file_name, kData.data(), kData.length())); |
+ EXPECT_EQ(-1, WriteFile(file_name, kData.data(), kData.length())); |
EXPECT_FALSE(PathIsWritable(file_name)); |
// Give read permission. |
@@ -761,7 +760,7 @@ TEST_F(FileUtilTest, ChangeFilePermissionsAndWrite) { |
EXPECT_TRUE(mode & FILE_PERMISSION_WRITE_BY_USER); |
// Make sure the file can be write. |
EXPECT_EQ(static_cast<int>(kData.length()), |
- file_util::WriteFile(file_name, kData.data(), kData.length())); |
+ WriteFile(file_name, kData.data(), kData.length())); |
EXPECT_TRUE(PathIsWritable(file_name)); |
// Delete the file. |
@@ -781,7 +780,7 @@ TEST_F(FileUtilTest, ChangeDirectoryPermissionsAndEnumerate) { |
EXPECT_FALSE(PathExists(file_name)); |
const std::string kData("hello"); |
EXPECT_EQ(static_cast<int>(kData.length()), |
- file_util::WriteFile(file_name, kData.data(), kData.length())); |
+ WriteFile(file_name, kData.data(), kData.length())); |
EXPECT_TRUE(PathExists(file_name)); |
// Make sure the directory has the all permissions. |
@@ -1944,7 +1943,7 @@ TEST_F(FileUtilTest, AppendToFile) { |
std::string data("hello"); |
EXPECT_EQ(-1, file_util::AppendToFile(foobar, data.c_str(), data.length())); |
EXPECT_EQ(static_cast<int>(data.length()), |
- file_util::WriteFile(foobar, data.c_str(), data.length())); |
+ WriteFile(foobar, data.c_str(), data.length())); |
EXPECT_EQ(static_cast<int>(data.length()), |
file_util::AppendToFile(foobar, data.c_str(), data.length())); |
@@ -1959,7 +1958,7 @@ TEST_F(FileUtilTest, ReadFileToString) { |
FilePath file_path = |
temp_dir_.path().Append(FILE_PATH_LITERAL("ReadFileToStringTest")); |
- ASSERT_EQ(4, file_util::WriteFile(file_path, kTestData, 4)); |
+ ASSERT_EQ(4, WriteFile(file_path, kTestData, 4)); |
EXPECT_TRUE(ReadFileToString(file_path, &data)); |
EXPECT_EQ(kTestData, data); |
@@ -2011,7 +2010,7 @@ TEST_F(FileUtilTest, TouchFile) { |
FilePath foobar(data_dir.Append(FILE_PATH_LITERAL("foobar.txt"))); |
std::string data("hello"); |
- ASSERT_TRUE(file_util::WriteFile(foobar, data.c_str(), data.length())); |
+ ASSERT_TRUE(WriteFile(foobar, data.c_str(), data.length())); |
Time access_time; |
// This timestamp is divisible by one day (in local timezone), |
@@ -2045,7 +2044,7 @@ TEST_F(FileUtilTest, IsDirectoryEmpty) { |
FilePath foo(empty_dir.Append(FILE_PATH_LITERAL("foo.txt"))); |
std::string bar("baz"); |
- ASSERT_TRUE(file_util::WriteFile(foo, bar.c_str(), bar.length())); |
+ ASSERT_TRUE(WriteFile(foo, bar.c_str(), bar.length())); |
EXPECT_FALSE(IsDirectoryEmpty(empty_dir)); |
} |