summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 19:41:02 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 19:41:02 +0000
commit918efbf64de58c82ffa3cd8799d9ad822811a37a (patch)
tree5ceffb5e1576177d75f1aa8546bcae074df63c1e /chrome_frame
parente07f44f6b208541c9602bb9cc5f311612aaab64a (diff)
downloadchromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.zip
chromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.tar.gz
chromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.tar.bz2
Move file_util::Delete to the base namespace
BUG= Review URL: https://codereview.chromium.org/16950028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/crash_reporting/minidump_test.cc2
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc2
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc4
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.cc2
-rw-r--r--chrome_frame/test/test_scrubber.cc2
-rw-r--r--chrome_frame/test/test_with_web_server.cc4
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 bbb4637..8475b9b 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(file_util::Delete(dump_file_, false));
+ EXPECT_TRUE(base::Delete(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 40f4c1a..80db1b3 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -702,7 +702,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");
- file_util::Delete(session_history_path, true);
+ base::Delete(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 90ef166..13f3c45 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -478,7 +478,7 @@ FakeExternalTab::FakeExternalTab() {
if (file_util::PathExists(user_data_dir_)) {
VLOG(1) << __FUNCTION__ << " deleting IE Profile user data directory "
<< user_data_dir_.value();
- bool deleted = file_util::Delete(user_data_dir_, true);
+ bool deleted = base::Delete(user_data_dir_, true);
LOG_IF(ERROR, !deleted) << "Failed to delete user data directory directory "
<< user_data_dir_.value();
}
@@ -892,7 +892,7 @@ void CFUrlRequestUnittestRunner::StopFileLogger(bool print) {
}
}
- if (!log_file_.empty() && !file_util::Delete(log_file_, false))
+ if (!log_file_.empty() && !base::Delete(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 6db4e01..04f9a52 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() {
- file_util::Delete(etl_log_file_, false);
+ base::Delete(etl_log_file_, false);
}
void Start() {
diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc
index 4bf6014..9699a17 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, file_util::PathExists(data_directory))
<< __FUNCTION__ << " deleting user data directory "
<< data_directory.value();
- bool deleted = file_util::Delete(data_directory, true);
+ bool deleted = base::Delete(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 38e8709..15e16f2 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;
- file_util::Delete(CFInstall_path_, false);
- file_util::Delete(CFInstance_path_, false);
+ base::Delete(CFInstall_path_, false);
+ base::Delete(CFInstance_path_, false);
if (temp_dir_.IsValid())
EXPECT_TRUE(temp_dir_.Delete());
}