diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 23:07:36 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 23:07:36 +0000 |
| commit | 5553d5bcd8c1f0d90d74a2a52a4c9af51d730d01 (patch) | |
| tree | f719fa0c440cb3492ccf9c9a2739afd5af5eace6 /content/browser | |
| parent | 10c1234fe5e6b43cd9f2f03f91da2c96083c7643 (diff) | |
| download | chromium_src-5553d5bcd8c1f0d90d74a2a52a4c9af51d730d01.zip chromium_src-5553d5bcd8c1f0d90d74a2a52a4c9af51d730d01.tar.gz chromium_src-5553d5bcd8c1f0d90d74a2a52a4c9af51d730d01.tar.bz2 | |
Move DeleteAfterReboot, Move, and ReplaceFile to base namespace
Rename ReplaceFileAndGetError (only used once) to ReplaceFile (used 5 times) and have each of those callers specify NULL for the output error if they don't care.
Remove InsertBeforeExtension from file_util.cc which seems to be unused.
BUG=
Review URL: https://codereview.chromium.org/18383003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
4 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/download/base_file_posix.cc b/content/browser/download/base_file_posix.cc index bd351ad..1900942 100644 --- a/content/browser/download/base_file_posix.cc +++ b/content/browser/download/base_file_posix.cc @@ -29,7 +29,7 @@ DownloadInterruptReason BaseFile::MoveFileAndAdjustPermissions( // TODO(estade): Move() falls back to copying and deleting when a simple // rename fails. Copying sucks for large downloads. crbug.com/8737 - if (!file_util::Move(full_path_, new_path)) + if (!base::Move(full_path_, new_path)) return LogSystemError("Move", errno); if (stat_succeeded) { diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc index 8c8b5c5..20af748 100644 --- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc @@ -157,7 +157,7 @@ int32_t PepperFlashFileMessageFilter::OnRenameFile( base::PLATFORM_FILE_ERROR_ACCESS_DENIED); } - bool result = file_util::Move(from_full_path, to_full_path); + bool result = base::Move(from_full_path, to_full_path); return ppapi::PlatformFileErrorToPepperError(result ? base::PLATFORM_FILE_OK : base::PLATFORM_FILE_ERROR_ACCESS_DENIED); } diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index 6a90f8a..3750a723 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.cc @@ -337,7 +337,7 @@ void BlockingGarbageCollect( path != trash_directory) { // Since |trash_directory| is unique for each run of this function there // can be no colllisions on the move. - file_util::Move(path, trash_directory.Append(path.BaseName())); + base::Move(path, trash_directory.Append(path.BaseName())); } } diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index ab06293..414537b 100644 --- a/content/browser/web_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -255,8 +255,8 @@ void WebContentsDragWin::PrepareDragForDownload( // We cannot know when the target application will be done using the temporary // file, so schedule it to be deleted after rebooting. - file_util::DeleteAfterReboot(download_path); - file_util::DeleteAfterReboot(temp_dir_path); + base::DeleteAfterReboot(download_path); + base::DeleteAfterReboot(temp_dir_path); // Provide the data as file (CF_HDROP). A temporary download file with the // Zone.Identifier ADS (Alternate Data Stream) attached will be created. |