[fsp] Rename ObserveEntry with AddWatcher.

chrome/browser/chromeos/file_system_provider/provided_file_system.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 22 matching lines @@
 }  // namespace extensions
 
 namespace chromeos {
 namespace file_system_provider {
 
 class NotificationManagerInterface;
 
 // Automatically calls the |update_callback| after all of the callbacks created
 // with |CreateCallback| are called.
 //
-// It's used to update tags of observed entries once a notification about a
-// change are fully handles. It is to make sure that the change notification is
-// fully handled before remembering the new tag.
+// It's used to update tags of watchers once a notification about a change is
+// handled. It is to make sure that the change notification is fully handled
+// before remembering the new tag.
 //
 // It is necessary to update the tag after all observers handle it fully, so
 // in case of shutdown or a crash we get the notifications again.
 class AutoUpdater : public base::RefCounted<AutoUpdater> {
  public:
   explicit AutoUpdater(const base::Closure& update_callback);
 
   // Creates a new callback which needs to be called before the update callback
   // is called.
   base::Closure CreateCallback();
@@ skipping 74 matching lines @@
   virtual AbortCallback Truncate(
       const base::FilePath& file_path,
       int64 length,
       const storage::AsyncFileUtil::StatusCallback& callback) override;
   virtual AbortCallback WriteFile(
       int file_handle,
       net::IOBuffer* buffer,
       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,
                       const std::string& tag) override;
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override;
 
  private:
   // Aborts an operation executed with a request id equal to
   // |operation_request_id|. The request is removed immediately on the C++ side
   // despite being handled by the providing extension or not.
   void Abort(int operation_request_id,
              const storage::AsyncFileUtil::StatusCallback& callback);
 
-  // Called when observing a directory process is completed with either success
-  // or en error.
-  void OnObserveDirectoryCompleted(
+  // Called when adding a watcher is completed with either success or en error.
+  void OnAddWatcherCompleted(
       const GURL& origin,
-      const base::FilePath& directory_path,
+      const base::FilePath& entry_path,
       bool recursive,
       bool persistent,
       const storage::AsyncFileUtil::StatusCallback& callback,
       base::File::Error result);
 
   // Called when all observers finished handling the change notification. It
-  // updates the tag from |last_tag| to |tag| for the entry at |observed_path|.
+  // updates the tag from |last_tag| to |tag| for the entry at |entry_path|.
   void OnNotifyCompleted(
-      const base::FilePath& observed_path,
+      const base::FilePath& entry_path,
       bool recursive,
       ProvidedFileSystemObserver::ChangeType change_type,
       scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
       const std::string& last_tag,
       const std::string& tag);
 
   Profile* profile_;                       // Not owned.
   extensions::EventRouter* event_router_;  // Not owned. May be NULL.
   ProvidedFileSystemInfo file_system_info_;
   scoped_ptr<NotificationManagerInterface> notification_manager_;
   scoped_ptr<RequestManager> request_manager_;
-  ObservedEntries observed_entries_;
+  Watchers watchers_;
   ObserverList<ProvidedFileSystemObserver> observers_;
 
   base::WeakPtrFactory<ProvidedFileSystem> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_