base::Bind: Convert BrowsingDatabaseHelper::StartFetching.

chrome/browser/browsing_data_database_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 "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"
@@ skipping 30 matching lines @@
 
 BrowsingDataDatabaseHelper::DatabaseInfo::~DatabaseInfo() {}
 
 bool BrowsingDataDatabaseHelper::DatabaseInfo::IsFileSchemeData() {
   return StartsWithASCII(origin_identifier,
                          std::string(chrome::kFileScheme),
                          true);
 }
 
 BrowsingDataDatabaseHelper::BrowsingDataDatabaseHelper(Profile* profile)
-    : completion_callback_(NULL),
-      is_fetching_(false),
+    : is_fetching_(false),
       tracker_(profile->GetDatabaseTracker()) {
 }
 
 BrowsingDataDatabaseHelper::~BrowsingDataDatabaseHelper() {
 }
 
 void BrowsingDataDatabaseHelper::StartFetching(
-    Callback1<const std::list<DatabaseInfo>& >::Type* callback) {
+    const base::Callback<void(const std::list<DatabaseInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
-  DCHECK(callback);
+  DCHECK_EQ(false, callback.is_null());
+
   is_fetching_ = true;
   database_info_.clear();
-  completion_callback_.reset(callback);
+  completion_callback_ = callback;
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread,
                  this));
 }
 
 void BrowsingDataDatabaseHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  completion_callback_.reset(NULL);
+  completion_callback_.Reset();
 }
 
 void BrowsingDataDatabaseHelper::DeleteDatabase(const std::string& origin,
                                                 const std::string& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, this,
                  origin, name));
 }
@@ skipping 37 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataDatabaseHelper::NotifyInUIThread, this));
 }
 
 void BrowsingDataDatabaseHelper::NotifyInUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(is_fetching_);
   // Note: completion_callback_ mutates only in the UI thread, so it's safe to
   // test it here.
-  if (completion_callback_ != NULL) {
-    completion_callback_->Run(database_info_);
-    completion_callback_.reset();
+  if (!completion_callback_.is_null()) {
+    completion_callback_.Run(database_info_);
+    completion_callback_.Reset();
   }
   is_fetching_ = false;
   database_info_.clear();
 }
 
 void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread(
     const std::string& origin,
     const std::string& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!tracker_.get())
@@ skipping 45 matching lines @@
   database_info_.clear();
   pending_database_info_.clear();
 }
 
 bool CannedBrowsingDataDatabaseHelper::empty() const {
   base::AutoLock auto_lock(lock_);
   return database_info_.empty() && pending_database_info_.empty();
 }
 
 void CannedBrowsingDataDatabaseHelper::StartFetching(
-    Callback1<const std::list<DatabaseInfo>& >::Type* callback) {
+    const base::Callback<void(const std::list<DatabaseInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
-  DCHECK(callback);
+  DCHECK_EQ(false, callback.is_null());
+
   is_fetching_ = true;
-  completion_callback_.reset(callback);
+  completion_callback_ = callback;
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
       base::Bind(&CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread,
                  this));
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}
 
 void CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
@@ skipping 26 matching lines @@
         web_security_origin.toString().utf8(),
         0,
         base::Time()));
   }
   pending_database_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataDatabaseHelper::NotifyInUIThread, this));
 }