Rename base::Delete to base::DeleteFile

Also renames DeleteAfterReboot to DeleteFileAfterReboot, and removes FileUtilProxy::RecursiveDelete which was never called.

BUG=
R=shess@chromium.org

Review URL: https://codereview.chromium.org/18584011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211822 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 5 deletions

diff --git a/cloud_print/service/win/installer.cc b/cloud_print/service/win/installer.cc
index 9d0de9e..9a2602d 100644
--- a/cloud_print/service/win/installer.cc
+++ b/cloud_print/service/win/installer.cc
@@ -64,9 +64,9 @@ void DeleteShortcut(int dir_key, bool with_subdir) {
   if (path.empty())
     return;
   if (with_subdir)
-    base::Delete(path.DirName(), true);
+    base::DeleteFile(path.DirName(), true);
   else
-    base::Delete(path, false);
+    base::DeleteFile(path, false);
 }
 
 void DeleteShortcuts() {
@@ -95,7 +95,7 @@ HRESULT ProcessInstallerSwitches() {
     if (!old_location.empty() &&
         cloud_print::IsProgramsFilesParent(old_location) &&
         old_location != cloud_print::GetInstallLocation(kGoogleUpdateId)) {
-      base::Delete(old_location, true);
+      base::DeleteFile(old_location, true);
     }
 
     cloud_print::SetGoogleUpdateKeys(
@@ -120,7 +120,7 @@ HRESULT ProcessInstallerSwitches() {
     base::FilePath delete_path = command_line.GetSwitchValuePath(kDeleteSwitch);
     if (!delete_path.empty() &&
         cloud_print::IsProgramsFilesParent(delete_path)) {
-      base::Delete(delete_path, true);
+      base::DeleteFile(delete_path, true);
     }
     return S_OK;
   }
diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc
index 2b35b62..96c6bbf 100644
--- a/cloud_print/service/win/service_listener.cc
+++ b/cloud_print/service/win/service_listener.cc
@@ -43,7 +43,7 @@ std::string GetEnvironment(const base::FilePath& user_data_dir) {
       DCHECK(base::PathExists(temp_file));
       environment.SetString(SetupListener::kUserDataDirJsonValueName,
                             user_data_dir.value());
-      base::Delete(temp_file, false);
+      base::DeleteFile(temp_file, false);
     }
   }