file_manager: Rename file_watcher_extensions.h to file_watcher.h

chrome/browser/chromeos/extensions/file_manager/file_watcher.cc

Index: chrome/browser/chromeos/extensions/file_manager/file_watcher.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc b/chrome/browser/chromeos/extensions/file_manager/file_watcher.cc
similarity index 79%
rename from chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc
rename to chrome/browser/chromeos/extensions/file_manager/file_watcher.cc
index 706129e086c7fc1ab11c033e34bdb66b809351ac..29bfc71ac3aec96db4a8925b8a20c0acebb7d718 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_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/extensions/file_manager/file_watcher_extensions.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_watcher.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ -31,10 +31,10 @@ base::FilePathWatcher* CreateAndStartFilePathWatcher(
 
 }  // namespace
 
-FileWatcherExtensions::FileWatcherExtensions(const base::FilePath& virtual_path,
-                                             const std::string& extension_id,
-                                             bool is_remote_file_system)
-    : file_watcher_(NULL),
+FileWatcher::FileWatcher(const base::FilePath& virtual_path,
+                         const std::string& extension_id,
+                         bool is_remote_file_system)
+    : local_file_watcher_(NULL),
       virtual_path_(virtual_path),
       ref_count_(0),
       is_remote_file_system_(is_remote_file_system),
@@ -44,20 +44,22 @@ FileWatcherExtensions::FileWatcherExtensions(const base::FilePath& virtual_path,
   AddExtension(extension_id);
 }
 
-FileWatcherExtensions::~FileWatcherExtensions() {
+FileWatcher::~FileWatcher() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE, file_watcher_);
+  BrowserThread::DeleteSoon(BrowserThread::FILE,
+                            FROM_HERE,
+                            local_file_watcher_);
 }
 
-void FileWatcherExtensions::AddExtension(const std::string& extension_id) {
+void FileWatcher::AddExtension(const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   extensions_[extension_id]++;
   ref_count_++;
 }
 
-void FileWatcherExtensions::RemoveExtension(const std::string& extension_id) {
+void FileWatcher::RemoveExtension(const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ExtensionUsageRegistry::iterator it = extensions_.find(extension_id);
@@ -75,13 +77,13 @@ void FileWatcherExtensions::RemoveExtension(const std::string& extension_id) {
   ref_count_--;
 }
 
-void FileWatcherExtensions::Watch(
+void FileWatcher::Watch(
     const base::FilePath& local_path,
     const base::FilePathWatcher::Callback& file_watcher_callback,
     const BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
-  DCHECK(!file_watcher_);
+  DCHECK(!local_file_watcher_);
 
   local_path_ = local_path;  // For error message in RemoveExtension().
 
@@ -97,20 +99,20 @@ void FileWatcherExtensions::Watch(
       base::Bind(&CreateAndStartFilePathWatcher,
                  local_path,
                  google_apis::CreateRelayCallback(file_watcher_callback)),
-      base::Bind(&FileWatcherExtensions::OnWatcherStarted,
+      base::Bind(&FileWatcher::OnWatcherStarted,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
-void FileWatcherExtensions::OnWatcherStarted(
+void FileWatcher::OnWatcherStarted(
     const BoolCallback& callback,
     base::FilePathWatcher* file_watcher) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
-  DCHECK(!file_watcher_);
+  DCHECK(!local_file_watcher_);
 
   if (file_watcher) {
-    file_watcher_ = file_watcher;
+    local_file_watcher_ = file_watcher;
     callback.Run(true);
   } else {
     callback.Run(false);