Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*.

ash/pointer_watcher_delegate_aura.h

Index: ash/pointer_watcher_delegate_aura.h
diff --git a/ash/pointer_down_watcher_delegate_aura.h b/ash/pointer_watcher_delegate_aura.h
similarity index 54%
rename from ash/pointer_down_watcher_delegate_aura.h
rename to ash/pointer_watcher_delegate_aura.h
index 4b21a9b773e4056e1b6409cee00aee465e4dd541..1bea01d1b57409a73407ccc832ee7f94883d03d7 100644
--- a/ash/pointer_down_watcher_delegate_aura.h
+++ b/ash/pointer_watcher_delegate_aura.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/ash_export.h"
-#include "ash/common/pointer_down_watcher_delegate.h"
+#include "ash/common/pointer_watcher_delegate.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/events/event_handler.h"
@@ -22,18 +22,17 @@ class Widget;
 
 namespace ash {
 
-// Support for PointerDownWatchers in non-mus ash, implemented with a pre-target
+// Support for PointerWatchers in non-mus ash, implemented with a pre-target
 // EventHandler on the Shell.
-class ASH_EXPORT PointerDownWatcherDelegateAura
-    : public PointerDownWatcherDelegate,
-      public ui::EventHandler {
+class ASH_EXPORT PointerWatcherDelegateAura : public PointerWatcherDelegate,
+                                              public ui::EventHandler {
  public:
-  PointerDownWatcherDelegateAura();
-  ~PointerDownWatcherDelegateAura() override;
+  PointerWatcherDelegateAura();
+  ~PointerWatcherDelegateAura() override;
 
-  // PointerDownWatcherDelegate:
-  void AddPointerDownWatcher(views::PointerDownWatcher* watcher) override;
-  void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) override;
+  // PointerWatcherDelegate:
+  void AddPointerWatcher(views::PointerWatcher* watcher) override;
+  void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override;
@@ -44,9 +43,9 @@ class ASH_EXPORT PointerDownWatcherDelegateAura
   views::Widget* GetTargetWidget(const ui::LocatedEvent& event) const;
 
   // Must be empty on destruction.
-  base::ObserverList<views::PointerDownWatcher, true> pointer_down_watchers_;
+  base::ObserverList<views::PointerWatcher, true> pointer_watchers_;
 
-  DISALLOW_COPY_AND_ASSIGN(PointerDownWatcherDelegateAura);
+  DISALLOW_COPY_AND_ASSIGN(PointerWatcherDelegateAura);
 };
 
 }  // namespace ash