Rename base::Delete to base::DeleteFile

chrome/browser/policy/cloud/resource_cache.cc

 // Copyright (c) 2013 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/policy/cloud/resource_cache.h"
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
   // Delete the file before writing to it. This ensures that the write does not
   // follow a symlink planted at |subkey_path|, clobbering a file outside the
   // cache directory. The mechanism is meant to foil file-system-level attacks
   // where a symlink is planted in the cache directory before Chrome has
   // started. An attacker controlling a process running concurrently with Chrome
   // would be able to race against the protection by re-creating the symlink
   // between these two calls. There is nothing in file_util that could be used
   // to protect against such races, especially as the cache is cross-platform
   // and therefore cannot use any POSIX-only tricks.
   return VerifyKeyPathAndGetSubkeyPath(key, true, subkey, &subkey_path) &&
-         base::Delete(subkey_path, false) &&
+         base::DeleteFile(subkey_path, false) &&
          file_util::WriteFile(subkey_path, data.data(), data.size());
 }
 
 bool ResourceCache::Load(const std::string& key,
                          const std::string& subkey,
                          std::string* data) {
   DCHECK(CalledOnValidThread());
   base::FilePath subkey_path;
   // Only read from |subkey_path| if it is not a symlink.
   if (!VerifyKeyPathAndGetSubkeyPath(key, false, subkey, &subkey_path) ||
@@ skipping 26 matching lines @@
         file_util::ReadFileToString(path, &data)) {
       (*contents)[subkey].swap(data);
     }
   }
 }
 
 void ResourceCache::Delete(const std::string& key, const std::string& subkey) {
   DCHECK(CalledOnValidThread());
   base::FilePath subkey_path;
   if (VerifyKeyPathAndGetSubkeyPath(key, false, subkey, &subkey_path))
-    base::Delete(subkey_path, false);
+    base::DeleteFile(subkey_path, false);
   // Delete() does nothing if the directory given to it is not empty. Hence, the
   // call below deletes the directory representing |key| if its last subkey was
   // just removed and does nothing otherwise.
-  base::Delete(subkey_path.DirName(), false);
+  base::DeleteFile(subkey_path.DirName(), false);
 }
 
 void ResourceCache::PurgeOtherSubkeys(
     const std::string& key,
     const std::set<std::string>& subkeys_to_keep) {
   DCHECK(CalledOnValidThread());
   base::FilePath key_path;
   if (!VerifyKeyPath(key, false, &key_path))
     return;
 
   std::set<std::string> encoded_subkeys_to_keep;
   for (std::set<std::string>::const_iterator it = subkeys_to_keep.begin();
        it != subkeys_to_keep.end(); ++it) {
     std::string encoded;
     if (!Base64Encode(*it, &encoded))
       return;
     encoded_subkeys_to_keep.insert(encoded);
   }
 
   base::FileEnumerator enumerator(key_path, false, base::FileEnumerator::FILES);
   for (base::FilePath path = enumerator.Next(); !path.empty();
        path = enumerator.Next()) {
     const std::string name(path.BaseName().MaybeAsASCII());
     if (encoded_subkeys_to_keep.find(name) == encoded_subkeys_to_keep.end())
-      base::Delete(path, false);
+      base::DeleteFile(path, false);
   }
   // Delete() does nothing if the directory given to it is not empty. Hence, the
   // call below deletes the directory representing |key| if all of its subkeys
   // were just removed and does nothing otherwise.
-  base::Delete(key_path, false);
+  base::DeleteFile(key_path, false);
 }
 
 bool ResourceCache::VerifyKeyPath(const std::string& key,
                                   bool allow_create,
                                   base::FilePath* path) {
   std::string encoded;
   if (!Base64Encode(key, &encoded))
     return false;
   *path = cache_dir_.AppendASCII(encoded);
   return allow_create ? file_util::CreateDirectory(*path) :
                         base::DirectoryExists(*path);
 }
 
 bool ResourceCache::VerifyKeyPathAndGetSubkeyPath(const std::string& key,
                                                   bool allow_create_key,
                                                   const std::string& subkey,
                                                   base::FilePath* path) {
   base::FilePath key_path;
   std::string encoded;
   if (!VerifyKeyPath(key, allow_create_key, &key_path) ||
       !Base64Encode(subkey, &encoded)) {
     return false;
   }
   *path = key_path.AppendASCII(encoded);
   return true;
 }
 
 
 }  // namespace policy