Move DeleteAfterReboot and Move to 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 429 matching lines @@
       break;
     }
     std::wstring extension = file.Extension();
     if (extension == &kExtExe[0] || extension == &kExtDll[0]) {
       doing_great = UpdateVersionIfMatch(file, &ctx);
     }
   } while (doing_great);
 
   // Change the versioned directory.
   base::FilePath chrome_bin = work_dir.Append(&kChromeBin[0]);
-  doing_great = file_util::Move(chrome_bin.Append(ctx.current_version_str),
-                                chrome_bin.Append(ctx.new_version_str));
+  doing_great = base::Move(chrome_bin.Append(ctx.current_version_str),
+                           chrome_bin.Append(ctx.new_version_str));
 
   if (doing_great) {
     // Report the version numbers if requested.
     if (original_version != NULL)
       original_version->assign(ctx.current_version_str);
     if (new_version != NULL)
       new_version->assign(ctx.new_version_str);
   }
 
   return doing_great;
@@ skipping 180 matching lines @@
                       MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                       setup_ex_) ||
       !updater.Update(&kChromePacked7z[0], &kB7[0],
                       MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                       chrome_packed_7z) ||
       !updater.Commit()) {
     return false;
   }
 
   // Finally, move the updated mini_installer into place.
-  return file_util::Move(mini_installer, target_path);
+  return base::Move(mini_installer, target_path);
 }
 
 bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
                                     const base::FilePath& target_file,
                                     Direction direction) {
   VisitResourceContext ctx;
   if (!GetFileVersion(original_file, &ctx.current_version)) {
     LOG(DFATAL) << "Failed reading version from \"" << original_file.value()
                 << "\"";
     return false;
@@ skipping 29 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