Renames WmShell to ShellPort

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_port.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm_shell.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 PointerWatcherAdapterTest = test::AshTestBase;
 
 enum TestPointerCaptureEvents {
   NONE = 0x01,
   CAPTURE = 0x02,
   WHEEL = 0x04,
   PRESS_OR_RELEASE = 0x08,
   MOVE = 0x10,
   DRAG = 0x20
 };
 
 // Records calls to OnPointerEventObserved() in |mouse_wheel_event_count| for a
 // mouse wheel event, in |capture_changed_count_| for a mouse capture change
 // event and in |pointer_event_count_| for all other pointer events.
 class TestPointerWatcher : public views::PointerWatcher {
  public:
   explicit TestPointerWatcher(views::PointerWatcherEventTypes events) {
-    WmShell::Get()->AddPointerWatcher(this, events);
+    ShellPort::Get()->AddPointerWatcher(this, events);
   }
-  ~TestPointerWatcher() override { WmShell::Get()->RemovePointerWatcher(this); }
+  ~TestPointerWatcher() override {
+    ShellPort::Get()->RemovePointerWatcher(this);
+  }
 
   void ClearCounts() {
     pointer_event_count_ = capture_changed_count_ = mouse_wheel_event_count_ =
         move_changed_count_ = drag_changed_count_ = 0;
   }
 
   int pointer_event_count() const { return pointer_event_count_; }
   int capture_changed_count() const { return capture_changed_count_; }
   int mouse_wheel_event_count() const { return mouse_wheel_event_count_; }
   int move_changed_count() const { return move_changed_count_; }
@@ skipping 156 matching lines @@
   GetEventGenerator().MoveTouchId(gfx::Point(20, 30), touch_id);
   helper.ExpectCallCount(NONE, NONE, DRAG);
 
   // Release: both (contrary to mouse above, touch does not implicitly generate
   // capture).
   GetEventGenerator().ReleaseTouchId(touch_id);
   helper.ExpectCallCount(PRESS_OR_RELEASE, PRESS_OR_RELEASE, PRESS_OR_RELEASE);
 }
 
 }  // namespace ash