base::Bind: Easy cleanups in browsing_data*.

BUG=none
TEST=none

R=groby@chromium.org

Review URL: http://codereview.chromium.org/8354012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106397 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 83 insertions, 88 deletions

diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc
index 1b73255..b344b1c 100644
--- a/chrome/browser/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data_appcache_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data_appcache_helper.h"
 
+#include "base/bind.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
@@ -25,8 +26,9 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
     is_fetching_ = true;
     info_collection_ = new appcache::AppCacheInfoCollection;
     completion_callback_ = callback;
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableMethod(
-        this, &BrowsingDataAppCacheHelper::StartFetching, callback));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&BrowsingDataAppCacheHelper::StartFetching, this, callback));
     return;
   }
 
@@ -41,8 +43,9 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
 void BrowsingDataAppCacheHelper::CancelNotification() {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     completion_callback_.Reset();
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableMethod(
-        this, &BrowsingDataAppCacheHelper::CancelNotification));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&BrowsingDataAppCacheHelper::CancelNotification, this));
     return;
   }
 
@@ -53,9 +56,10 @@ void BrowsingDataAppCacheHelper::CancelNotification() {
 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(
     const GURL& manifest_url) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableMethod(
-        this, &BrowsingDataAppCacheHelper::DeleteAppCacheGroup,
-        manifest_url));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&BrowsingDataAppCacheHelper::DeleteAppCacheGroup, this,
+                   manifest_url));
     return;
   }
   appcache_service_->DeleteAppCacheGroup(manifest_url, NULL);
@@ -78,8 +82,9 @@ void BrowsingDataAppCacheHelper::OnFetchComplete(int rv) {
     }
 
     appcache_info_callback_ = NULL;
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
-        this, &BrowsingDataAppCacheHelper::OnFetchComplete, rv));
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete, this, rv));
     return;
   }
 
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc
index b836a44..95106ac 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data_database_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data_database_helper.h"
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ -63,8 +64,10 @@ void BrowsingDataDatabaseHelper::StartFetching(
   is_fetching_ = true;
   database_info_.clear();
   completion_callback_.reset(callback);
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
-      this, &BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread));
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread,
+                 this));
 }
 
 void BrowsingDataDatabaseHelper::CancelNotification() {
@@ -75,9 +78,10 @@ void BrowsingDataDatabaseHelper::CancelNotification() {
 void BrowsingDataDatabaseHelper::DeleteDatabase(const std::string& origin,
                                                 const std::string& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
-      this, &BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, origin,
-      name));
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, this,
+                 origin, name));
 }
 
 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() {
@@ -116,8 +120,9 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() {
     }
   }
 
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
-      this, &BrowsingDataDatabaseHelper::NotifyInUIThread));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&BrowsingDataDatabaseHelper::NotifyInUIThread, this));
 }
 
 void BrowsingDataDatabaseHelper::NotifyInUIThread() {
@@ -199,8 +204,10 @@ void CannedBrowsingDataDatabaseHelper::StartFetching(
   DCHECK(callback);
   is_fetching_ = true;
   completion_callback_.reset(callback);
-  BrowserThread::PostTask(BrowserThread::WEBKIT, FROM_HERE, NewRunnableMethod(
-      this, &CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread));
+  BrowserThread::PostTask(
+      BrowserThread::WEBKIT, FROM_HERE,
+      base::Bind(&CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread,
+                 this));
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}
@@ -239,6 +246,7 @@ void CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread() {
   }
   pending_database_info_.clear();
 
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
-      this, &CannedBrowsingDataDatabaseHelper::NotifyInUIThread));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&CannedBrowsingDataDatabaseHelper::NotifyInUIThread, this));
 }
