Move DeleteAfterReboot and Move to base namespace

chrome/installer/util/copy_tree_work_item.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/installer/util/copy_tree_work_item.h"
 
 #include <shlwapi.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 60 matching lines @@
 
   // In all cases that reach here, move dest to a backup path.
   if (dest_exist) {
     if (!backup_path_.CreateUniqueTempDirUnderPath(temp_dir_)) {
       PLOG(ERROR) << "Failed to get backup path in folder "
                   << temp_dir_.value();
       return false;
     }
 
     base::FilePath backup = backup_path_.path().Append(dest_path_.BaseName());
-    if (file_util::Move(dest_path_, backup)) {
+    if (base::Move(dest_path_, backup)) {
       moved_to_backup_ = true;
       VLOG(1) << "Moved destination " << dest_path_.value() <<
                  " to backup path " << backup.value();
     } else {
       LOG(ERROR) << "failed moving " << dest_path_.value()
                  << " to " << backup.value();
       return false;
     }
   }
 
@@ skipping 15 matching lines @@
   // Normally the delete operations below should not fail unless some
   // programs like anti-virus are inspecting the files we just copied.
   // If this does happen sometimes, we may consider using Move instead of
   // Delete here. For now we just log the error and continue with the
   // rest of rollback operation.
   if (copied_to_dest_path_ && !base::Delete(dest_path_, true)) {
     LOG(ERROR) << "Can not delete " << dest_path_.value();
   }
   if (moved_to_backup_) {
     base::FilePath backup(backup_path_.path().Append(dest_path_.BaseName()));
-    if (!file_util::Move(backup, dest_path_)) {
+    if (!base::Move(backup, dest_path_)) {
       LOG(ERROR) << "failed move " << backup.value()
                  << " to " << dest_path_.value();
     }
   }
   if (copied_to_alternate_path_ &&
       !base::Delete(alternative_path_, true)) {
     LOG(ERROR) << "Can not delete " << alternative_path_.value();
   }
 }
 
 bool CopyTreeWorkItem::IsFileInUse(const base::FilePath& path) {
   if (!file_util::PathExists(path))
     return false;
 
   HANDLE handle = ::CreateFile(path.value().c_str(), FILE_ALL_ACCESS,
                                NULL, NULL, OPEN_EXISTING, NULL, NULL);
   if (handle  == INVALID_HANDLE_VALUE)
     return true;
 
   CloseHandle(handle);
   return false;
 }