[fsp] Rename ObserveEntry with AddWatcher.

chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc

Index: chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc
diff --git a/chrome/browser/chromeos/file_system_provider/operations/unobserve_entry.cc b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc
similarity index 62%
rename from chrome/browser/chromeos/file_system_provider/operations/unobserve_entry.cc
rename to chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc
index 50c5677ad318b3b0fffd16df9d91c42970dad786..1e4e142bc7be153fe365cf2333401961dd918372 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/unobserve_entry.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc
@@ -2,7 +2,7 @@
 // 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/operations/unobserve_entry.h"
+#include "chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h"
 
 #include <string>
 
@@ -13,7 +13,7 @@ namespace chromeos {
 namespace file_system_provider {
 namespace operations {
 
-UnobserveEntry::UnobserveEntry(
+RemoveWatcher::RemoveWatcher(
     extensions::EventRouter* event_router,
     const ProvidedFileSystemInfo& file_system_info,
     const base::FilePath& entry_path,
@@ -25,13 +25,13 @@ UnobserveEntry::UnobserveEntry(
       callback_(callback) {
 }
 
-UnobserveEntry::~UnobserveEntry() {
+RemoveWatcher::~RemoveWatcher() {
 }
 
-bool UnobserveEntry::Execute(int request_id) {
-  using extensions::api::file_system_provider::UnobserveEntryRequestedOptions;
+bool RemoveWatcher::Execute(int request_id) {
+  using extensions::api::file_system_provider::RemoveWatcherRequestedOptions;
 
-  UnobserveEntryRequestedOptions options;
+  RemoveWatcherRequestedOptions options;
   options.file_system_id = file_system_info_.file_system_id();
   options.request_id = request_id;
   options.entry_path = entry_path_.AsUTF8Unsafe();
@@ -39,21 +39,21 @@ bool UnobserveEntry::Execute(int request_id) {
 
   return SendEvent(
       request_id,
-      extensions::api::file_system_provider::OnUnobserveEntryRequested::
+      extensions::api::file_system_provider::OnRemoveWatcherRequested::
           kEventName,
-      extensions::api::file_system_provider::OnUnobserveEntryRequested::Create(
+      extensions::api::file_system_provider::OnRemoveWatcherRequested::Create(
           options));
 }
 
-void UnobserveEntry::OnSuccess(int /* request_id */,
-                               scoped_ptr<RequestValue> /* result */,
-                               bool has_more) {
+void RemoveWatcher::OnSuccess(int /* request_id */,
+                              scoped_ptr<RequestValue> /* result */,
+                              bool has_more) {
   callback_.Run(base::File::FILE_OK);
 }
 
-void UnobserveEntry::OnError(int /* request_id */,
-                             scoped_ptr<RequestValue> /* result */,
-                             base::File::Error error) {
+void RemoveWatcher::OnError(int /* request_id */,
+                            scoped_ptr<RequestValue> /* result */,
+                            base::File::Error error) {
   callback_.Run(error);
 }