Make mash register initial batch of accelerators in single shot.

ash/mus/accelerators/accelerator_controller_unittest.cc

Index: ash/mus/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/mus/accelerators/accelerator_controller_unittest.cc b/ash/mus/accelerators/accelerator_controller_unittest.cc
index f7e999dfb24191ae6051eba48ee1a388a508640c..4fcbde46eb772f4e3eb0c7c52621e7fc74569415 100644
--- a/ash/mus/accelerators/accelerator_controller_unittest.cc
+++ b/ash/mus/accelerators/accelerator_controller_unittest.cc
@@ -343,8 +343,10 @@ TEST_F(AcceleratorControllerTest, LingeringExitWarningBubble) {
 
 TEST_F(AcceleratorControllerTest, Register) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  GetController()->Register(accelerators, &target);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessInController(accelerator_a));
@@ -353,10 +355,13 @@ TEST_F(AcceleratorControllerTest, Register) {
 
 TEST_F(AcceleratorControllerTest, RegisterMultipleTarget) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
+  GetController()->Register(accelerators, &target1);
+
   TestTarget target2;
-  GetController()->Register(accelerator_a, &target2);
+  GetController()->Register(accelerators, &target2);
 
   // If multiple targets are registered with the same accelerator, the target
   // registered later processes the accelerator.
@@ -366,11 +371,15 @@ TEST_F(AcceleratorControllerTest, RegisterMultipleTarget) {
 }
 
 TEST_F(AcceleratorControllerTest, Unregister) {
-  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  std::vector<ui::Accelerator> ui_accelerators;
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+
+  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
-  GetController()->Register(accelerator_b, &target);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a,
+                                                      accelerator_b};
+
+  GetController()->Register(accelerators, &target);
 
   // Unregistering a different accelerator does not affect the other
   // accelerator.
@@ -386,14 +395,21 @@ TEST_F(AcceleratorControllerTest, Unregister) {
 }
 
 TEST_F(AcceleratorControllerTest, UnregisterAll) {
-  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
+
+  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
-  GetController()->Register(accelerator_b, &target1);
+  const std::vector<ui::Accelerator> accelerators = {accelerator_a,
+                                                     accelerator_b};
+
+  GetController()->Register(accelerators, &target1);
+
   const ui::Accelerator accelerator_c(ui::VKEY_C, ui::EF_NONE);
+
+  const std::vector<ui::Accelerator> accelerators_2 = {accelerator_c};
   TestTarget target2;
-  GetController()->Register(accelerator_c, &target2);
+  GetController()->Register(accelerators_2, &target2);
+
   GetController()->UnregisterAll(&target1);
 
   // All the accelerators registered for |target1| are no longer processed.
@@ -408,8 +424,9 @@ TEST_F(AcceleratorControllerTest, UnregisterAll) {
 
 TEST_F(AcceleratorControllerTest, Process) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const std::vector<ui::Accelerator> accelerators = {accelerator_a};
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
+  GetController()->Register(accelerators, &target1);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessInController(accelerator_a));
@@ -424,7 +441,9 @@ TEST_F(AcceleratorControllerTest, IsRegistered) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator accelerator_shift_a(ui::VKEY_A, ui::EF_SHIFT_DOWN);
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  const std::vector<ui::Accelerator> accelerators = {accelerator_a};
+  GetController()->Register(accelerators, &target);
+
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);