Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: net/http/http_cache.cc

Issue 2776007: Http cache: Remove deprecated code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache.cc
===================================================================
--- net/http/http_cache.cc (revision 49439)
+++ net/http/http_cache.cc (working copy)
@@ -37,18 +37,8 @@
int HttpCache::DefaultBackend::CreateBackend(disk_cache::Backend** backend,
CompletionCallback* callback) {
DCHECK_GE(max_bytes_, 0);
- if (callback)
- return disk_cache::CreateCacheBackend(type_, path_, max_bytes_, true,
- thread_, backend, callback);
-
- // This is just old code needed to support synchronous cache creation.
- // TODO(rvargas): Remove this once all callers provide a callback.
- if (type_ == MEMORY_CACHE) {
- *backend = disk_cache::CreateInMemoryCacheBackend(max_bytes_);
- } else {
- *backend = disk_cache::CreateCacheBackend(path_, true, max_bytes_, type_);
- }
- return (*backend ? OK : ERR_FAILED);
+ return disk_cache::CreateCacheBackend(type_, path_, max_bytes_, true,
+ thread_, backend, callback);
}
//-----------------------------------------------------------------------------
@@ -301,19 +291,6 @@
}
}
-disk_cache::Backend* HttpCache::GetBackend() {
- if (disk_cache_.get())
- return disk_cache_.get();
-
- if (backend_factory_.get()) {
- disk_cache::Backend* backend;
- if (OK == backend_factory_->CreateBackend(&backend, NULL))
- disk_cache_.reset(backend);
- backend_factory_.reset(); // Reclaim memory.
- }
- return disk_cache_.get();
-}
-
int HttpCache::GetBackend(disk_cache::Backend** backend,
CompletionCallback* callback) {
DCHECK(callback != NULL);
@@ -354,40 +331,6 @@
}
// static
-bool HttpCache::ReadResponseInfo(disk_cache::Entry* disk_entry,
- HttpResponseInfo* response_info,
- bool* response_truncated) {
- int size = disk_entry->GetDataSize(kResponseInfoIndex);
-
- scoped_refptr<IOBuffer> buffer = new IOBuffer(size);
- int rv = disk_entry->ReadData(kResponseInfoIndex, 0, buffer, size, NULL);
- if (rv != size) {
- DLOG(ERROR) << "ReadData failed: " << rv;
- return false;
- }
-
- return ParseResponseInfo(buffer->data(), size, response_info,
- response_truncated);
-}
-
-// static
-bool HttpCache::WriteResponseInfo(disk_cache::Entry* disk_entry,
- const HttpResponseInfo* response_info,
- bool skip_transient_headers,
- bool response_truncated) {
- Pickle pickle;
- response_info->Persist(
- &pickle, skip_transient_headers, response_truncated);
-
- scoped_refptr<WrappedIOBuffer> data = new WrappedIOBuffer(
- reinterpret_cast<const char*>(pickle.data()));
- int len = static_cast<int>(pickle.size());
-
- return disk_entry->WriteData(kResponseInfoIndex, 0, data, len, NULL,
- true) == len;
-}
-
-// static
bool HttpCache::ParseResponseInfo(const char* data, int len,
HttpResponseInfo* response_info,
bool* response_truncated) {
@@ -401,7 +344,10 @@
if (!buf_len)
return;
- GetBackend();
+ // Do lazy initialization of disk cache if needed.
+ if (!disk_cache_.get())
+ CreateBackend(NULL, NULL); // We don't care about the result.
+
HttpCache::Transaction* trans =
new HttpCache::Transaction(this, enable_range_support_);
MetadataWriter* writer = new MetadataWriter(trans);
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698