diff --git a/chrome/browser/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data_file_system_helper.cc
index 0c16a75..ad367b6 100644
--- a/chrome/browser/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data_file_system_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data_file_system_helper.h"
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ -87,10 +88,9 @@ void BrowsingDataFileSystemHelperImpl::StartFetching(
   completion_callback_.reset(callback);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(
-          this,
-          &BrowsingDataFileSystemHelperImpl::
-              FetchFileSystemInfoInFileThread));
+      base::Bind(
+          &BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread,
+          this));
 }
 
 void BrowsingDataFileSystemHelperImpl::CancelNotification() {
@@ -103,11 +103,9 @@ void BrowsingDataFileSystemHelperImpl::DeleteFileSystemOrigin(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-       NewRunnableMethod(
-           this,
-           &BrowsingDataFileSystemHelperImpl::
-               DeleteFileSystemOriginInFileThread,
-           origin));
+      base::Bind(
+          &BrowsingDataFileSystemHelperImpl::DeleteFileSystemOriginInFileThread,
+          this, origin));
 }
 
 void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread() {
@@ -146,8 +144,7 @@ void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &BrowsingDataFileSystemHelperImpl::NotifyOnUIThread));
+      base::Bind(&BrowsingDataFileSystemHelperImpl::NotifyOnUIThread, this));
 }
 
 void BrowsingDataFileSystemHelperImpl::NotifyOnUIThread() {
@@ -266,8 +263,7 @@ void CannedBrowsingDataFileSystemHelper::StartFetching(
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &CannedBrowsingDataFileSystemHelper::NotifyOnUIThread));
+      base::Bind(&CannedBrowsingDataFileSystemHelper::NotifyOnUIThread, this));
 }
 
 void CannedBrowsingDataFileSystemHelper::NotifyOnUIThread() {
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index 7da39d2..19a24ba 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 
+#include "base/bind.h"
 #include "base/callback_old.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -76,9 +77,9 @@ void BrowsingDataIndexedDBHelperImpl::StartFetching(
   completion_callback_.reset(callback);
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
-      NewRunnableMethod(
-          this,
-          &BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread));
+      base::Bind(
+          &BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread,
+          this));
 }
 
 void BrowsingDataIndexedDBHelperImpl::CancelNotification() {
@@ -91,11 +92,9 @@ void BrowsingDataIndexedDBHelperImpl::DeleteIndexedDB(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
-       NewRunnableMethod(
-           this,
-           &BrowsingDataIndexedDBHelperImpl::
-              DeleteIndexedDBInWebKitThread,
-           origin));
+      base::Bind(
+          &BrowsingDataIndexedDBHelperImpl::DeleteIndexedDBInWebKitThread, this,
+          origin));
 }
 
 void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
@@ -115,8 +114,7 @@ void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &BrowsingDataIndexedDBHelperImpl::NotifyInUIThread));
+      base::Bind(&BrowsingDataIndexedDBHelperImpl::NotifyInUIThread, this));
 }
 
 void BrowsingDataIndexedDBHelperImpl::NotifyInUIThread() {
@@ -211,9 +209,11 @@ void CannedBrowsingDataIndexedDBHelper::StartFetching(
   DCHECK(callback);
   is_fetching_ = true;
   completion_callback_.reset(callback);
-  BrowserThread::PostTask(BrowserThread::WEBKIT, FROM_HERE, NewRunnableMethod(
-      this,
-      &CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread));
+  BrowserThread::PostTask(
+      BrowserThread::WEBKIT, FROM_HERE,
+      base::Bind(
+          &CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread,
+          this));
 }
 
 CannedBrowsingDataIndexedDBHelper::~CannedBrowsingDataIndexedDBHelper() {}
@@ -244,8 +244,7 @@ void CannedBrowsingDataIndexedDBHelper::ConvertPendingInfoInWebKitThread() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &CannedBrowsingDataIndexedDBHelper::NotifyInUIThread));
+      base::Bind(&CannedBrowsingDataIndexedDBHelper::NotifyInUIThread, this));
 }
 
 void CannedBrowsingDataIndexedDBHelper::NotifyInUIThread() {
diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc
index 243eec2..a270f21 100644
--- a/chrome/browser/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data_local_storage_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ -64,10 +65,9 @@ void BrowsingDataLocalStorageHelper::StartFetching(
   completion_callback_.reset(callback);
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
-      NewRunnableMethod(
-          this,
-          &BrowsingDataLocalStorageHelper::
-              FetchLocalStorageInfoInWebKitThread));
+      base::Bind(
+          &BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread,
+          this));
 }
 
 void BrowsingDataLocalStorageHelper::CancelNotification() {
@@ -80,11 +80,9 @@ void BrowsingDataLocalStorageHelper::DeleteLocalStorageFile(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
-       NewRunnableMethod(
-           this,
-           &BrowsingDataLocalStorageHelper::
-              DeleteLocalStorageFileInWebKitThread,
-           file_path));
+      base::Bind(
+          &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread,
+          this, file_path));
 }
 
 void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() {
@@ -122,8 +120,7 @@ void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &BrowsingDataLocalStorageHelper::NotifyInUIThread));
+      base::Bind(&BrowsingDataLocalStorageHelper::NotifyInUIThread, this));
 }
 
 void BrowsingDataLocalStorageHelper::NotifyInUIThread() {
@@ -189,10 +186,8 @@ void CannedBrowsingDataLocalStorageHelper::StartFetching(
   completion_callback_.reset(callback);
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
-      NewRunnableMethod(
-          this,
-          &CannedBrowsingDataLocalStorageHelper::
-              ConvertPendingInfoInWebKitThread));
+      base::Bind(&CannedBrowsingDataLocalStorageHelper::
+          ConvertPendingInfoInWebKitThread, this));
 }
 
 CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
