diff options
Diffstat (limited to 'chrome/browser/chromeos')
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc index 6ec8436..850caf9 100644 --- a/chrome/browser/chromeos/drive/download_handler.cc +++ b/chrome/browser/chromeos/drive/download_handler.cc @@ -72,7 +72,7 @@ void MoveDownloadedFile(const base::FilePath& downloaded_file, const base::FilePath& dest_path) { if (error != FILE_ERROR_OK) return; - file_util::Move(downloaded_file, dest_path); + base::Move(downloaded_file, dest_path); } // Used to implement CheckForFileExistence(). diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc index 35a960b..2fbce21 100644 --- a/chrome/browser/chromeos/drive/file_cache.cc +++ b/chrome/browser/chromeos/drive/file_cache.cc @@ -81,7 +81,7 @@ void ScanCacheDirectory(const base::FilePath& directory_path, // Moves the file. bool MoveFile(const base::FilePath& source_path, const base::FilePath& dest_path) { - if (!file_util::Move(source_path, dest_path)) { + if (!base::Move(source_path, dest_path)) { LOG(ERROR) << "Failed to move " << source_path.value() << " to " << dest_path.value(); return false; diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc index 45c3074..704450c 100644 --- a/chrome/browser/chromeos/drive/file_system_util.cc +++ b/chrome/browser/chromeos/drive/file_system_util.cc @@ -114,7 +114,7 @@ void MoveAllFilesFromDirectory(const base::FilePath& directory_from, file_from = enumerator.Next()) { const base::FilePath file_to = directory_to.Append(file_from.BaseName()); if (!file_util::PathExists(file_to)) // Do not overwrite existing files. - file_util::Move(file_from, file_to); + base::Move(file_from, file_to); } } diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index 875d61b..dcd09ae 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -851,14 +851,14 @@ void WallpaperManager::MoveCustomWallpapersOnWorker(const UserList& users) { // Appends DUMMY to the file name of moved custom wallpaper. This way we // do not need to update WallpaperInfo for user. to_path = GetCustomWallpaperPath(kSmallWallpaperSubDir, email, "DUMMY"); - file_util::Move(from_path, to_path); + base::Move(from_path, to_path); } from_path = GetWallpaperPathForUser(email, false); if (!file_util::PathExists(from_path)) from_path = from_path.AddExtension(".png"); if (file_util::PathExists(from_path)) { to_path = GetCustomWallpaperPath(kLargeWallpaperSubDir, email, "DUMMY"); - file_util::Move(from_path, to_path); + base::Move(from_path, to_path); } from_path = GetOriginalWallpaperPathForUser(email); if (!file_util::PathExists(from_path)) @@ -866,7 +866,7 @@ void WallpaperManager::MoveCustomWallpapersOnWorker(const UserList& users) { if (file_util::PathExists(from_path)) { to_path = GetCustomWallpaperPath(kOriginalWallpaperSubDir, email, "DUMMY"); - file_util::Move(from_path, to_path); + base::Move(from_path, to_path); } } } diff --git a/chrome/browser/chromeos/policy/app_pack_updater.cc b/chrome/browser/chromeos/policy/app_pack_updater.cc index d700ca0..628150f 100644 --- a/chrome/browser/chromeos/policy/app_pack_updater.cc +++ b/chrome/browser/chromeos/policy/app_pack_updater.cc @@ -494,7 +494,7 @@ void AppPackUpdater::BlockingInstallCacheEntry( } } - if (!file_util::Move(path, cached_crx_path)) { + if (!base::Move(path, cached_crx_path)) { LOG(ERROR) << "Failed to move AppPack crx from " << path.value() << " to " << cached_crx_path.value(); base::Delete(path, true /* recursive */); diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index c46e1b2..5aa6593 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -219,7 +219,7 @@ void SetTimezoneIDFromString(const std::string& id) { } // Move symlink2 to symlink. - if (!file_util::ReplaceFile(timezone_symlink2, timezone_symlink)) { + if (!base::ReplaceFile(timezone_symlink2, timezone_symlink, NULL)) { LOG(ERROR) << "SetTimezoneID: Unable to move symlink " << timezone_symlink2.value() << " to " << timezone_symlink.value(); |