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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/browser/database/database_tracker.cc | 2 | ||||
| -rw-r--r-- | webkit/browser/fileapi/native_file_util.cc | 2 | ||||
| -rw-r--r-- | webkit/browser/fileapi/sandbox_isolated_origin_database.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index 5adb3bf..aa6838b 100644 --- a/webkit/browser/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -414,7 +414,7 @@ bool DatabaseTracker::DeleteOrigin(const std::string& origin_identifier, for (base::FilePath database = databases.Next(); !database.empty(); database = databases.Next()) { base::FilePath new_file = new_origin_dir.Append(database.BaseName()); - file_util::Move(database, new_file); + base::Move(database, new_file); } base::Delete(origin_dir, true); base::Delete(new_origin_dir, true); // might fail on windows. diff --git a/webkit/browser/fileapi/native_file_util.cc b/webkit/browser/fileapi/native_file_util.cc index 1f6a2e8..e27cb4a 100644 --- a/webkit/browser/fileapi/native_file_util.cc +++ b/webkit/browser/fileapi/native_file_util.cc @@ -231,7 +231,7 @@ PlatformFileError NativeFileUtil::CopyOrMoveFile( if (file_util::CopyFile(src_path, dest_path)) return base::PLATFORM_FILE_OK; } else { - if (file_util::Move(src_path, dest_path)) + if (base::Move(src_path, dest_path)) return base::PLATFORM_FILE_OK; } return base::PLATFORM_FILE_ERROR_FAILED; diff --git a/webkit/browser/fileapi/sandbox_isolated_origin_database.cc b/webkit/browser/fileapi/sandbox_isolated_origin_database.cc index 1f15573..a64ea5e 100644 --- a/webkit/browser/fileapi/sandbox_isolated_origin_database.cc +++ b/webkit/browser/fileapi/sandbox_isolated_origin_database.cc @@ -74,7 +74,7 @@ void SandboxIsolatedOriginDatabase::MigrateDatabaseIfNeeded() { if (file_util::PathExists(to_path)) base::Delete(to_path, true /* recursive */); - file_util::Move(from_path, to_path); + base::Move(from_path, to_path); } database->RemoveDatabase(); |