Commit c241eac7 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Switch to 1-parameter version of base::DeleteFile() in chromecast/.

The 1-parameter version is simpler, and the 2-parameter version is
deprecated.

Bug: 1009837
Change-Id: Ie55658befa4b60860664be1b0097bb3c5a37e2d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284367Reviewed-by: default avatarSergey Volk <servolk@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#785996}
parent dfee4992
......@@ -125,7 +125,7 @@ bool CastMainDelegate::BasicStartupComplete(int* exit_code) {
crash_files.end(), newest_first);
for (auto file = crash_files.begin() + kMaxCrashFiles;
file != crash_files.end(); ++file) {
base::DeleteFile(*file, false);
base::DeleteFile(*file);
}
}
}
......
......@@ -14,8 +14,7 @@ ScopedTempFile::ScopedTempFile() {
ScopedTempFile::~ScopedTempFile() {
if (FileExists()) {
// Since this is a file, set the -rf flag to false.
CHECK(base::DeleteFile(path_, false));
CHECK(base::DeleteFile(path_));
}
}
......
......@@ -113,7 +113,7 @@ bool CrashUtil::RequestUploadCrashDump(
// In case the file is still in $TEMP, remove it. Note that DeleteFile() will
// return true if |existing_minidump_path| has already been moved.
if (!base::DeleteFile(base::FilePath(existing_minidump_path), false)) {
if (!base::DeleteFile(base::FilePath(existing_minidump_path))) {
LOG(ERROR) << "Unable to delete temp minidump file "
<< existing_minidump_path;
success = false;
......
......@@ -165,8 +165,8 @@ bool MinidumpUploader::DoWork() {
}
if (ignore_and_erase_dump) {
base::DeleteFile(dump_path, false);
base::DeleteFile(log_path, false);
base::DeleteFile(dump_path);
base::DeleteFile(log_path);
dumps.erase(dumps.begin());
continue;
}
......@@ -269,12 +269,12 @@ bool MinidumpUploader::DoWork() {
// delete the dump if it exists in /data/minidumps.
// (We may use a fake dump file which should not be deleted.)
if (!dump_path.empty() && dump_path.DirName() == dump_path_ &&
!base::DeleteFile(dump_path, false)) {
!base::DeleteFile(dump_path)) {
LOG(WARNING) << "remove dump " << dump_path.value() << " failed"
<< strerror(errno);
}
// delete the log if exists
if (!log_path.empty() && !base::DeleteFile(log_path, false)) {
if (!log_path.empty() && !base::DeleteFile(log_path)) {
LOG(WARNING) << "remove log " << log_path.value() << " failed"
<< strerror(errno);
}
......
......@@ -262,8 +262,8 @@ TEST_F(MinidumpUploaderTest, SavesRemainingDumpInfoWithMidwayUploadFailure) {
ASSERT_TRUE(base::GetFileSize(lockfile_, &size));
ASSERT_EQ(size, 0);
ASSERT_TRUE(base::DeleteFile(lockfile_, false));
ASSERT_TRUE(base::DeleteFile(metadata_, false));
ASSERT_TRUE(base::DeleteFile(lockfile_));
ASSERT_TRUE(base::DeleteFile(metadata_));
ASSERT_TRUE(base::IsDirectoryEmpty(minidump_dir_));
}
......@@ -277,7 +277,7 @@ TEST_F(MinidumpUploaderTest, FailsUploadWithMissingMinidumpFile) {
base::BindRepeating(&CreateFakePrefService, true));
// No CastCrashdumpUploader methods should be called.
ASSERT_TRUE(base::DeleteFile(minidump_path, false));
ASSERT_TRUE(base::DeleteFile(minidump_path));
ASSERT_TRUE(uploader.UploadAllMinidumps());
// Ensure dump files were deleted, lockfile was emptied.
......@@ -299,7 +299,7 @@ TEST_F(MinidumpUploaderTest, UploadsWithoutMissingLogFile) {
base::BindRepeating(&CreateFakePrefService, true));
// Delete logfile, crash uploader should still work as intended.
ASSERT_TRUE(base::DeleteFile(logfile_path, false));
ASSERT_TRUE(base::DeleteFile(logfile_path));
EXPECT_CALL(mock_crash_uploader(), SetParameter(_, _)).Times(AtLeast(0));
EXPECT_CALL(mock_crash_uploader(), Upload(_)).WillOnce(Return(true));
ASSERT_TRUE(uploader.UploadAllMinidumps());
......
......@@ -202,7 +202,7 @@ int SynchronizedMinidumpManager::GetNumDumps(bool delete_all_dumps) {
if (delete_all_dumps) {
LOG(INFO) << "Removing " << reader.name()
<< "which was not in the lockfile";
if (!base::DeleteFile(dump_file, false))
if (!base::DeleteFile(dump_file))
PLOG(INFO) << "Removing " << dump_file.value() << " failed";
}
}
......
......@@ -220,7 +220,7 @@ TEST_F(SynchronizedMinidumpManagerTest, AcquireLockOnNonExistentDirectory) {
TEST_F(SynchronizedMinidumpManagerTest, AcquireLockOnExistingEmptyDirectory) {
// The lockfile was created in SetUp(). Delete it.
ASSERT_TRUE(base::DeleteFile(lockfile_, false));
ASSERT_TRUE(base::DeleteFile(lockfile_));
ASSERT_FALSE(base::PathExists(lockfile_));
SynchronizedMinidumpManagerSimple manager;
......@@ -500,8 +500,8 @@ TEST_F(SynchronizedMinidumpManagerTest, HasDumpsNotInLockFile) {
TEST_F(SynchronizedMinidumpManagerTest, InitializeFileState) {
SynchronizedMinidumpManagerSimple manager;
ASSERT_TRUE(base::DeleteFile(lockfile_, false));
ASSERT_TRUE(base::DeleteFile(metadata_, false));
ASSERT_TRUE(base::DeleteFile(lockfile_));
ASSERT_TRUE(base::DeleteFile(metadata_));
ASSERT_FALSE(base::PathExists(lockfile_));
ASSERT_FALSE(base::PathExists(metadata_));
EXPECT_TRUE(manager.InitializeFileState());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment