summaryrefslogtreecommitdiffstats
path: root/webkit/browser/fileapi
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/browser/fileapi')
-rw-r--r--webkit/browser/fileapi/file_system_usage_cache.cc2
-rw-r--r--webkit/browser/fileapi/native_file_util.cc4
-rw-r--r--webkit/browser/fileapi/obfuscated_file_util.cc12
-rw-r--r--webkit/browser/fileapi/obfuscated_file_util_unittest.cc4
-rw-r--r--webkit/browser/fileapi/sandbox_database_test_helper.cc2
-rw-r--r--webkit/browser/fileapi/sandbox_directory_database.cc4
-rw-r--r--webkit/browser/fileapi/sandbox_directory_database_unittest.cc6
-rw-r--r--webkit/browser/fileapi/sandbox_isolated_origin_database.cc2
-rw-r--r--webkit/browser/fileapi/sandbox_origin_database.cc6
9 files changed, 21 insertions, 21 deletions
diff --git a/webkit/browser/fileapi/file_system_usage_cache.cc b/webkit/browser/fileapi/file_system_usage_cache.cc
index 9dcfaee..c1896fb 100644
--- a/webkit/browser/fileapi/file_system_usage_cache.cc
+++ b/webkit/browser/fileapi/file_system_usage_cache.cc
@@ -156,7 +156,7 @@ bool FileSystemUsageCache::Delete(const base::FilePath& usage_file_path) {
TRACE_EVENT0("FileSystem", "UsageCache::Delete");
DCHECK(CalledOnValidThread());
CloseCacheFiles();
- return base::Delete(usage_file_path, true);
+ return base::DeleteFile(usage_file_path, true);
}
void FileSystemUsageCache::CloseCacheFiles() {
diff --git a/webkit/browser/fileapi/native_file_util.cc b/webkit/browser/fileapi/native_file_util.cc
index efc6d42..32e9467 100644
--- a/webkit/browser/fileapi/native_file_util.cc
+++ b/webkit/browser/fileapi/native_file_util.cc
@@ -242,7 +242,7 @@ PlatformFileError NativeFileUtil::DeleteFile(const base::FilePath& path) {
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
if (base::DirectoryExists(path))
return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
- if (!base::Delete(path, false))
+ if (!base::DeleteFile(path, false))
return base::PLATFORM_FILE_ERROR_FAILED;
return base::PLATFORM_FILE_OK;
}
@@ -254,7 +254,7 @@ PlatformFileError NativeFileUtil::DeleteDirectory(const base::FilePath& path) {
return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
if (!file_util::IsDirectoryEmpty(path))
return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
- if (!base::Delete(path, false))
+ if (!base::DeleteFile(path, false))
return base::PLATFORM_FILE_ERROR_FAILED;
return base::PLATFORM_FILE_OK;
}
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index c4baa68..e0b5012 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -901,7 +901,7 @@ bool ObfuscatedFileUtil::DeleteDirectoryForOriginAndType(
// implementation.
// Information about failure would be useful for debugging.
DestroyDirectoryDatabase(origin, type);
- if (!base::Delete(origin_type_path, true /* recursive */))
+ if (!base::DeleteFile(origin_type_path, true /* recursive */))
return false;
}
@@ -935,7 +935,7 @@ bool ObfuscatedFileUtil::DeleteDirectoryForOriginAndType(
origin_database_->RemovePathForOrigin(
webkit_database::GetIdentifierFromOrigin(origin));
}
- if (!base::Delete(origin_path, true /* recursive */))
+ if (!base::DeleteFile(origin_path, true /* recursive */))
return false;
return true;
@@ -1104,7 +1104,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
created = true;
} else {
if (base::PathExists(dest_local_path)) {
- if (!base::Delete(dest_local_path, true /* recursive */)) {
+ if (!base::DeleteFile(dest_local_path, true /* recursive */)) {
NOTREACHED();
return base::PLATFORM_FILE_ERROR_FAILED;
}
@@ -1129,7 +1129,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
if (handle) {
DCHECK_NE(base::kInvalidPlatformFileValue, *handle);
base::ClosePlatformFile(*handle);
- base::Delete(dest_local_path, false /* recursive */);
+ base::DeleteFile(dest_local_path, false /* recursive */);
}
return base::PLATFORM_FILE_ERROR_FAILED;
}
@@ -1145,7 +1145,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
DCHECK_NE(base::kInvalidPlatformFileValue, *handle);
base::ClosePlatformFile(*handle);
}
- base::Delete(dest_local_path, false /* recursive */);
+ base::DeleteFile(dest_local_path, false /* recursive */);
return base::PLATFORM_FILE_ERROR_FAILED;
}
TouchDirectory(db, dest_file_info->parent_id);
@@ -1240,7 +1240,7 @@ base::FilePath ObfuscatedFileUtil::GetDirectoryForOrigin(
base::FilePath path = file_system_directory_.Append(directory_name);
bool exists_in_fs = base::DirectoryExists(path);
if (!exists_in_db && exists_in_fs) {
- if (!base::Delete(path, true)) {
+ if (!base::DeleteFile(path, true)) {
if (error_code)
*error_code = base::PLATFORM_FILE_ERROR_FAILED;
return base::FilePath();
diff --git a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
index 1ceef8d..0e420e8 100644
--- a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
@@ -867,7 +867,7 @@ TEST_F(ObfuscatedFileUtilTest, TestQuotaOnTruncation) {
UnlimitedContext().get(),
url, &local_path));
ASSERT_FALSE(local_path.empty());
- ASSERT_TRUE(base::Delete(local_path, false));
+ ASSERT_TRUE(base::DeleteFile(local_path, false));
EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
ofu()->Truncate(
@@ -1670,7 +1670,7 @@ TEST_F(ObfuscatedFileUtilTest, TestIncompleteDirectoryReading) {
base::FilePath local_path;
EXPECT_EQ(base::PLATFORM_FILE_OK,
ofu()->GetLocalFilePath(context.get(), kPath[0], &local_path));
- EXPECT_TRUE(base::Delete(local_path, false));
+ EXPECT_TRUE(base::DeleteFile(local_path, false));
entries.clear();
EXPECT_EQ(base::PLATFORM_FILE_OK,
diff --git a/webkit/browser/fileapi/sandbox_database_test_helper.cc b/webkit/browser/fileapi/sandbox_database_test_helper.cc
index 18babdb..6364b2b 100644
--- a/webkit/browser/fileapi/sandbox_database_test_helper.cc
+++ b/webkit/browser/fileapi/sandbox_database_test_helper.cc
@@ -90,7 +90,7 @@ void DeleteDatabaseFile(const base::FilePath& db_path,
EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
&number, &file_type));
if (file_type == type) {
- base::Delete(file_path, false);
+ base::DeleteFile(file_path, false);
// We may have multiple files for the same type, so don't break here.
}
}
diff --git a/webkit/browser/fileapi/sandbox_directory_database.cc b/webkit/browser/fileapi/sandbox_directory_database.cc
index 5e4ba3d..19e9c25 100644
--- a/webkit/browser/fileapi/sandbox_directory_database.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database.cc
@@ -309,7 +309,7 @@ bool DatabaseCheckHelper::ScanDirectory() {
std::set<base::FilePath>::iterator itr =
files_in_db_.find(relative_file_path);
if (itr == files_in_db_.end()) {
- if (!base::Delete(absolute_file_path, false))
+ if (!base::DeleteFile(absolute_file_path, false))
return false;
} else {
files_in_db_.erase(itr);
@@ -748,7 +748,7 @@ bool SandboxDirectoryDatabase::Init(RecoveryOption recovery_option) {
// fall through
case DELETE_ON_CORRUPTION:
LOG(WARNING) << "Clearing SandboxDirectoryDatabase.";
- if (!base::Delete(filesystem_data_directory_, true))
+ if (!base::DeleteFile(filesystem_data_directory_, true))
return false;
if (!file_util::CreateDirectory(filesystem_data_directory_))
return false;
diff --git a/webkit/browser/fileapi/sandbox_directory_database_unittest.cc b/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
index 9278129..593ead9 100644
--- a/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
@@ -100,7 +100,7 @@ class SandboxDirectoryDatabaseTest : public testing::Test {
void ClearDatabaseAndDirectory() {
db_.reset();
- ASSERT_TRUE(base::Delete(path(), true /* recursive */));
+ ASSERT_TRUE(base::DeleteFile(path(), true /* recursive */));
ASSERT_TRUE(file_util::CreateDirectory(path()));
db_.reset(new SandboxDirectoryDatabase(path()));
}
@@ -535,7 +535,7 @@ TEST_F(SandboxDirectoryDatabaseTest,
CreateFile(0, FPL("foo"), kBackingFileName, NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
- ASSERT_TRUE(base::Delete(path().Append(kBackingFileName), false));
+ ASSERT_TRUE(base::DeleteFile(path().Append(kBackingFileName), false));
CreateFile(0, FPL("bar"), kBackingFileName, NULL);
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
@@ -545,7 +545,7 @@ TEST_F(SandboxDirectoryDatabaseTest, TestConsistencyCheck_FileLost) {
CreateFile(0, FPL("foo"), kBackingFileName, NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
- ASSERT_TRUE(base::Delete(path().Append(kBackingFileName), false));
+ ASSERT_TRUE(base::DeleteFile(path().Append(kBackingFileName), false));
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
diff --git a/webkit/browser/fileapi/sandbox_isolated_origin_database.cc b/webkit/browser/fileapi/sandbox_isolated_origin_database.cc
index d99ef85..77b00f9 100644
--- a/webkit/browser/fileapi/sandbox_isolated_origin_database.cc
+++ b/webkit/browser/fileapi/sandbox_isolated_origin_database.cc
@@ -73,7 +73,7 @@ void SandboxIsolatedOriginDatabase::MigrateDatabaseIfNeeded() {
base::FilePath to_path = file_system_directory_.Append(kOriginDirectory);
if (base::PathExists(to_path))
- base::Delete(to_path, true /* recursive */);
+ base::DeleteFile(to_path, true /* recursive */);
base::Move(from_path, to_path);
}
diff --git a/webkit/browser/fileapi/sandbox_origin_database.cc b/webkit/browser/fileapi/sandbox_origin_database.cc
index f85ddbe..e1ebc91 100644
--- a/webkit/browser/fileapi/sandbox_origin_database.cc
+++ b/webkit/browser/fileapi/sandbox_origin_database.cc
@@ -108,7 +108,7 @@ bool SandboxOriginDatabase::Init(InitOption init_option,
DB_REPAIR_FAILED, DB_REPAIR_MAX);
// fall through
case DELETE_ON_CORRUPTION:
- if (!base::Delete(file_system_directory_, true))
+ if (!base::DeleteFile(file_system_directory_, true))
return false;
if (!file_util::CreateDirectory(file_system_directory_))
return false;
@@ -167,7 +167,7 @@ bool SandboxOriginDatabase::RepairDatabase(const std::string& db_path) {
for (std::set<base::FilePath>::iterator dir_itr = directories.begin();
dir_itr != directories.end();
++dir_itr) {
- if (!base::Delete(file_system_directory_.Append(*dir_itr),
+ if (!base::DeleteFile(file_system_directory_.Append(*dir_itr),
true /* recursive */)) {
DropDatabase();
return false;
@@ -301,7 +301,7 @@ base::FilePath SandboxOriginDatabase::GetDatabasePath() const {
void SandboxOriginDatabase::RemoveDatabase() {
DropDatabase();
- base::Delete(GetDatabasePath(), true /* recursive */);
+ base::DeleteFile(GetDatabasePath(), true /* recursive */);
}
bool SandboxOriginDatabase::GetLastPathNumber(int* number) {
generated by cgit v1.1 at 2025-02-14 15:33:09 +0000