base::Bind: Convert BrowsingDataLocalStorageHelper::StartFetching.

chrome/browser/browsing_data_local_storage_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_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 30 matching lines @@
       file_path(file_path),
       size(size),
       last_modified(last_modified) {
       }
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::~LocalStorageInfo() {}
 
 BrowsingDataLocalStorageHelper::BrowsingDataLocalStorageHelper(
     Profile* profile)
     : profile_(profile),
-      completion_callback_(NULL),
       is_fetching_(false) {
   DCHECK(profile_);
 }
 
 BrowsingDataLocalStorageHelper::~BrowsingDataLocalStorageHelper() {
 }
 
 void BrowsingDataLocalStorageHelper::StartFetching(
-    Callback1<const std::list<LocalStorageInfo>& >::Type* callback) {
+    const base::Callback<void(const std::list<LocalStorageInfo>&)>& 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(
           &BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread,
           this));
 }
 
 void BrowsingDataLocalStorageHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  completion_callback_.reset(NULL);
+  completion_callback_.Reset();
 }
 
 void BrowsingDataLocalStorageHelper::DeleteLocalStorageFile(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::WEBKIT, FROM_HERE,
       base::Bind(
           &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread,
           this, file_path));
@@ skipping 35 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataLocalStorageHelper::NotifyInUIThread, this));
 }
 
 void BrowsingDataLocalStorageHelper::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(local_storage_info_);
-    completion_callback_.reset();
+  if (!completion_callback_.is_null()) {
+    completion_callback_.Run(local_storage_info_);
+    completion_callback_.Reset();
   }
   is_fetching_ = false;
 }
 
 void BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   profile_->GetWebKitContext()->dom_storage_context()->DeleteLocalStorageFile(
       file_path);
 }
@@ skipping 27 matching lines @@
   local_storage_info_.clear();
   pending_local_storage_info_.clear();
 }
 
 bool CannedBrowsingDataLocalStorageHelper::empty() const {
   base::AutoLock auto_lock(lock_);
   return local_storage_info_.empty() && pending_local_storage_info_.empty();
 }
 
 void CannedBrowsingDataLocalStorageHelper::StartFetching(
-    Callback1<const std::list<LocalStorageInfo>& >::Type* callback) {
+    const base::Callback<void(const std::list<LocalStorageInfo>&)>& 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(&CannedBrowsingDataLocalStorageHelper::
           ConvertPendingInfoInWebKitThread, this));
 }
 
 CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
 
 void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
@@ skipping 27 matching lines @@
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
                  this));
 }