| Index: base/file_util_win.cc
|
| diff --git a/base/file_util_win.cc b/base/file_util_win.cc
|
| index 95843d9ea234a563962ed49d4104e093ee625e85..ad3a8c3241a5413ca572be39ae1cd9e0f9b1f403 100644
|
| --- a/base/file_util_win.cc
|
| +++ b/base/file_util_win.cc
|
| @@ -82,7 +82,7 @@ FilePath MakeAbsoluteFilePath(const FilePath& input) {
|
| return FilePath(file_path);
|
| }
|
|
|
| -bool Delete(const FilePath& path, bool recursive) {
|
| +bool DeleteFile(const FilePath& path, bool recursive) {
|
| ThreadRestrictions::AssertIOAllowed();
|
|
|
| if (path.value().length() >= MAX_PATH)
|
| @@ -136,7 +136,7 @@ bool Delete(const FilePath& path, bool recursive) {
|
| return (err == 0 || err == ERROR_FILE_NOT_FOUND || err == 0x402);
|
| }
|
|
|
| -bool DeleteAfterReboot(const FilePath& path) {
|
| +bool DeleteFileAfterReboot(const FilePath& path) {
|
| ThreadRestrictions::AssertIOAllowed();
|
|
|
| if (path.value().length() >= MAX_PATH)
|
| @@ -744,7 +744,7 @@ bool CopyAndDeleteDirectory(const FilePath& from_path,
|
| const FilePath& to_path) {
|
| ThreadRestrictions::AssertIOAllowed();
|
| if (CopyDirectory(from_path, to_path, true)) {
|
| - if (Delete(from_path, true))
|
| + if (DeleteFile(from_path, true))
|
| return true;
|
|
|
| // Like Move, this function is not transactional, so we just
|
|
|