Reverts a commit that caused ASAN failures, and 2 dependent commits.

net/url_request/view_cache_helper.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/url_request/url_request_context.h"
 
@@ skipping 22 matching lines @@
 }  // namespace.
 
 ViewCacheHelper::ViewCacheHelper()
     : disk_cache_(NULL),
       entry_(NULL),
       iter_(NULL),
       buf_len_(0),
       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(
-          old_cache_callback_(this, &ViewCacheHelper::OnIOComplete)),
+          cache_callback_(this, &ViewCacheHelper::OnIOComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           entry_callback_(new CancelableOldCompletionCallback<ViewCacheHelper>(
               this, &ViewCacheHelper::OnIOComplete))) {
 }
 
 ViewCacheHelper::~ViewCacheHelper() {
   if (entry_)
     entry_->Close();
 
   // Cancel any pending entry callback.
@@ skipping 151 matching lines @@
 int ViewCacheHelper::DoGetBackend() {
   next_state_ = STATE_GET_BACKEND_COMPLETE;
 
   if (!context_->http_transaction_factory())
     return ERR_FAILED;
 
   HttpCache* http_cache = context_->http_transaction_factory()->GetCache();
   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) {
   if (result == ERR_FAILED) {
     data_->append("no disk cache");
     return OK;
   }
 
   DCHECK_EQ(OK, result);
   if (key_.empty()) {
     data_->assign(VIEW_CACHE_HEAD);
     DCHECK(!iter_);
     next_state_ = STATE_OPEN_NEXT_ENTRY;
     return OK;
   }
 
   next_state_ = STATE_OPEN_ENTRY;
   return OK;
 }
 
 int ViewCacheHelper::DoOpenNextEntry() {
   next_state_ = STATE_OPEN_NEXT_ENTRY_COMPLETE;
-  return disk_cache_->OpenNextEntry(&iter_, &entry_, &old_cache_callback_);
+  return disk_cache_->OpenNextEntry(&iter_, &entry_, &cache_callback_);
 }
 
 int ViewCacheHelper::DoOpenNextEntryComplete(int result) {
   if (result == ERR_FAILED) {
     data_->append(VIEW_CACHE_TAIL);
     return OK;
   }
 
   DCHECK_EQ(OK, result);
   data_->append(FormatEntryInfo(entry_, url_prefix_));
   entry_->Close();
   entry_ = NULL;
 
   next_state_ = STATE_OPEN_NEXT_ENTRY;
   return OK;
 }
 
 int ViewCacheHelper::DoOpenEntry() {
   next_state_ = STATE_OPEN_ENTRY_COMPLETE;
-  return disk_cache_->OpenEntry(key_, &entry_, &old_cache_callback_);
+  return disk_cache_->OpenEntry(key_, &entry_, &cache_callback_);
 }
 
 int ViewCacheHelper::DoOpenEntryComplete(int result) {
   if (result == ERR_FAILED) {
     data_->append("no matching cache entry for: " + EscapeForHTML(key_));
     return OK;
   }
 
   data_->assign(VIEW_CACHE_HEAD);
   data_->append(EscapeForHTML(entry_->GetKey()));
@@ skipping 72 matching lines @@
     entry_ = NULL;
   }
   return OK;
 }
 
 void ViewCacheHelper::OnIOComplete(int result) {
   DoLoop(result);
 }
 
 }  // namespace net.