[fsp] Rename ObserveEntry with AddWatcher.

chrome/browser/chromeos/file_system_provider/service.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_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/file_system_provider/observed_entry.h"
 #include "chrome/browser/chromeos/file_system_provider/observer.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 "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_system_provider.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 class ExtensionRegistry;
 }  // namespace extensions
@@ skipping 88 matching lines @@
   // extensions::ExtensionRegistryObserver overrides.
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
       extensions::UnloadedExtensionInfo::Reason reason) override;
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension) override;
 
   // ProvidedFileSystemInterface::Observer overrides.
-  virtual void OnObservedEntryChanged(
+  virtual void OnWatcherChanged(
       const ProvidedFileSystemInfo& file_system_info,
-      const ObservedEntry& observed_entry,
+      const Watcher& watcher,
       ProvidedFileSystemObserver::ChangeType change_type,
       const ProvidedFileSystemObserver::Changes& changes,
       const base::Closure& callback) override;
-  virtual void OnObservedEntryTagUpdated(
+  virtual void OnWatcherTagUpdated(
       const ProvidedFileSystemInfo& file_system_info,
-      const ObservedEntry& observed_entry) override;
-  virtual void OnObservedEntryListChanged(
+      const Watcher& watcher) override;
+  virtual void OnWatcherListChanged(
       const ProvidedFileSystemInfo& file_system_info,
-      const ObservedEntries& observed_entries) override;
+      const Watchers& watchers) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FileSystemProviderServiceTest, RememberFileSystem);
 
   // Key is a pair of an extension id and file system id, which makes it
   // unique among the entire service instance.
   typedef std::pair<std::string, std::string> FileSystemKey;
 
   typedef std::map<FileSystemKey, ProvidedFileSystemInterface*>
       ProvidedFileSystemMap;
   typedef std::map<std::string, FileSystemKey> MountPointNameToKeyMap;
 
   // Called when the providing extension accepts or refuses a unmount request.
   // If |error| is equal to FILE_OK, then the request is accepted.
   void OnRequestUnmountStatus(const ProvidedFileSystemInfo& file_system_info,
                               base::File::Error error);
 
   // Remembers the file system in preferences, in order to remount after a
   // reboot.
   void RememberFileSystem(const ProvidedFileSystemInfo& file_system_info,
-                          const ObservedEntries& observed_entries);
+                          const Watchers& watchers);
 
   // Removes the file system from preferences, so it is not remounmted anymore
   // after a reboot.
   void ForgetFileSystem(const std::string& extension_id,
                         const std::string& file_system_id);
 
   // Restores from preferences file systems mounted previously by the
   // |extension_id| providing extension.
   void RestoreFileSystems(const std::string& extension_id);
 
   Profile* profile_;
   extensions::ExtensionRegistry* extension_registry_;  // Not owned.
   FileSystemFactoryCallback file_system_factory_;
   ObserverList<Observer> observers_;
   ProvidedFileSystemMap file_system_map_;  // Owns pointers.
   MountPointNameToKeyMap mount_point_name_to_key_map_;
   scoped_ptr<RegistryInterface> registry_;
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<Service> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_