| Index: chrome/browser/mock_browsing_data_local_storage_helper.cc
|
| diff --git a/chrome/browser/mock_browsing_data_local_storage_helper.cc b/chrome/browser/mock_browsing_data_local_storage_helper.cc
|
| index 9bdbda7e4bc24770520adb63b5dcaa2eda57fe92..7f223683d52afb39cf4f8f6cc2f5134b3cbdf056 100644
|
| --- a/chrome/browser/mock_browsing_data_local_storage_helper.cc
|
| +++ b/chrome/browser/mock_browsing_data_local_storage_helper.cc
|
| @@ -17,12 +17,12 @@ MockBrowsingDataLocalStorageHelper::~MockBrowsingDataLocalStorageHelper() {
|
| }
|
|
|
| void MockBrowsingDataLocalStorageHelper::StartFetching(
|
| - Callback1<const std::list<LocalStorageInfo>& >::Type* callback) {
|
| - callback_.reset(callback);
|
| + const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback) {
|
| + callback_ = callback;
|
| }
|
|
|
| void MockBrowsingDataLocalStorageHelper::CancelNotification() {
|
| - callback_.reset(NULL);
|
| + callback_.Reset();
|
| }
|
|
|
| void MockBrowsingDataLocalStorageHelper::DeleteLocalStorageFile(
|
| @@ -46,8 +46,8 @@ void MockBrowsingDataLocalStorageHelper::AddLocalStorageSamples() {
|
| }
|
|
|
| void MockBrowsingDataLocalStorageHelper::Notify() {
|
| - CHECK(callback_.get());
|
| - callback_->Run(response_);
|
| + CHECK_EQ(false, callback_.is_null());
|
| + callback_.Run(response_);
|
| }
|
|
|
| void MockBrowsingDataLocalStorageHelper::Reset() {
|
|
|