Adds ability for pre-target accelerators to not consume events

services/ui/public/cpp/tests/window_server_test_base.cc

Index: services/ui/public/cpp/tests/window_server_test_base.cc
diff --git a/services/ui/public/cpp/tests/window_server_test_base.cc b/services/ui/public/cpp/tests/window_server_test_base.cc
index 1a72fdc23ae4a4e87f4aa5d43648f21b817f491f..e3fa201a11d5c0c02b28d1df8d1bf4e47483c56b 100644
--- a/services/ui/public/cpp/tests/window_server_test_base.cc
+++ b/services/ui/public/cpp/tests/window_server_test_base.cc
@@ -131,11 +131,6 @@ void WindowServerTestBase::OnWmNewDisplay(Window* window,
     window_manager_delegate_->OnWmNewDisplay(window, display);
 }
 
-void WindowServerTestBase::OnAccelerator(uint32_t id, const ui::Event& event) {
-  if (window_manager_delegate_)
-    window_manager_delegate_->OnAccelerator(id, event);
-}
-
 void WindowServerTestBase::OnWmPerformMoveLoop(
     Window* window,
     mojom::MoveLoopSource source,
@@ -152,6 +147,13 @@ void WindowServerTestBase::OnWmCancelMoveLoop(Window* window) {
     window_manager_delegate_->OnWmCancelMoveLoop(window);
 }
 
+mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id,
+                                                       const ui::Event& event) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnAccelerator(accelerator_id, event)
+             : mojom::EventResult::UNHANDLED;
+}
+
 void WindowServerTestBase::Create(shell::Connection* connection,
                                   mojom::WindowTreeClientRequest request) {
   new WindowTreeClient(this, nullptr, std::move(request));