| Index: chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
|
| diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
|
| index b20e3479db4a70dd781ac50a3308f0ea61586eee..6ad02bc587a9161b12a30bb3c68c38c5ea532a7c 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
|
| +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
|
| @@ -14,10 +14,10 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/task/cancelable_task_tracker.h"
|
| -#include "chrome/browser/chromeos/file_system_provider/observed_entry.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h"
|
| +#include "chrome/browser/chromeos/file_system_provider/watcher.h"
|
| #include "url/gurl.h"
|
|
|
| class Profile;
|
| @@ -126,23 +126,23 @@ class FakeProvidedFileSystem : public ProvidedFileSystemInterface {
|
| int64 offset,
|
| int length,
|
| const storage::AsyncFileUtil::StatusCallback& callback) override;
|
| - virtual AbortCallback ObserveDirectory(
|
| + virtual AbortCallback AddWatcher(
|
| const GURL& origin,
|
| - const base::FilePath& directory_path,
|
| + const base::FilePath& entry_path,
|
| bool recursive,
|
| bool persistent,
|
| const storage::AsyncFileUtil::StatusCallback& callback) override;
|
| - virtual void UnobserveEntry(
|
| + virtual void RemoveWatcher(
|
| const GURL& origin,
|
| const base::FilePath& entry_path,
|
| bool recursive,
|
| const storage::AsyncFileUtil::StatusCallback& callback) override;
|
| virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const override;
|
| virtual RequestManager* GetRequestManager() override;
|
| - virtual ObservedEntries* GetObservedEntries() override;
|
| + virtual Watchers* GetWatchers() override;
|
| virtual void AddObserver(ProvidedFileSystemObserver* observer) override;
|
| virtual void RemoveObserver(ProvidedFileSystemObserver* observer) override;
|
| - virtual bool Notify(const base::FilePath& observed_path,
|
| + virtual bool Notify(const base::FilePath& entry_path,
|
| bool recursive,
|
| ProvidedFileSystemObserver::ChangeType change_type,
|
| scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
|
| @@ -180,7 +180,7 @@ class FakeProvidedFileSystem : public ProvidedFileSystemInterface {
|
| int last_file_handle_;
|
| base::CancelableTaskTracker tracker_;
|
| ObserverList<ProvidedFileSystemObserver> observers_;
|
| - ObservedEntries observed_entries_;
|
| + Watchers watchers_;
|
|
|
| base::WeakPtrFactory<FakeProvidedFileSystem> weak_ptr_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(FakeProvidedFileSystem);
|
|
|