WindowManagerClient::AddAccelerator() should take an array

services/ui/ws/window_manager_state_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 "services/ui/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/ui/common/accelerator_transport_util.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/ws/accelerator.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h"
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/test_utils.h"
@@ skipping 199 matching lines @@
   child_window->SetVisible(true);
   SetCanFocusUp(child_window);
   tree()->GetDisplay(child_window)->AddActivationParent(child_window->parent());
   ASSERT_TRUE(window_tree()->SetFocus(child_window_id));
 
   // Register a pre-accelerator.
   uint32_t accelerator_id = 11;
   {
     mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
         ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
-    ASSERT_TRUE(window_manager_state()->event_dispatcher()->AddAccelerator(
-        accelerator_id, std::move(matcher)));
+
+    std::vector<ui::mojom::AcceleratorTransportPtr> accelerators;
+    accelerators = ash::mus::AddAcceleratorHelper(
+        std::move(accelerators), accelerator_id, std::move(matcher));
+
+    ASSERT_TRUE(window_manager_state()->event_dispatcher()->AddAccelerators(
+        std::move(accelerators)));
   }
   TestChangeTracker* tracker = wm_client()->tracker();
   tracker->changes()->clear();
   TestChangeTracker* tracker2 = window_tree_client()->tracker();
   tracker2->changes()->clear();
 
   // Send an ensure only the pre accelerator is called.
   ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
   window_manager_state()->ProcessEvent(key);
   EXPECT_TRUE(window_manager()->on_accelerator_called());
@@ skipping 316 matching lines @@
   ASSERT_EQ(1u, tree->roots().size());
   ClientWindowId root_client_id;
   ASSERT_TRUE(tree->IsWindowKnown(*(tree->roots().begin()), &root_client_id));
   EXPECT_TRUE(tree->DeleteWindow(root_client_id));
   window_server->DestroyTree(tree);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui