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

ui/views/mus/window_manager_connection_unittest.cc

 // Copyright 2016 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 "ui/views/mus/window_manager_connection.h"
 
 #include <memory>
 
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
-#include "ui/views/pointer_down_watcher.h"
+#include "ui/views/pointer_watcher.h"
 #include "ui/views/test/scoped_views_test_helper.h"
 #include "ui/views/touch_event_watcher.h"
 
 namespace views {
 namespace {
 
-class TestPointerDownWatcher : public PointerDownWatcher {
+class TestPointerWatcher : public PointerWatcher {
  public:
-  TestPointerDownWatcher() {}
-  ~TestPointerDownWatcher() override {}
+  TestPointerWatcher() {}
+  ~TestPointerWatcher() override {}
 
   bool mouse_pressed() const { return mouse_pressed_; }
   bool touch_pressed() const { return touch_pressed_; }
 
   void Reset() {
     mouse_pressed_ = false;
     touch_pressed_ = false;
   }
 
-  // PointerDownWatcher:
+  // PointerWatcher:
   void OnMousePressed(const ui::MouseEvent& event,
                       const gfx::Point& location_in_screen,
                       Widget* target) override {
     mouse_pressed_ = true;
   }
   void OnTouchPressed(const ui::TouchEvent& event,
                       const gfx::Point& location_in_screen,
                       Widget* target) override {
     touch_pressed_ = true;
   }
 
  private:
   bool mouse_pressed_ = false;
   bool touch_pressed_ = false;
 
-  DISALLOW_COPY_AND_ASSIGN(TestPointerDownWatcher);
+  DISALLOW_COPY_AND_ASSIGN(TestPointerWatcher);
 };
 
 }  // namespace
 
 namespace {
 
 class TestTouchEventWatcher : public TouchEventWatcher {
  public:
   TestTouchEventWatcher() {}
   ~TestTouchEventWatcher() override {}
@@ skipping 22 matching lines @@
   ~WindowManagerConnectionTest() override {}
 
   void OnEventObserved(const ui::Event& event) {
     WindowManagerConnection::Get()->OnEventObserved(event, nullptr);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowManagerConnectionTest);
 };
 
-TEST_F(WindowManagerConnectionTest, PointerDownWatcher) {
+TEST_F(WindowManagerConnectionTest, PointerWatcher) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   ScopedViewsTestHelper helper;
   WindowManagerConnection* connection = WindowManagerConnection::Get();
   ASSERT_TRUE(connection);
   ui::MouseEvent mouse_pressed(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                                base::TimeTicks(), ui::EF_NONE, 0);
   ui::TouchEvent touch_pressed(ui::ET_TOUCH_PRESSED, gfx::Point(), 1,
                                base::TimeTicks());
   ui::KeyEvent key_pressed(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
 
-  // PointerDownWatchers receive mouse events.
-  TestPointerDownWatcher watcher1;
-  connection->AddPointerDownWatcher(&watcher1);
+  // PointerWatchers receive mouse events.
+  TestPointerWatcher watcher1;
+  connection->AddPointerWatcher(&watcher1);
   OnEventObserved(mouse_pressed);
   EXPECT_TRUE(watcher1.mouse_pressed());
   watcher1.Reset();
 
-  // PointerDownWatchers receive touch events.
+  // PointerWatchers receive touch events.
   OnEventObserved(touch_pressed);
   EXPECT_TRUE(watcher1.touch_pressed());
   watcher1.Reset();
 
-  // PointerDownWatchers do not trigger for key events.
+  // PointerWatchers do not trigger for key events.
   OnEventObserved(key_pressed);
   EXPECT_FALSE(watcher1.mouse_pressed());
   EXPECT_FALSE(watcher1.touch_pressed());
   watcher1.Reset();
 
-  // Two PointerDownWatchers can both receive a single observed event.
-  TestPointerDownWatcher watcher2;
-  connection->AddPointerDownWatcher(&watcher2);
+  // Two PointerWatchers can both receive a single observed event.
+  TestPointerWatcher watcher2;
+  connection->AddPointerWatcher(&watcher2);
   OnEventObserved(mouse_pressed);
   EXPECT_TRUE(watcher1.mouse_pressed());
   EXPECT_TRUE(watcher2.mouse_pressed());
   watcher1.Reset();
   watcher2.Reset();
 
-  // Removing the first PointerDownWatcher stops sending events to it.
-  connection->RemovePointerDownWatcher(&watcher1);
+  // Removing the first PointerWatcher stops sending events to it.
+  connection->RemovePointerWatcher(&watcher1);
   OnEventObserved(mouse_pressed);
   EXPECT_FALSE(watcher1.mouse_pressed());
   EXPECT_TRUE(watcher2.mouse_pressed());
   watcher1.Reset();
   watcher2.Reset();
 
-  // Removing the last PointerDownWatcher stops sending events to it.
-  connection->RemovePointerDownWatcher(&watcher2);
+  // Removing the last PointerWatcher stops sending events to it.
+  connection->RemovePointerWatcher(&watcher2);
   OnEventObserved(mouse_pressed);
   EXPECT_FALSE(watcher1.mouse_pressed());
   EXPECT_FALSE(watcher1.touch_pressed());
 }
 
 TEST_F(WindowManagerConnectionTest, TouchEventWatcher) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   ScopedViewsTestHelper helper;
   WindowManagerConnection* connection = WindowManagerConnection::Get();
   ASSERT_TRUE(connection);
@@ skipping 56 matching lines @@
   watcher2.Reset();
 
   // Removing the last TouchEventWatcher stops sending events to it.
   connection->RemoveTouchEventWatcher(&watcher2);
   OnEventObserved(touch_pointer_event);
   EXPECT_FALSE(watcher1.touch_observed());
   EXPECT_FALSE(watcher2.touch_observed());
 }
 
 }  // namespace views