summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/file_stream_unittest.cc4
-rw-r--r--net/disk_cache/backend_unittest.cc4
-rw-r--r--net/disk_cache/cache_util_posix.cc2
-rw-r--r--net/disk_cache/entry_unittest.cc2
-rw-r--r--net/disk_cache/simple/simple_index_file.cc8
-rw-r--r--net/disk_cache/simple/simple_synchronous_entry.cc2
-rw-r--r--net/http/http_cache.cc2
-rw-r--r--net/http/http_network_transaction_unittest.cc6
-rw-r--r--net/proxy/proxy_config_service_linux_unittest.cc2
-rw-r--r--net/socket/unix_domain_socket_posix_unittest.cc2
-rw-r--r--net/url_request/url_fetcher_response_writer.cc2
-rw-r--r--net/url_request/url_request_unittest.cc6
12 files changed, 21 insertions, 21 deletions
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index 02f0072..1a159676 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -44,7 +44,7 @@ class FileStreamTest : public PlatformTest {
file_util::WriteFile(temp_file_path_, kTestData, kTestDataSize);
}
virtual void TearDown() {
- EXPECT_TRUE(base::Delete(temp_file_path_, false));
+ EXPECT_TRUE(base::DeleteFile(temp_file_path_, false));
PlatformTest::TearDown();
}
@@ -116,7 +116,7 @@ TEST_F(FileStreamTest, UseFileHandle) {
read_stream.reset();
// 2. Test writing with a file handle.
- base::Delete(temp_file_path(), false);
+ base::DeleteFile(temp_file_path(), false);
flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_WRITE;
file = base::CreatePlatformFile(temp_file_path(), flags, &created, NULL);
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 91b9a14..31adbc4 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -277,7 +277,7 @@ TEST_F(DiskCacheTest, CreateBackend) {
TEST_F(DiskCacheBackendTest, CreateBackend_MissingFile) {
ASSERT_TRUE(CopyTestCache("bad_entry"));
base::FilePath filename = cache_path_.AppendASCII("data_1");
- base::Delete(filename, false);
+ base::DeleteFile(filename, false);
base::Thread cache_thread("CacheThread");
ASSERT_TRUE(cache_thread.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
@@ -2783,7 +2783,7 @@ TEST_F(DiskCacheBackendTest, FileSharing) {
EXPECT_TRUE(file2.IsValid());
#endif
- EXPECT_TRUE(base::Delete(name, false));
+ EXPECT_TRUE(base::DeleteFile(name, false));
// We should be able to use the file.
const int kSize = 200;
diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc
index 4e8e647..b33c560 100644
--- a/net/disk_cache/cache_util_posix.cc
+++ b/net/disk_cache/cache_util_posix.cc
@@ -40,7 +40,7 @@ bool MoveCache(const base::FilePath& from_path, const base::FilePath& to_path) {
}
bool DeleteCacheFile(const base::FilePath& name) {
- return base::Delete(name, false);
+ return base::DeleteFile(name, false);
}
} // namespace disk_cache
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index f7f8d7b..9492a9e 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -1539,7 +1539,7 @@ TEST_F(DiskCacheEntryTest, MissingData) {
disk_cache::Addr address(0x80000001);
base::FilePath name = cache_impl_->GetFileName(address);
- EXPECT_TRUE(base::Delete(name, false));
+ EXPECT_TRUE(base::DeleteFile(name, false));
// Attempt to read the data.
ASSERT_EQ(net::OK, OpenEntry(key, &entry));
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc
index e154553..ab794079 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -51,7 +51,7 @@ void WriteToDiskInternal(const base::FilePath& index_filename,
// TODO(felipeg): Add better error handling.
LOG(ERROR) << "Could not write Simple Cache index to temporary file: "
<< temp_filename.value();
- base::Delete(temp_filename, /* recursive = */ false);
+ base::DeleteFile(temp_filename, /* recursive = */ false);
} else {
// Swap temp and index_file.
bool result = base::ReplaceFile(temp_filename, index_filename, NULL);
@@ -229,14 +229,14 @@ scoped_ptr<SimpleIndex::EntrySet> SimpleIndexFile::SyncLoadFromDisk(
std::string contents;
if (!file_util::ReadFileToString(index_filename, &contents)) {
LOG(WARNING) << "Could not read Simple Index file.";
- base::Delete(index_filename, false);
+ base::DeleteFile(index_filename, false);
return scoped_ptr<SimpleIndex::EntrySet>();
}
scoped_ptr<SimpleIndex::EntrySet> entries =
SimpleIndexFile::Deserialize(contents.data(), contents.size());
if (!entries) {
- base::Delete(index_filename, false);
+ base::DeleteFile(index_filename, false);
return scoped_ptr<SimpleIndex::EntrySet>();
}
@@ -316,7 +316,7 @@ scoped_ptr<SimpleIndex::EntrySet> SimpleIndexFile::SyncRestoreFromDisk(
const base::FilePath& index_file_path) {
LOG(INFO) << "Simple Cache Index is being restored from disk.";
- base::Delete(index_file_path, /* recursive = */ false);
+ base::DeleteFile(index_file_path, /* recursive = */ false);
scoped_ptr<SimpleIndex::EntrySet> index_file_entries(
new SimpleIndex::EntrySet());
diff --git a/net/disk_cache/simple/simple_synchronous_entry.cc b/net/disk_cache/simple/simple_synchronous_entry.cc
index 421591d..2b9c687 100644
--- a/net/disk_cache/simple/simple_synchronous_entry.cc
+++ b/net/disk_cache/simple/simple_synchronous_entry.cc
@@ -185,7 +185,7 @@ bool SimpleSynchronousEntry::DeleteFilesForEntryHash(
for (int i = 0; i < kSimpleEntryFileCount; ++i) {
FilePath to_delete = path.AppendASCII(
GetFilenameFromEntryHashAndIndex(entry_hash, i));
- if (!base::Delete(to_delete, false)) {
+ if (!base::DeleteFile(to_delete, false)) {
result = false;
DLOG(ERROR) << "Could not delete " << to_delete.MaybeAsASCII();
}
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 5c53148..4ad816d 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -45,7 +45,7 @@ namespace {
// Adaptor to delete a file on a worker thread.
void DeletePath(base::FilePath path) {
- base::Delete(path, false);
+ base::DeleteFile(path, false);
}
} // namespace
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 11141ba..140ed3e 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -7611,7 +7611,7 @@ TEST_P(HttpNetworkTransactionTest, UploadFileSmallerThanLength) {
EXPECT_EQ(OK, rv);
EXPECT_EQ("hello world", response_data);
- base::Delete(temp_file_path, false);
+ base::DeleteFile(temp_file_path, false);
}
TEST_P(HttpNetworkTransactionTest, UploadUnreadableFile) {
@@ -7671,7 +7671,7 @@ TEST_P(HttpNetworkTransactionTest, UploadUnreadableFile) {
EXPECT_TRUE(response->headers.get() != NULL);
EXPECT_EQ("HTTP/1.0 200 OK", response->headers->GetStatusLine());
- base::Delete(temp_file, false);
+ base::DeleteFile(temp_file, false);
}
TEST_P(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) {
@@ -7762,7 +7762,7 @@ TEST_P(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) {
EXPECT_TRUE(response->auth_challenge.get() == NULL);
EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
- base::Delete(temp_file, false);
+ base::DeleteFile(temp_file, false);
}
// Tests that changes to Auth realms are treated like auth rejections.
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index b024e08..03bba04 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -371,7 +371,7 @@ class ProxyConfigServiceLinuxTest : public PlatformTest {
virtual void TearDown() OVERRIDE {
// Delete the temporary KDE home directory.
- base::Delete(user_home_, true);
+ base::DeleteFile(user_home_, true);
PlatformTest::TearDown();
}
diff --git a/net/socket/unix_domain_socket_posix_unittest.cc b/net/socket/unix_domain_socket_posix_unittest.cc
index cc1f83a..41cd78f 100644
--- a/net/socket/unix_domain_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_socket_posix_unittest.cc
@@ -183,7 +183,7 @@ class UnixDomainSocketTestHelper : public testing::Test {
void DeleteSocketFile() {
ASSERT_FALSE(file_path_.empty());
- base::Delete(file_path_, false /* not recursive */);
+ base::DeleteFile(file_path_, false /* not recursive */);
}
SocketDescriptor CreateClientSocket() {
diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc
index 5e32f98..cb30dad 100644
--- a/net/url_request/url_fetcher_response_writer.cc
+++ b/net/url_request/url_fetcher_response_writer.cc
@@ -130,7 +130,7 @@ void URLFetcherFileWriter::CloseAndDeleteFile() {
file_stream_.reset();
DisownFile();
file_task_runner_->PostTask(FROM_HERE,
- base::Bind(base::IgnoreResult(&base::Delete),
+ base::Bind(base::IgnoreResult(&base::DeleteFile),
file_path_,
false /* recursive */));
}
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 02878b0..e3a3be8 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -765,7 +765,7 @@ TEST_F(URLRequestTest, FileTestFullSpecifiedRange) {
EXPECT_TRUE(partial_buffer_string == d.data_received());
}
- EXPECT_TRUE(base::Delete(temp_path, false));
+ EXPECT_TRUE(base::DeleteFile(temp_path, false));
}
TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) {
@@ -808,7 +808,7 @@ TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) {
EXPECT_TRUE(partial_buffer_string == d.data_received());
}
- EXPECT_TRUE(base::Delete(temp_path, false));
+ EXPECT_TRUE(base::DeleteFile(temp_path, false));
}
TEST_F(URLRequestTest, FileTestMultipleRanges) {
@@ -839,7 +839,7 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) {
EXPECT_TRUE(d.request_failed());
}
- EXPECT_TRUE(base::Delete(temp_path, false));
+ EXPECT_TRUE(base::DeleteFile(temp_path, false));
}
TEST_F(URLRequestTest, InvalidUrlTest) {
generated by cgit v1.1 at 2025-02-14 15:32:46 +0000