ash: Eliminate PointerWatcherDelegate

ash/aura/pointer_watcher_adapter_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 "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
-using PointerWatcherDelegateAuraTest = test::AshTestBase;
+using PointerWatcherAdapterTest = test::AshTestBase;
 
 // Records calls to OnPointerEventObserved() in |pointer_event_count_| and
 // calls to OnMouseCaptureChanged() to |capture_changed_count_|.
 class TestPointerWatcher : public views::PointerWatcher {
  public:
   explicit TestPointerWatcher(bool wants_moves) {
-    Shell::GetInstance()->AddPointerWatcher(this, wants_moves);
+    WmShell::Get()->AddPointerWatcher(this, wants_moves);
   }
-  ~TestPointerWatcher() override {
-    Shell::GetInstance()->RemovePointerWatcher(this);
-  }
+  ~TestPointerWatcher() override { WmShell::Get()->RemovePointerWatcher(this); }
 
   void ClearCounts() { pointer_event_count_ = capture_changed_count_ = 0; }
 
   int pointer_event_count() const { return pointer_event_count_; }
   int capture_changed_count() const { return capture_changed_count_; }
 
   // views::PointerWatcher:
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               const gfx::Point& location_in_screen,
                               views::Widget* target) override {
@@ skipping 31 matching lines @@
     move_watcher_.ClearCounts();
   }
 
  private:
   TestPointerWatcher non_move_watcher_;
   TestPointerWatcher move_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(TestHelper);
 };
 
-TEST_F(PointerWatcherDelegateAuraTest, MouseEvents) {
+TEST_F(PointerWatcherAdapterTest, MouseEvents) {
   TestHelper helper;
 
   // Move: only the move PointerWatcher should get the event.
   GetEventGenerator().MoveMouseTo(gfx::Point(10, 10));
   helper.ExpectCallCount(0, 0, 1, 0);
 
   // Press: both.
   GetEventGenerator().PressLeftButton();
   helper.ExpectCallCount(1, 0, 1, 0);
 
@@ skipping 19 matching lines @@
   GetEventGenerator().MoveMouseWheel(10, 11);
   helper.ExpectCallCount(0, 0, 0, 0);
 
   // Capture: both.
   ui::MouseEvent capture_event(ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(),
                                gfx::Point(), ui::EventTimeForNow(), 0, 0);
   GetEventGenerator().Dispatch(&capture_event);
   helper.ExpectCallCount(0, 1, 0, 1);
 }
 
-TEST_F(PointerWatcherDelegateAuraTest, TouchEvents) {
+TEST_F(PointerWatcherAdapterTest, TouchEvents) {
   TestHelper helper;
 
   // Press: both.
   const int touch_id = 11;
   GetEventGenerator().PressTouchId(touch_id);
   helper.ExpectCallCount(1, 0, 1, 0);
 
   // Drag: none.
   GetEventGenerator().MoveTouchId(gfx::Point(20, 30), touch_id);
   helper.ExpectCallCount(0, 0, 0, 0);
 
   // Release: both (contrary to mouse above, touch does not implicitly generate
   // capture).
   GetEventGenerator().ReleaseTouchId(touch_id);
   helper.ExpectCallCount(1, 0, 1, 0);
 }
 
 }  // namespace ash