Adds ability for pre-target accelerators to not consume events

services/ui/ws/test_utils.h

Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index 18ec3213215ed85661d2843284b93578729e7b14..e701b55deb5e7b23b12ab959538856cece40ee27 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -102,6 +102,9 @@ class WindowTreeTestApi {
   void AckLastEvent(mojom::EventResult result) {
     tree_->OnWindowInputEventAck(tree_->event_ack_id_, result);
   }
+  void AckLastAccelerator(mojom::EventResult result) {
+    tree_->OnAcceleratorAck(tree_->event_ack_id_, result);
+  }
 
   void SetEventObserver(mojom::EventMatcherPtr matcher,
                         uint32_t event_observer_id);
@@ -282,6 +285,11 @@ class TestWindowManager : public mojom::WindowManager {
     return true;
   }
 
+  void ClearAcceleratorCalled() {
+    on_accelerator_id_ = 0u;
+    on_accelerator_called_ = false;
+  }
+
   bool on_perform_move_loop_called() { return on_perform_move_loop_called_; }
   bool on_accelerator_called() { return on_accelerator_called_; }
   uint32_t on_accelerator_id() { return on_accelerator_id_; }
@@ -310,7 +318,9 @@ class TestWindowManager : public mojom::WindowManager {
                          mojom::MoveLoopSource source,
                          const gfx::Point& cursor_location) override;
   void WmCancelMoveLoop(uint32_t window_id) override;
-  void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override;
+  void OnAccelerator(uint32_t ack_id,
+                     uint32_t accelerator_id,
+                     std::unique_ptr<ui::Event> event) override;
 
   bool on_perform_move_loop_called_ = false;