| Index: chrome/browser/safe_browsing/safe_browsing_store_file.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
|
| index 50cacb3152cfe9d5d7a9381da9da94183137c266..628907c0e4215e87bcef333afcb4af18ae523b81 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
|
| @@ -186,7 +186,7 @@ void SafeBrowsingStoreFile::CheckForOriginalAndDelete(
|
| static_cast<int>(size / 1024));
|
| }
|
|
|
| - if (base::Delete(original_filename, false)) {
|
| + if (base::DeleteFile(original_filename, false)) {
|
| RecordFormatEvent(FORMAT_EVENT_DELETED_ORIGINAL);
|
| } else {
|
| RecordFormatEvent(FORMAT_EVENT_DELETED_ORIGINAL_FAILED);
|
| @@ -196,7 +196,7 @@ void SafeBrowsingStoreFile::CheckForOriginalAndDelete(
|
| // the weeds.
|
| const base::FilePath journal_filename(
|
| current_filename.DirName().AppendASCII("Safe Browsing-journal"));
|
| - base::Delete(journal_filename, false);
|
| + base::DeleteFile(journal_filename, false);
|
| }
|
| }
|
|
|
| @@ -654,7 +654,7 @@ bool SafeBrowsingStoreFile::DoUpdate(
|
|
|
| // Close the file handle and swizzle the file into place.
|
| new_file_.reset();
|
| - if (!base::Delete(filename_, false) &&
|
| + if (!base::DeleteFile(filename_, false) &&
|
| base::PathExists(filename_))
|
| return false;
|
|
|
| @@ -735,14 +735,14 @@ void SafeBrowsingStoreFile::DeleteSubChunk(int32 chunk_id) {
|
|
|
| // static
|
| bool SafeBrowsingStoreFile::DeleteStore(const base::FilePath& basename) {
|
| - if (!base::Delete(basename, false) &&
|
| + if (!base::DeleteFile(basename, false) &&
|
| base::PathExists(basename)) {
|
| NOTREACHED();
|
| return false;
|
| }
|
|
|
| const base::FilePath new_filename = TemporaryFileForFilename(basename);
|
| - if (!base::Delete(new_filename, false) &&
|
| + if (!base::DeleteFile(new_filename, false) &&
|
| base::PathExists(new_filename)) {
|
| NOTREACHED();
|
| return false;
|
| @@ -754,7 +754,7 @@ bool SafeBrowsingStoreFile::DeleteStore(const base::FilePath& basename) {
|
| const base::FilePath journal_filename(
|
| basename.value() + FILE_PATH_LITERAL("-journal"));
|
| if (base::PathExists(journal_filename))
|
| - base::Delete(journal_filename, false);
|
| + base::DeleteFile(journal_filename, false);
|
|
|
| return true;
|
| }
|
|
|