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

chrome/browser/browsing_data_remover.cc

Index: chrome/browser/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 6717495015130b1c288e51e048422290f05cbd5f..8a2a8d069eb03097f7d9616e1a2e31d77b12e97f 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -74,8 +74,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
       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()),
@@ -98,8 +97,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
       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()),
@@ -438,7 +436,7 @@ void BrowsingDataRemover::DoClearCache(int rv) {
         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;
@@ -448,10 +446,10 @@ void BrowsingDataRemover::DoClearCache(int rv) {
         // |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;
         }