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

Unified Diff: net/url_request/view_cache_helper.cc

Issue 8794003: base::Bind: Convert disk_cache_based_ssl_host_info. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove an OldCompletionCallback. Created 9 years 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
Index: net/url_request/view_cache_helper.cc
diff --git a/net/url_request/view_cache_helper.cc b/net/url_request/view_cache_helper.cc
index e0f6456ac29e6d67565a9c79adbadd3493ae644f..681024559284e12826e5eb25188c04f3b1cc31fa 100644
--- a/net/url_request/view_cache_helper.cc
+++ b/net/url_request/view_cache_helper.cc
@@ -4,6 +4,8 @@
#include "net/url_request/view_cache_helper.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/stringprintf.h"
#include "net/base/escape.h"
#include "net/base/io_buffer.h"
@@ -46,8 +48,10 @@ ViewCacheHelper::ViewCacheHelper()
index_(0),
data_(NULL),
next_state_(STATE_NONE),
+ ALLOW_THIS_IN_INITIALIZER_LIST(cache_callback_(
+ base::Bind(&ViewCacheHelper::OnIOComplete, base::Unretained(this)))),
ALLOW_THIS_IN_INITIALIZER_LIST(
- cache_callback_(this, &ViewCacheHelper::OnIOComplete)),
+ old_cache_callback_(this, &ViewCacheHelper::OnIOComplete)),
ALLOW_THIS_IN_INITIALIZER_LIST(
entry_callback_(new CancelableOldCompletionCallback<ViewCacheHelper>(
this, &ViewCacheHelper::OnIOComplete))) {
@@ -219,7 +223,7 @@ int ViewCacheHelper::DoGetBackend() {
if (!http_cache)
return ERR_FAILED;
- return http_cache->GetBackend(&disk_cache_, &cache_callback_);
+ return http_cache->GetBackend(&disk_cache_, cache_callback_);
}
int ViewCacheHelper::DoGetBackendComplete(int result) {
@@ -242,7 +246,7 @@ int ViewCacheHelper::DoGetBackendComplete(int result) {
int ViewCacheHelper::DoOpenNextEntry() {
next_state_ = STATE_OPEN_NEXT_ENTRY_COMPLETE;
- return disk_cache_->OpenNextEntry(&iter_, &entry_, &cache_callback_);
+ return disk_cache_->OpenNextEntry(&iter_, &entry_, &old_cache_callback_);
}
int ViewCacheHelper::DoOpenNextEntryComplete(int result) {
@@ -262,7 +266,7 @@ int ViewCacheHelper::DoOpenNextEntryComplete(int result) {
int ViewCacheHelper::DoOpenEntry() {
next_state_ = STATE_OPEN_ENTRY_COMPLETE;
- return disk_cache_->OpenEntry(key_, &entry_, &cache_callback_);
+ return disk_cache_->OpenEntry(key_, &entry_, &old_cache_callback_);
}
int ViewCacheHelper::DoOpenEntryComplete(int result) {

Powered by Google App Engine
This is Rietveld 408576698