@@ -233,6 +228,6 @@ void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfoInWebKitThread() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &CannedBrowsingDataLocalStorageHelper::NotifyInUIThread));
+      base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
+                 this));
 }
diff --git a/chrome/browser/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data_quota_helper_impl.cc
index 4c1ce26..47e4f7f 100644
--- a/chrome/browser/browsing_data_quota_helper_impl.cc
+++ b/chrome/browser/browsing_data_quota_helper_impl.cc
@@ -39,10 +39,7 @@ void BrowsingDataQuotaHelperImpl::RevokeHostQuota(const std::string& host) {
   if (!io_thread_->BelongsToCurrentThread()) {
     io_thread_->PostTask(
         FROM_HERE,
-        NewRunnableMethod(
-            this,
-            &BrowsingDataQuotaHelperImpl::RevokeHostQuota,
-            host));
+        base::Bind(&BrowsingDataQuotaHelperImpl::RevokeHostQuota, this, host));
     return;
   }
 
@@ -71,9 +68,7 @@ void BrowsingDataQuotaHelperImpl::FetchQuotaInfo() {
   if (!io_thread_->BelongsToCurrentThread()) {
     io_thread_->PostTask(
         FROM_HERE,
-        NewRunnableMethod(
-            this,
-            &BrowsingDataQuotaHelperImpl::FetchQuotaInfo));
+        base::Bind(&BrowsingDataQuotaHelperImpl::FetchQuotaInfo, this));
     return;
   }
 
@@ -152,9 +147,7 @@ void BrowsingDataQuotaHelperImpl::OnComplete() {
   if (!ui_thread_->BelongsToCurrentThread()) {
     ui_thread_->PostTask(
         FROM_HERE,
-        NewRunnableMethod(
-            this,
-            &BrowsingDataQuotaHelperImpl::OnComplete));
+        base::Bind(&BrowsingDataQuotaHelperImpl::OnComplete, this));
     return;
   }
 
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 4b45cbc..8affaa0 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -143,10 +143,8 @@ void BrowsingDataRemover::Remove(int remove_mask) {
       waiting_for_clear_networking_history_ = true;
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &BrowsingDataRemover::ClearNetworkingHistory,
-              g_browser_process->io_thread()));
+          base::Bind(&BrowsingDataRemover::ClearNetworkingHistory,
+                     base::Unretained(this), g_browser_process->io_thread()));
     }
 
     // As part of history deletion we also delete the auto-generated keywords.
@@ -227,9 +225,8 @@ void BrowsingDataRemover::Remove(int remove_mask) {
       waiting_for_clear_quota_managed_data_ = true;
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &BrowsingDataRemover::ClearQuotaManagedDataOnIOThread));
+          base::Bind(&BrowsingDataRemover::ClearQuotaManagedDataOnIOThread,
+                     base::Unretained(this)));
     }
   }
 
@@ -281,7 +278,8 @@ void BrowsingDataRemover::Remove(int remove_mask) {
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        NewRunnableMethod(this, &BrowsingDataRemover::ClearCacheOnIOThread));
+        base::Bind(&BrowsingDataRemover::ClearCacheOnIOThread,
+                   base::Unretained(this)));
 
     // The PrerenderManager may have a page actively being prerendered, which
     // is essentially a preemptively cached page.
@@ -396,7 +394,8 @@ void BrowsingDataRemover::ClearNetworkingHistory(IOThread* io_thread) {
   // Notify the UI thread that we are done.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(this, &BrowsingDataRemover::ClearedNetworkHistory));
+      base::Bind(&BrowsingDataRemover::ClearedNetworkHistory,
+                 base::Unretained(this)));
 }
 
 void BrowsingDataRemover::ClearedCache() {
@@ -460,7 +459,8 @@ void BrowsingDataRemover::DoClearCache(int rv) {
         // Notify the UI thread that we are done.
         BrowserThread::PostTask(
             BrowserThread::UI, FROM_HERE,
-            NewRunnableMethod(this, &BrowsingDataRemover::ClearedCache));
+            base::Bind(&BrowsingDataRemover::ClearedCache,
+                       base::Unretained(this)));
 
         next_cache_state_ = STATE_NONE;
         break;
@@ -546,9 +546,8 @@ void BrowsingDataRemover::CheckQuotaManagedDataDeletionStatus() {
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this,
-          &BrowsingDataRemover::OnQuotaManagedDataDeleted));
+      base::Bind(&BrowsingDataRemover::OnQuotaManagedDataDeleted,
+                 base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnQuotaManagedDataDeleted() {