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

6 files changed, 8 insertions, 8 deletions

diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc
index 8475b9b..d8aa653 100644
--- a/chrome_frame/crash_reporting/minidump_test.cc
+++ b/chrome_frame/crash_reporting/minidump_test.cc
@@ -75,7 +75,7 @@ class MinidumpTest: public testing::Test {
     }
 
     dump_file_handle_.Close();
-    EXPECT_TRUE(base::Delete(dump_file_, false));
+    EXPECT_TRUE(base::DeleteFile(dump_file_, false));
   }
 
   void EnsureDumpMapped() {
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index c3c5d4c..ff0e6ef 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -706,7 +706,7 @@ void ClearIESessionHistory() {
   session_history_path = session_history_path.AppendASCII("Microsoft");
   session_history_path = session_history_path.AppendASCII("Internet Explorer");
   session_history_path = session_history_path.AppendASCII("Recovery");
-  base::Delete(session_history_path, true);
+  base::DeleteFile(session_history_path, true);
 }
 
 std::string GetLocalIPv4Address() {
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index d3e3140..0b7d615 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -483,7 +483,7 @@ FakeExternalTab::FakeExternalTab() {
   if (base::PathExists(user_data_dir_)) {
     VLOG(1) << __FUNCTION__ << " deleting IE Profile user data directory "
             << user_data_dir_.value();
-    bool deleted = base::Delete(user_data_dir_, true);
+    bool deleted = base::DeleteFile(user_data_dir_, true);
     LOG_IF(ERROR, !deleted) << "Failed to delete user data directory directory "
                             << user_data_dir_.value();
   }
@@ -901,7 +901,7 @@ void CFUrlRequestUnittestRunner::StopFileLogger(bool print) {
     }
   }
 
-  if (!log_file_.empty() && !base::Delete(log_file_, false))
+  if (!log_file_.empty() && !base::DeleteFile(log_file_, false))
     LOG(ERROR) << "Failed to delete log file " << log_file_.value();
 
   log_file_.clear();
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 04f9a52..f068264 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -1329,7 +1329,7 @@ class EtwPerfSession {
   }
 
   ~EtwPerfSession() {
-    base::Delete(etl_log_file_, false);
+    base::DeleteFile(etl_log_file_, false);
   }
 
   void Start() {
diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc
index 37abcc3..dc8902c 100644
--- a/chrome_frame/test/test_scrubber.cc
+++ b/chrome_frame/test/test_scrubber.cc
@@ -115,7 +115,7 @@ void TestScrubber::CleanUpFromTestRun() {
   VLOG_IF(1, base::PathExists(data_directory))
       << __FUNCTION__ << " deleting user data directory "
       << data_directory.value();
-  bool deleted = base::Delete(data_directory, true);
+  bool deleted = base::DeleteFile(data_directory, true);
   LOG_IF(ERROR, !deleted)
       << "Failed to delete user data directory directory "
       << data_directory.value();
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 06869ad..b002022 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -136,8 +136,8 @@ void ChromeFrameTestWithWebServer::TearDownTestCase() {
   local_address_.clear();
   delete loop_;
   loop_ = NULL;
-  base::Delete(CFInstall_path_, false);
-  base::Delete(CFInstance_path_, false);
+  base::DeleteFile(CFInstall_path_, false);
+  base::DeleteFile(CFInstance_path_, false);
   if (temp_dir_.IsValid())
     EXPECT_TRUE(temp_dir_.Delete());
 }