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

chrome/browser/browsing_data_remover.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 "chrome/browser/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 56 matching lines @@
 
 BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
                                          base::Time delete_begin,
                                          base::Time delete_end)
     : profile_(profile),
       quota_manager_(NULL),
       special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
       delete_begin_(delete_begin),
       delete_end_(delete_end),
       ALLOW_THIS_IN_INITIALIZER_LIST(cache_callback_(
-          base::Bind(&BrowsingDataRemover::DoClearCache,
-                     base::Unretained(this)))),
+          this, &BrowsingDataRemover::DoClearCache)),
       next_cache_state_(STATE_NONE),
       cache_(NULL),
       main_context_getter_(profile->GetRequestContext()),
       media_context_getter_(profile->GetRequestContextForMedia()),
       waiting_for_clear_history_(false),
       waiting_for_clear_quota_managed_data_(false),
       waiting_for_clear_networking_history_(false),
       waiting_for_clear_cookies_(false),
       waiting_for_clear_cache_(false),
       waiting_for_clear_lso_data_(false) {
   DCHECK(profile);
 }
 
 BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
                                          TimePeriod time_period,
                                          base::Time delete_end)
     : profile_(profile),
       quota_manager_(NULL),
       special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
       delete_begin_(CalculateBeginDeleteTime(time_period)),
       delete_end_(delete_end),
       ALLOW_THIS_IN_INITIALIZER_LIST(cache_callback_(
-          base::Bind(&BrowsingDataRemover::DoClearCache,
-                     base::Unretained(this)))),
+          this, &BrowsingDataRemover::DoClearCache)),
       next_cache_state_(STATE_NONE),
       cache_(NULL),
       main_context_getter_(profile->GetRequestContext()),
       media_context_getter_(profile->GetRequestContextForMedia()),
       waiting_for_clear_history_(false),
       waiting_for_clear_quota_managed_data_(false),
       waiting_for_clear_networking_history_(false),
       waiting_for_clear_cookies_(false),
       waiting_for_clear_cache_(false),
       waiting_for_clear_lso_data_(false) {
@@ skipping 318 matching lines @@
     switch (next_cache_state_) {
       case STATE_CREATE_MAIN:
       case STATE_CREATE_MEDIA: {
         // Get a pointer to the cache.
         net::URLRequestContextGetter* getter =
             (next_cache_state_ == STATE_CREATE_MAIN) ?
                 main_context_getter_ : media_context_getter_;
         net::HttpTransactionFactory* factory =
             getter->GetURLRequestContext()->http_transaction_factory();
 
-        rv = factory->GetCache()->GetBackend(&cache_, cache_callback_);
+        rv = factory->GetCache()->GetBackend(&cache_, &cache_callback_);
         next_cache_state_ = (next_cache_state_ == STATE_CREATE_MAIN) ?
                                 STATE_DELETE_MAIN : STATE_DELETE_MEDIA;
         break;
       }
       case STATE_DELETE_MAIN:
       case STATE_DELETE_MEDIA: {
         // |cache_| can be null if it cannot be initialized.
         if (cache_) {
           if (delete_begin_.is_null()) {
-            rv = cache_->DoomAllEntries(cache_callback_);
+            rv = cache_->DoomAllEntries(&cache_callback_);
           } else {
             rv = cache_->DoomEntriesBetween(delete_begin_, delete_end_,
-                                            cache_callback_);
+                                            &cache_callback_);
           }
           cache_ = NULL;
         }
         next_cache_state_ = (next_cache_state_ == STATE_DELETE_MAIN) ?
                                 STATE_CREATE_MEDIA : STATE_DONE;
         break;
       }
       case STATE_DONE: {
         cache_ = NULL;
 
@@ skipping 123 matching lines @@
       GetURLRequestContext()->cookie_store()->GetCookieMonster();
   if (cookie_monster) {
       cookie_monster->DeleteAllCreatedBetweenAsync(
           delete_begin_, delete_end_,
           base::Bind(&BrowsingDataRemover::OnClearedCookies,
                      base::Unretained(this)));
   } else {
     OnClearedCookies(0);
   }
 }