Move file_util::Delete to the base namespace

chrome/installer/test/alternate_version_generator.cc

 // Copyright (c) 2011 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.
 
 // The file contains the implementation of the mini_installer re-versioner.
 // The main function (GenerateNextVersion) does the following in a temp dir:
 // - Extracts and unpacks setup.exe and the Chrome-bin folder from
 //   mini_installer.exe.
 // - Inspects setup.exe to determine the current version.
 // - Runs through all .dll and .exe files:
@@ skipping 57 matching lines @@
 const char kSwitch7zaPath[] = "7za_path";
 const wchar_t kTempDirPrefix[] = L"mini_installer_test_temp";
 
 // A helper class for creating and cleaning a temporary directory.  A temporary
 // directory is created in Initialize and destroyed (along with all of its
 // contents) when the guard instance is destroyed.
 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() << "\"";
     }
   }
   // Creates a temporary directory.
   bool Initialize() {
     DCHECK(directory_.empty());
     if (!file_util::CreateNewTempDirectory(&kTempDirPrefix[0], &directory_)) {
       LOG(DFATAL) << "Failed creating temporary directory.";
       return false;
@@ skipping 506 matching lines @@
 
   // Unpack chrome.7z
   if (LzmaUtil::UnPackArchive(chrome_7z_name, work_dir.directory().value(),
                               NULL) != NO_ERROR) {
     LOG(DFATAL) << "Failed unpacking \"" << chrome_7z_name << "\"";
     return false;
   }
 
   // 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;
   }
 
   // Increment the version in all files.
   ApplyAlternateVersion(work_dir.directory(), direction, original_version,
                         new_version);
 
   // Pack up files into chrome.7z
   if (!CreateArchive(chrome_7z, work_dir.directory().Append(&kChromeBin[0]), 0))
@@ skipping 74 matching lines @@
     return false;
   }
   ctx.current_version_str = ctx.current_version.ToString();
   ctx.new_version = ChromeVersion::FromString(version.GetString());
   ctx.new_version_str = ctx.new_version.ToString();
 
   return UpdateVersionIfMatch(target_file, &ctx);
 }
 
 }  // namespace upgrade_test