| Index: chrome/browser/mock_browsing_data_file_system_helper.h
|
| diff --git a/chrome/browser/mock_browsing_data_file_system_helper.h b/chrome/browser/mock_browsing_data_file_system_helper.h
|
| index 6e172eee634ae6e1135a9aff8100b4aa0485a44b..15dac27c0da6e3b2b086a736d0d7b6ea82717388 100644
|
| --- a/chrome/browser/mock_browsing_data_file_system_helper.h
|
| +++ b/chrome/browser/mock_browsing_data_file_system_helper.h
|
| @@ -10,6 +10,7 @@
|
| #include <map>
|
|
|
| #include "base/callback.h"
|
| +#include "base/compiler_specific.h"
|
| #include "chrome/browser/browsing_data_file_system_helper.h"
|
| #include "webkit/fileapi/file_system_types.h"
|
|
|
| @@ -20,12 +21,11 @@ class MockBrowsingDataFileSystemHelper : public BrowsingDataFileSystemHelper {
|
| public:
|
| explicit MockBrowsingDataFileSystemHelper(Profile* profile);
|
|
|
| - virtual void StartFetching(
|
| - Callback1<const std::list<FileSystemInfo>& >::Type* callback);
|
| -
|
| - virtual void CancelNotification();
|
| -
|
| - virtual void DeleteFileSystemOrigin(const GURL& origin);
|
| + // BrowsingDataFileSystemHelper implementation.
|
| + virtual void StartFetching(const base::Callback<
|
| + void(const std::list<FileSystemInfo>&)>& callback) OVERRIDE;
|
| + virtual void CancelNotification() OVERRIDE;
|
| + virtual void DeleteFileSystemOrigin(const GURL& origin) OVERRIDE;
|
|
|
| // Adds a specific filesystem.
|
| void AddFileSystem(const GURL& origin,
|
| @@ -41,7 +41,7 @@ class MockBrowsingDataFileSystemHelper : public BrowsingDataFileSystemHelper {
|
| // Marks all filesystems as existing.
|
| void Reset();
|
|
|
| - // Returns true if all filesystemss since the last Reset() invokation were
|
| + // Returns true if all filesystemss since the last Reset() invocation were
|
| // deleted.
|
| bool AllDeleted();
|
|
|
| @@ -52,8 +52,7 @@ class MockBrowsingDataFileSystemHelper : public BrowsingDataFileSystemHelper {
|
|
|
| Profile* profile_;
|
|
|
| - scoped_ptr<Callback1<const std::list<FileSystemInfo>& >::Type >
|
| - callback_;
|
| + base::Callback<void(const std::list<FileSystemInfo>&)> callback_;
|
|
|
| // Stores which filesystems exist.
|
| std::map<const std::string, bool> file_systems_;
|
|
|