Rename base::Delete to base::DeleteFile

chrome/browser/chromeos/drive/file_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_cache.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 212 matching lines @@
 
   // Remove all files which have no corresponding cache entries.
   base::FileEnumerator enumerator(cache_file_directory_,
                                   false,  // not recursive
                                   base::FileEnumerator::FILES);
   FileCacheEntry entry;
   for (base::FilePath current = enumerator.Next(); !current.empty();
        current = enumerator.Next()) {
     std::string resource_id = GetResourceIdFromPath(current);
     if (!storage_->GetCacheEntry(resource_id, &entry))
-      base::Delete(current, false /* recursive */);
+      base::DeleteFile(current, false /* recursive */);
   }
 
   // Check the disk space again.
   return HasEnoughSpaceFor(num_bytes, cache_file_directory_);
 }
 
 void FileCache::GetFileOnUIThread(const std::string& resource_id,
                                   const std::string& md5,
                                   const GetFileFromCacheCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 242 matching lines @@
   // If entry doesn't exist, nothing to do.
   if (!storage_->GetCacheEntry(resource_id, &cache_entry))
     return FILE_ERROR_OK;
 
   // Cannot delete a mounted file.
   if (mounted_files_.count(resource_id))
     return FILE_ERROR_IN_USE;
 
   // Delete the file.
   base::FilePath path = GetCacheFilePath(resource_id);
-  if (!base::Delete(path, false /* recursive */))
+  if (!base::DeleteFile(path, false /* recursive */))
     return FILE_ERROR_FAILED;
 
   // Now that all file operations have completed, remove from metadata.
   return storage_->RemoveCacheEntry(resource_id) ?
       FILE_ERROR_OK : FILE_ERROR_FAILED;
 }
 
 void FileCache::ClearAllOnUIThread(const ClearAllCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 155 matching lines @@
 
   if (it->HasError())
     return false;
 
   // Remove files.
   base::FileEnumerator enumerator(cache_file_directory_,
                                   false,  // not recursive
                                   base::FileEnumerator::FILES);
   for (base::FilePath file = enumerator.Next(); !file.empty();
        file = enumerator.Next())
-    base::Delete(file, false /* recursive */);
+    base::DeleteFile(file, false /* recursive */);
 
   return true;
 }
 
 bool FileCache::HasEnoughSpaceFor(int64 num_bytes,
                                   const base::FilePath& path) {
   int64 free_space = 0;
   if (free_disk_space_getter_)
     free_space = free_disk_space_getter_->AmountOfFreeDiskSpace();
   else
@@ skipping 20 matching lines @@
         if (storage_->GetCacheEntry(it->GetKey(), &entry))
           continue;  // Do not overwrite.
 
         storage_->PutCacheEntry(it->GetKey(), it->GetValue());
       }
       imported = true;
     }
   }
 
   // Delete old DB.
-  base::Delete(old_db_path, true /* recursive */ );
+  base::DeleteFile(old_db_path, true /* recursive */ );
   return imported;
 }
 
 void FileCache::RenameCacheFilesToNewFormat() {
   // First, remove all files with multiple extensions just in case.
   {
     base::FileEnumerator enumerator(cache_file_directory_,
                                     false,  // not recursive
                                     base::FileEnumerator::FILES,
                                     "*.*.*");
     for (base::FilePath current = enumerator.Next(); !current.empty();
          current = enumerator.Next())
-      base::Delete(current, false /* recursive */);
+      base::DeleteFile(current, false /* recursive */);
   }
 
   // Rename files.
   {
     base::FileEnumerator enumerator(cache_file_directory_,
                                     false,  // not recursive
                                     base::FileEnumerator::FILES);
     for (base::FilePath current = enumerator.Next(); !current.empty();
          current = enumerator.Next())
       base::Move(current, current.RemoveExtension());
   }
 }
 
 }  // namespace internal
 }  // namespace drive