Make ui::test::EventGenerator work with PointerEvents in mash

ash/test/ash_test_base.cc

 // Copyright (c) 2012 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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/ime/input_method_event_handler.h"
+#include "ash/mus/window_manager.h"
+#include "ash/mus/window_manager_application.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/command_line.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 13 matching lines @@
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_connection.h"  // nogncheck
 #endif
 
 namespace ash {
 namespace test {
-namespace {
 
 class AshEventGeneratorDelegate
     : public aura::test::EventGeneratorDelegateAura {
  public:
-  AshEventGeneratorDelegate() {}
+  explicit AshEventGeneratorDelegate(AshTestHelper* ash_test_helper)
+      : ash_test_helper_(ash_test_helper) {
+    DCHECK(ash_test_helper_);
+  }
   ~AshEventGeneratorDelegate() override {}
 
   // aura::test::EventGeneratorDelegateAura overrides:
   aura::WindowTreeHost* GetHostAt(
       const gfx::Point& point_in_screen) const override {
     display::Screen* screen = display::Screen::GetScreen();
     display::Display display = screen->GetDisplayNearestPoint(point_in_screen);
     return WmShell::Get()
         ->GetRootWindowForDisplayId(display.id())
         ->aura_window()
         ->GetHost();
   }
 
   aura::client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const override {
     return aura::client::GetScreenPositionClient(window->GetRootWindow());
   }
 
   void DispatchKeyEventToIME(ui::EventTarget* target,
                              ui::KeyEvent* event) override {
     // In Ash environment, the key event will be processed by event rewriters
     // first.
   }
 
+  void DispatchEventToPointerWatchers(ui::EventTarget* target,
+                                      const ui::PointerEvent& event) override {

[sadrul, 2017/03/16 03:22:47]

Instead of doing this here, can you override this in EventGeneratorDelegateAura?

EventGeneratorDelegateAura can be changed to retain a pointer to the
WindowTreeClientDelegate, which gets set during construction (or right after
construction), which it then uses to trigger the watchers. This would allow this
to be used for tests in views too (see https://crbug.com/615033 for example).

[James Cook, 2017/03/16 19:13:32]

Great idea! By doing that I was able to inject the events directly into
WindowTreeClient, so it's even more similar to the production code path.

+    // In classic ash PointerWatchers are triggered by an EventHandler on
+    // ash::Shell and don't need special handling.
+    if (!WmShell::Get()->IsRunningInMash())
+      return;
+
+    // Route events though WindowManager similar to production mash. Does
+    // nothing if there are no pointer watchers installed.
+    ash_test_helper_->window_manager_app()
+        ->window_manager()
+        ->OnPointerEventObserved(event, static_cast<aura::Window*>(target));

[James Cook, 2017/03/15 19:01:19]

I think this cast is OK -- aura::test::EventGeneratorDelegateAura (the base
class) does this cast in several places.

+  }
+
  private:
+  AshTestHelper* const ash_test_helper_;
+
   DISALLOW_COPY_AND_ASSIGN(AshEventGeneratorDelegate);
 };
 
-}  // namespace
-
 /////////////////////////////////////////////////////////////////////////////
 
 AshTestBase::AshTestBase()
     : setup_called_(false), teardown_called_(false), start_session_(true) {
 #if defined(USE_X11)
   // This is needed for tests which use this base class but are run in browser
   // test binaries so don't get the default initialization in the unit test
   // suite.
   gfx::InitializeThreadedX11();
 #endif
@@ skipping 71 matching lines @@
       ->GetShelf();
 }
 
 // static
 SystemTray* AshTestBase::GetPrimarySystemTray() {
   return Shell::GetInstance()->GetPrimarySystemTray();
 }
 
 ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   if (!event_generator_) {
-    event_generator_.reset(
-        new ui::test::EventGenerator(new AshEventGeneratorDelegate()));
+    event_generator_.reset(new ui::test::EventGenerator(
+        new AshEventGeneratorDelegate(ash_test_helper_.get())));
   }
   return *event_generator_.get();
 }
 
 // static
 display::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64_t id) {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(id)
       .GetActiveRotation();
@@ skipping 206 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetSecondaryDisplay().id());
 }
 
 display::Display AshTestBase::GetSecondaryDisplay() {
   return ash_test_helper_->GetSecondaryDisplay();
 }
 
 }  // namespace test
 }  // namespace ash