Adds ability for pre-target accelerators to not consume events

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 84 matching lines @@
     tree_->window_manager_internal_ = wm_internal;
   }
   void AckOldestEvent() {
     tree_->OnWindowInputEventAck(tree_->event_ack_id_,
                                  mojom::EventResult::UNHANDLED);
   }
   void EnableCapture() { tree_->event_ack_id_ = 1u; }
   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);
 
  private:
   WindowTree* tree_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi);
 };
 
@@ skipping 140 matching lines @@
 
   bool did_call_create_top_level_window(uint32_t* change_id) {
     if (!got_create_top_level_window_)
       return false;
 
     got_create_top_level_window_ = false;
     *change_id = change_id_;
     return true;
   }
 
+  void ClearAcceleratorCalled() {
+    on_accelerator_id_ = 0u;
+    on_accelerator_called_ = false;
+  }
+
   bool on_accelerator_called() { return on_accelerator_called_; }
   uint32_t on_accelerator_id() { return on_accelerator_id_; }
 
  private:
   // WindowManager:
   void OnConnect(uint16_t client_id) override {}
   void WmNewDisplayAdded(ui::mojom::DisplayPtr display,
                          ui::mojom::WindowDataPtr root,
                          bool drawn) override {}
   void WmSetBounds(uint32_t change_id,
                    uint32_t window_id,
                    const gfx::Rect& bounds) override {}
   void WmSetProperty(uint32_t change_id,
                      uint32_t window_id,
                      const mojo::String& name,
                      mojo::Array<uint8_t> value) override {}
   void WmCreateTopLevelWindow(
       uint32_t change_id,
       ClientSpecificId requesting_client_id,
       mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
   void WmClientJankinessChanged(ClientSpecificId client_id,
                                 bool janky) 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 got_create_top_level_window_;
   uint32_t change_id_;
 
   bool on_accelerator_called_;
   uint32_t on_accelerator_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowManager);
 };
 
@@ skipping 230 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_