Cleanup after removing views-mus code

ui/views/mus/pointer_watcher_event_router2_unittest.cc

Index: ui/views/mus/pointer_watcher_event_router2_unittest.cc
diff --git a/ui/views/mus/pointer_watcher_event_router2_unittest.cc b/ui/views/mus/pointer_watcher_event_router2_unittest.cc
deleted file mode 100644
index 38a5bc083b4e8e47041bce5bbdb9da4994c3d559..0000000000000000000000000000000000000000
--- a/ui/views/mus/pointer_watcher_event_router2_unittest.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-// 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/pointer_watcher_event_router2.h"
-
-#include <memory>
-
-#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
-#include "ui/events/event.h"
-#include "ui/views/mus/mus_client.h"
-#include "ui/views/pointer_watcher.h"
-#include "ui/views/test/scoped_views_test_helper.h"
-
-namespace views {
-namespace {
-
-class TestPointerWatcher : public PointerWatcher {
- public:
-  TestPointerWatcher() {}
-  ~TestPointerWatcher() override {}
-
-  ui::PointerEvent* last_event_observed() { return last_event_observed_.get(); }
-
-  void Reset() { last_event_observed_.reset(); }
-
-  // PointerWatcher:
-  void OnPointerEventObserved(const ui::PointerEvent& event,
-                              const gfx::Point& location_in_screen,
-                              Widget* target) override {
-    last_event_observed_ = base::MakeUnique<ui::PointerEvent>(event);
-  }
-
- private:
-  std::unique_ptr<ui::PointerEvent> last_event_observed_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestPointerWatcher);
-};
-
-}  // namespace
-
-class PointerWatcherEventRouter2Test : public testing::Test {
- public:
-  PointerWatcherEventRouter2Test() {}
-  ~PointerWatcherEventRouter2Test() override {}
-
-  void OnPointerEventObserved(const ui::PointerEvent& event) {
-    MusClient::Get()->pointer_watcher_event_router()->OnPointerEventObserved(
-        event, nullptr);
-  }
-
-  PointerWatcherEventRouter2::EventTypes event_types() const {
-    return MusClient::Get()->pointer_watcher_event_router()->event_types_;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PointerWatcherEventRouter2Test);
-};
-
-TEST_F(PointerWatcherEventRouter2Test, EventTypes) {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
-  ScopedViewsTestHelper helper;
-  TestPointerWatcher pointer_watcher1, pointer_watcher2;
-  PointerWatcherEventRouter2* pointer_watcher_event_router =
-      MusClient::Get()->pointer_watcher_event_router();
-  aura::WindowTreeClientPrivate test_api(
-      MusClient::Get()->window_tree_client());
-  EXPECT_FALSE(test_api.HasPointerWatcher());
-
-  // Start with no moves.
-  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher1, false);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::NON_MOVE_EVENTS,
-            event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Add moves.
-  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher2, true);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::MOVE_EVENTS, event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Remove no-moves.
-  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher1);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::MOVE_EVENTS, event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Remove moves.
-  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher2);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::NONE, event_types());
-  EXPECT_FALSE(test_api.HasPointerWatcher());
-
-  // Add moves.
-  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher2, true);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::MOVE_EVENTS, event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Add no moves.
-  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher1, false);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::MOVE_EVENTS, event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Remove moves.
-  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher2);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::NON_MOVE_EVENTS,
-            event_types());
-  EXPECT_TRUE(test_api.HasPointerWatcher());
-
-  // Remove no-moves.
-  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher1);
-  EXPECT_EQ(PointerWatcherEventRouter2::EventTypes::NONE, event_types());
-  EXPECT_FALSE(test_api.HasPointerWatcher());
-}
-
-TEST_F(PointerWatcherEventRouter2Test, PointerWatcherNoMove) {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
-  ScopedViewsTestHelper helper;
-  ASSERT_TRUE(MusClient::Get());
-  PointerWatcherEventRouter2* pointer_watcher_event_router =
-      MusClient::Get()->pointer_watcher_event_router();
-  ASSERT_TRUE(pointer_watcher_event_router);
-
-  ui::PointerEvent pointer_event_down(
-      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
-      base::TimeTicks());
-  ui::PointerEvent pointer_event_up(
-      ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
-      base::TimeTicks());
-  ui::PointerEvent pointer_event_wheel(
-      ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
-      0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
-      base::TimeTicks());
-  ui::PointerEvent pointer_event_capture(
-      ui::ET_POINTER_CAPTURE_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE,
-      1, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
-      base::TimeTicks());
-
-  // PointerWatchers receive pointer down events.
-  TestPointerWatcher watcher1;
-  pointer_watcher_event_router->AddPointerWatcher(&watcher1, false);
-  OnPointerEventObserved(pointer_event_down);
-  EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // PointerWatchers receive pointer up events.
-  OnPointerEventObserved(pointer_event_up);
-  EXPECT_EQ(ui::ET_POINTER_UP, watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // PointerWatchers receive pointer wheel changed events.
-  OnPointerEventObserved(pointer_event_wheel);
-  EXPECT_EQ(ui::ET_POINTER_WHEEL_CHANGED,
-            watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // PointerWatchers receive pointer capture changed events.
-  OnPointerEventObserved(pointer_event_capture);
-  EXPECT_EQ(ui::ET_POINTER_CAPTURE_CHANGED,
-            watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // Two PointerWatchers can both receive a single observed event.
-  TestPointerWatcher watcher2;
-  pointer_watcher_event_router->AddPointerWatcher(&watcher2, false);
-  OnPointerEventObserved(pointer_event_down);
-  EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
-  EXPECT_EQ(ui::ET_POINTER_DOWN, watcher2.last_event_observed()->type());
-  watcher1.Reset();
-  watcher2.Reset();
-
-  // Removing the first PointerWatcher stops sending events to it.
-  pointer_watcher_event_router->RemovePointerWatcher(&watcher1);
-  OnPointerEventObserved(pointer_event_down);
-  EXPECT_FALSE(watcher1.last_event_observed());
-  EXPECT_EQ(ui::ET_POINTER_DOWN, watcher2.last_event_observed()->type());
-  watcher1.Reset();
-  watcher2.Reset();
-
-  // Removing the last PointerWatcher stops sending events to it.
-  pointer_watcher_event_router->RemovePointerWatcher(&watcher2);
-  OnPointerEventObserved(pointer_event_down);
-  EXPECT_FALSE(watcher1.last_event_observed());
-  EXPECT_FALSE(watcher2.last_event_observed());
-}
-
-TEST_F(PointerWatcherEventRouter2Test, PointerWatcherMove) {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
-  ScopedViewsTestHelper helper;
-  ASSERT_TRUE(MusClient::Get());
-  PointerWatcherEventRouter2* pointer_watcher_event_router =
-      MusClient::Get()->pointer_watcher_event_router();
-  ASSERT_TRUE(pointer_watcher_event_router);
-
-  ui::PointerEvent pointer_event_down(
-      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
-      base::TimeTicks());
-  ui::PointerEvent pointer_event_move(
-      ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
-      base::TimeTicks());
-
-  // PointerWatchers receive pointer down events.
-  TestPointerWatcher watcher1;
-  pointer_watcher_event_router->AddPointerWatcher(&watcher1, true);
-  OnPointerEventObserved(pointer_event_down);
-  EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // PointerWatchers receive pointer move events.
-  OnPointerEventObserved(pointer_event_move);
-  EXPECT_EQ(ui::ET_POINTER_MOVED, watcher1.last_event_observed()->type());
-  watcher1.Reset();
-
-  // Two PointerWatchers can both receive a single observed event.
-  TestPointerWatcher watcher2;
-  pointer_watcher_event_router->AddPointerWatcher(&watcher2, true);
-  OnPointerEventObserved(pointer_event_move);
-  EXPECT_EQ(ui::ET_POINTER_MOVED, watcher1.last_event_observed()->type());
-  EXPECT_EQ(ui::ET_POINTER_MOVED, watcher2.last_event_observed()->type());
-  watcher1.Reset();
-  watcher2.Reset();
-
-  // Removing the first PointerWatcher stops sending events to it.
-  pointer_watcher_event_router->RemovePointerWatcher(&watcher1);
-  OnPointerEventObserved(pointer_event_move);
-  EXPECT_FALSE(watcher1.last_event_observed());
-  EXPECT_EQ(ui::ET_POINTER_MOVED, watcher2.last_event_observed()->type());
-  watcher1.Reset();
-  watcher2.Reset();
-
-  // Removing the last PointerWatcher stops sending events to it.
-  pointer_watcher_event_router->RemovePointerWatcher(&watcher2);
-  OnPointerEventObserved(pointer_event_move);
-  EXPECT_FALSE(watcher1.last_event_observed());
-  EXPECT_FALSE(watcher2.last_event_observed());
-}
-
-}  // namespace views