| Index: chrome/browser/mock_browsing_data_file_system_helper.cc
|
| diff --git a/chrome/browser/mock_browsing_data_file_system_helper.cc b/chrome/browser/mock_browsing_data_file_system_helper.cc
|
| index 7194362f84e4c6ffc3778e6ed5f2ce106dd6db61..3ecc344c628da801c806f0069a1cfe47170ce1ac 100644
|
| --- a/chrome/browser/mock_browsing_data_file_system_helper.cc
|
| +++ b/chrome/browser/mock_browsing_data_file_system_helper.cc
|
| @@ -15,12 +15,12 @@ MockBrowsingDataFileSystemHelper::~MockBrowsingDataFileSystemHelper() {
|
| }
|
|
|
| void MockBrowsingDataFileSystemHelper::StartFetching(
|
| - Callback1<const std::list<FileSystemInfo>& >::Type* callback) {
|
| - callback_.reset(callback);
|
| + const base::Callback<void(const std::list<FileSystemInfo>&)>& callback) {
|
| + callback_ = callback;
|
| }
|
|
|
| void MockBrowsingDataFileSystemHelper::CancelNotification() {
|
| - callback_.reset(NULL);
|
| + callback_.Reset();
|
| }
|
|
|
| void MockBrowsingDataFileSystemHelper::DeleteFileSystemOrigin(
|
| @@ -45,8 +45,8 @@ void MockBrowsingDataFileSystemHelper::AddFileSystemSamples() {
|
| }
|
|
|
| void MockBrowsingDataFileSystemHelper::Notify() {
|
| - CHECK(callback_.get());
|
| - callback_->Run(response_);
|
| + CHECK_EQ(false, callback_.is_null());
|
| + callback_.Run(response_);
|
| }
|
|
|
| void MockBrowsingDataFileSystemHelper::Reset() {
|
|
|