[fsp] Rename ObserveEntry with AddWatcher.

chrome/browser/chromeos/file_system_provider/service.cc

 // 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.
 
 #include "chrome/browser/chromeos/file_system_provider/service.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
@@ skipping 140 matching lines @@
   //   mount_path = /provided/b33f1337-hello_world-5aa5
   ProvidedFileSystemInfo file_system_info(extension_id, options, mount_path);
 
   ProvidedFileSystemInterface* file_system =
       file_system_factory_.Run(profile_, file_system_info);
   DCHECK(file_system);
   file_system_map_[FileSystemKey(extension_id, options.file_system_id)] =
       file_system;
   mount_point_name_to_key_map_[mount_point_name] =
       FileSystemKey(extension_id, options.file_system_id);
-  registry_->RememberFileSystem(file_system_info,
-                                *file_system->GetObservedEntries());
+  registry_->RememberFileSystem(file_system_info, *file_system->GetWatchers());
 
   FOR_EACH_OBSERVER(
       Observer,
       observers_,
       OnProvidedFileSystemMount(file_system_info, base::File::FILE_OK));
 
   return true;
 }
 
 bool Service::UnmountFileSystem(const std::string& extension_id,
@@ skipping 131 matching lines @@
       // preferences to avoid remounting it over and over again with a failure.
       registry_->ForgetFileSystem(restored_file_system.extension_id,
                                   restored_file_system.options.file_system_id);
       continue;
     }
 
     ProvidedFileSystemInterface* const file_system =
         GetProvidedFileSystem(restored_file_system.extension_id,
                               restored_file_system.options.file_system_id);
     DCHECK(file_system);
-    file_system->GetObservedEntries()->insert(
-        restored_file_system.observed_entries.begin(),
-        restored_file_system.observed_entries.end());
+    file_system->GetWatchers()->insert(restored_file_system.watchers.begin(),
+                                       restored_file_system.watchers.end());
   }
 }
 
 ProvidedFileSystemInterface* Service::GetProvidedFileSystem(
     const std::string& mount_point_name) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   const MountPointNameToKeyMap::const_iterator mapping_it =
       mount_point_name_to_key_map_.find(mount_point_name);
   if (mapping_it == mount_point_name_to_key_map_.end())
@@ skipping 13 matching lines @@
   // Notify observers about failure in unmounting, since mount() will not be
   // called by the provided file system. In case of success mount() will be
   // invoked, and observers notified, so there is no need to call them now.
   if (error != base::File::FILE_OK) {
     FOR_EACH_OBSERVER(Observer,
                       observers_,
                       OnProvidedFileSystemUnmount(file_system_info, error));
   }
 }
 
-void Service::OnObservedEntryChanged(
-    const ProvidedFileSystemInfo& file_system_info,
-    const ObservedEntry& observed_entry,
-    ChangeType change_type,
-    const Changes& changes,
-    const base::Closure& callback) {
+void Service::OnWatcherChanged(const ProvidedFileSystemInfo& file_system_info,
+                               const Watcher& watcher,
+                               ChangeType change_type,
+                               const Changes& changes,
+                               const base::Closure& callback) {
   callback.Run();
 }
 
-void Service::OnObservedEntryTagUpdated(
+void Service::OnWatcherTagUpdated(
     const ProvidedFileSystemInfo& file_system_info,
-    const ObservedEntry& observed_entry) {
+    const Watcher& watcher) {
   PrefService* const pref_service = profile_->GetPrefs();
   DCHECK(pref_service);
 
-  registry_->UpdateObservedEntryTag(file_system_info, observed_entry);
+  registry_->UpdateWatcherTag(file_system_info, watcher);
 }
 
-void Service::OnObservedEntryListChanged(
+void Service::OnWatcherListChanged(
     const ProvidedFileSystemInfo& file_system_info,
-    const ObservedEntries& observed_entries) {
-  registry_->RememberFileSystem(file_system_info, observed_entries);
+    const Watchers& watchers) {
+  registry_->RememberFileSystem(file_system_info, watchers);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos