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..d0f4eceb6955588693f69400a82b0516dda85f6e 100644
--- a/ash/mus/accelerators/accelerator_controller_unittest.cc
+++ b/ash/mus/accelerators/accelerator_controller_unittest.cc
@@ -366,12 +366,19 @@ 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;
+
+  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  ui_accelerators.push_back(accelerator_a);
   GetController()->Register(accelerator_a, &target);
+
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
+  ui_accelerators.push_back(accelerator_b);
   GetController()->Register(accelerator_b, &target);
 
+  GetController()->Registers(ui_accelerators);
+
   // Unregistering a different accelerator does not affect the other
   // accelerator.
   GetController()->Unregister(accelerator_b, &target);
@@ -386,14 +393,24 @@ TEST_F(AcceleratorControllerTest, Unregister) {
 }
 
 TEST_F(AcceleratorControllerTest, UnregisterAll) {
-  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  std::vector<ui::Accelerator> ui_accelerators;
   TestTarget target1;
+
+  const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  ui_accelerators.push_back(accelerator_a);
   GetController()->Register(accelerator_a, &target1);
+
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
+  ui_accelerators.push_back(accelerator_b);
   GetController()->Register(accelerator_b, &target1);
+
   const ui::Accelerator accelerator_c(ui::VKEY_C, ui::EF_NONE);
+  ui_accelerators.push_back(accelerator_c);
   TestTarget target2;
   GetController()->Register(accelerator_c, &target2);
+
+  GetController()->Registers(ui_accelerators);
+
   GetController()->UnregisterAll(&target1);
 
   // All the accelerators registered for |target1| are no longer processed.
@@ -424,7 +441,11 @@ 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;
+  std::vector<ui::Accelerator> ui_accelerators;
+  ui_accelerators.push_back(accelerator_a);
   GetController()->Register(accelerator_a, &target);
+  GetController()->Registers(ui_accelerators);
+
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);