summaryrefslogtreecommitdiffstats
path: root/chrome/installer/test
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/installer/test
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/installer/test')
-rw-r--r--chrome/installer/test/alternate_version_generator.cc8
-rw-r--r--chrome/installer/test/upgrade_test.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc
index 54458fd..44361d5 100644
--- a/chrome/installer/test/alternate_version_generator.cc
+++ b/chrome/installer/test/alternate_version_generator.cc
@@ -75,7 +75,7 @@ class ScopedTempDirectory {
public:
ScopedTempDirectory() { }
~ScopedTempDirectory() {
- if (!directory_.empty() && !file_util::Delete(directory_, true)) {
+ if (!directory_.empty() && !base::Delete(directory_, true)) {
LOG(DFATAL) << "Failed deleting temporary directory \""
<< directory_.value() << "\"";
}
@@ -602,9 +602,9 @@ bool GenerateAlternateVersion(const base::FilePath& original_installer_path,
// Get rid of intermediate files
base::FilePath chrome_7z(chrome_7z_name);
- if (!file_util::Delete(chrome_7z, false) ||
- !file_util::Delete(chrome_packed_7z, false) ||
- !file_util::Delete(setup_ex_, false)) {
+ if (!base::Delete(chrome_7z, false) ||
+ !base::Delete(chrome_packed_7z, false) ||
+ !base::Delete(setup_ex_, false)) {
LOG(DFATAL) << "Failed deleting intermediate files";
return false;
}
diff --git a/chrome/installer/test/upgrade_test.cc b/chrome/installer/test/upgrade_test.cc
index ee02414..7c9f9bd 100644
--- a/chrome/installer/test/upgrade_test.cc
+++ b/chrome/installer/test/upgrade_test.cc
@@ -32,7 +32,7 @@ class UpgradeTest : public testing::Test {
// Clean up by deleting the created newer version of mini_installer.exe.
static void TearDownTestCase() {
- EXPECT_TRUE(file_util::Delete(next_mini_installer_path_, false));
+ EXPECT_TRUE(base::Delete(next_mini_installer_path_, false));
}
private:
static base::FilePath next_mini_installer_path_;