diff options
Diffstat (limited to 'chrome/browser')
21 files changed, 23 insertions, 24 deletions
diff --git a/chrome/browser/android/crash_dump_manager.cc b/chrome/browser/android/crash_dump_manager.cc index eb41d2c..6ee4e04 100644 --- a/chrome/browser/android/crash_dump_manager.cc +++ b/chrome/browser/android/crash_dump_manager.cc @@ -111,7 +111,7 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path, base::StringPrintf("chromium-renderer-minidump-%016" PRIx64 ".dmp%d", rand, pid); base::FilePath dest_path = crash_dump_dir.Append(filename); - r = file_util::Move(minidump_path, dest_path); + r = base::Move(minidump_path, dest_path); if (!r) { LOG(ERROR) << "Failed to move crash dump from " << minidump_path.value() << " to " << dest_path.value(); 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(); diff --git a/chrome/browser/component_updater/component_patcher_operation.cc b/chrome/browser/component_updater/component_patcher_operation.cc index 0c119919..f814238 100644 --- a/chrome/browser/component_updater/component_patcher_operation.cc +++ b/chrome/browser/component_updater/component_patcher_operation.cc @@ -150,7 +150,7 @@ ComponentUnpacker::Error DeltaUpdateOpCreate::DoParseArguments( ComponentUnpacker::Error DeltaUpdateOpCreate::DoRun(ComponentPatcher*, int* error) { *error = 0; - if (!file_util::Move(patch_abs_path_, output_abs_path_)) + if (!base::Move(patch_abs_path_, output_abs_path_)) return ComponentUnpacker::kDeltaOperationFailure; return ComponentUnpacker::kNone; diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 2b07c40..c7cf4da 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -282,7 +282,7 @@ bool PepperFlashComponentInstaller::Install( GetPepperFlashBaseDirectory().AppendASCII(version.GetString()); if (file_util::PathExists(path)) return false; - if (!file_util::Move(unpack_path, path)) + if (!base::Move(unpack_path, path)) return false; // Installation is done. Now tell the rest of chrome. Both the path service // and to the plugin service. diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc index c608c35..44b66f3 100644 --- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc @@ -270,7 +270,7 @@ bool PnaclComponentInstaller::Install(const base::DictionaryValue& manifest, NotifyInstallError(); return false; } - if (!file_util::Move(unpack_path, path)) { + if (!base::Move(unpack_path, path)) { LOG(WARNING) << "Move failed, not installing."; NotifyInstallError(); return false; diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc index b4a4650..9aa42e0 100644 --- a/chrome/browser/component_updater/swiftshader_component_installer.cc +++ b/chrome/browser/component_updater/swiftshader_component_installer.cc @@ -143,7 +143,7 @@ bool SwiftShaderComponentInstaller::Install( GetSwiftShaderBaseDirectory().AppendASCII(version.GetString()); if (file_util::PathExists(path)) return false; - if (!file_util::Move(unpack_path, path)) + if (!base::Move(unpack_path, path)) return false; // Installation is done. Now tell the rest of chrome. current_version_ = version; diff --git a/chrome/browser/component_updater/test/test_installer.cc b/chrome/browser/component_updater/test/test_installer.cc index 2dc2913..3f9b0e0 100644 --- a/chrome/browser/component_updater/test/test_installer.cc +++ b/chrome/browser/component_updater/test/test_installer.cc @@ -65,7 +65,7 @@ bool VersionedTestInstaller::Install(const base::DictionaryValue& manifest, base::FilePath path; path = install_directory_.AppendASCII(version.GetString()); file_util::CreateDirectory(path.DirName()); - if (!file_util::Move(unpack_path, path)) + if (!base::Move(unpack_path, path)) return false; current_version_ = version; ++install_count_; diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc index 0b1c1b0..bbfebbd 100644 --- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -234,7 +234,7 @@ bool WidevineCdmComponentInstaller::Install( GetWidevineCdmBaseDirectory().AppendASCII(version.GetString()); if (file_util::PathExists(install_path)) return false; - if (!file_util::Move(unpack_path, install_path)) + if (!base::Move(unpack_path, install_path)) return false; base::FilePath adapter_install_path = diff --git a/chrome/browser/extensions/extension_creator_filter_unittest.cc b/chrome/browser/extensions/extension_creator_filter_unittest.cc index 45e9941..48f5806 100644 --- a/chrome/browser/extensions/extension_creator_filter_unittest.cc +++ b/chrome/browser/extensions/extension_creator_filter_unittest.cc @@ -26,7 +26,7 @@ class ExtensionCreatorFilterTest : public PlatformTest { base::FilePath test_file(test_dir_.Append(file_path)); base::FilePath temp_file; EXPECT_TRUE(file_util::CreateTemporaryFileInDir(test_dir_, &temp_file)); - EXPECT_TRUE(file_util::Move(temp_file, test_file)); + EXPECT_TRUE(base::Move(temp_file, test_file)); return test_file; } diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 6a5de4b..9297723 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -2177,7 +2177,7 @@ TEST_F(ExtensionServiceTest, PackExtensionContainingKeyFails) { base::Delete(crx_path, false); // Move the pem file into the extension. - file_util::Move(privkey_path, + base::Move(privkey_path, input_directory.AppendASCII("privkey.pem")); // This pack should fail because of the contained private key. diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index a419c12..2ceb31a 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -737,7 +737,7 @@ void JumpList::RunUpdate() { base::FilePath icon_dir_old(icon_dir_.value() + L"Old"); if (file_util::PathExists(icon_dir_old)) base::Delete(icon_dir_old, true); - file_util::Move(icon_dir_, icon_dir_old); + base::Move(icon_dir_, icon_dir_old); file_util::CreateDirectory(icon_dir_); // Create temporary icon files for shortcuts in the "Most Visited" category. diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index fb66c05..e4eb340 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc @@ -492,7 +492,7 @@ TEST_F(ProfileShortcutManagerTest, RenamedDesktopShortcuts) { GetDefaultShortcutPathForProfile(profile_2_name_); const base::FilePath profile_2_shortcut_path_2 = GetUserShortcutsDirectory().Append(L"MyChrome.lnk"); - ASSERT_TRUE(file_util::Move(profile_2_shortcut_path_1, + ASSERT_TRUE(base::Move(profile_2_shortcut_path_1, profile_2_shortcut_path_2)); // Ensure that a new shortcut does not get made if the old one was renamed. diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index 754e5d6..239a54e 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc @@ -255,7 +255,7 @@ void ListDesktopShortcutsWithCommandLine(const base::FilePath& chrome_exe, // Renames the given desktop shortcut and informs the shell of this change. bool RenameDesktopShortcut(const base::FilePath& old_shortcut_path, const base::FilePath& new_shortcut_path) { - if (!file_util::Move(old_shortcut_path, new_shortcut_path)) + if (!base::Move(old_shortcut_path, new_shortcut_path)) return false; // Notify the shell of the rename, which allows the icon to keep its position diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc index 7f35b6f..234716c 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc @@ -659,7 +659,7 @@ bool SafeBrowsingStoreFile::DoUpdate( return false; const base::FilePath new_filename = TemporaryFileForFilename(filename_); - if (!file_util::Move(new_filename, filename_)) + if (!base::Move(new_filename, filename_)) return false; // Record counts before swapping to caller. diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc index bc133da..90e6a38 100644 --- a/chrome/browser/sessions/session_backend.cc +++ b/chrome/browser/sessions/session_backend.cc @@ -287,8 +287,7 @@ void SessionBackend::MoveCurrentSessionToLastSession() { static_cast<int>(file_size / 1024)); } } - last_session_valid_ = file_util::Move(current_session_path, - last_session_path); + last_session_valid_ = base::Move(current_session_path, last_session_path); } if (file_util::PathExists(current_session_path)) diff --git a/chrome/browser/storage_monitor/image_capture_device.mm b/chrome/browser/storage_monitor/image_capture_device.mm index 15fb913..7a4fe86 100644 --- a/chrome/browser/storage_monitor/image_capture_device.mm +++ b/chrome/browser/storage_monitor/image_capture_device.mm @@ -13,7 +13,7 @@ void RenameFile(const base::FilePath& downloaded_filename, const base::FilePath& desired_filename, base::PlatformFileError* result) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); - bool success = file_util::ReplaceFile(downloaded_filename, desired_filename); + bool success = base::ReplaceFile(downloaded_filename, desired_filename, NULL); *result = success ? base::PLATFORM_FILE_OK : base::PLATFORM_FILE_ERROR_NOT_FOUND; } |