Make mash register initial batch of accelerators in single shot.

ash/accelerators/accelerator_controller_unittest.cc

Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index abf2ab706dc0e96be65831a9c1a5edaf3cb4e566..fe991014f044602706a2ad940a672eeab5ed6aef 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -334,8 +334,9 @@ 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));
@@ -344,10 +345,12 @@ 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.
@@ -358,10 +361,12 @@ TEST_F(AcceleratorControllerTest, RegisterMultipleTarget) {
 
 TEST_F(AcceleratorControllerTest, Unregister) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
-  TestTarget target;
-  GetController()->Register(accelerator_a, &target);
   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};
+
+  TestTarget target;
+  GetController()->Register(accelerators, &target);
 
   // Unregistering a different accelerator does not affect the other
   // accelerator.
@@ -378,13 +383,16 @@ 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_b(ui::VKEY_B, ui::EF_NONE);
-  GetController()->Register(accelerator_b, &target1);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a,
+                                                      accelerator_b};
+  TestTarget target1;
+  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.
@@ -399,8 +407,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));
@@ -414,8 +423,10 @@ TEST_F(AcceleratorControllerTest, Process) {
 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);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  GetController()->Register(accelerators, &target);
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
@@ -653,12 +664,17 @@ TEST_F(AcceleratorControllerTest, CenterWindowAccelerator) {
 TEST_F(AcceleratorControllerTest, AutoRepeat) {
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_CONTROL_DOWN);
   accelerator_a.set_type(ui::ET_KEY_PRESSED);
+
+  const std::vector<ui::Accelerator>& accelerators_a = {accelerator_a};
+
   TestTarget target_a;
-  GetController()->Register(accelerator_a, &target_a);
+  GetController()->Register(accelerators_a, &target_a);
   ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_CONTROL_DOWN);
   accelerator_b.set_type(ui::ET_KEY_PRESSED);
   TestTarget target_b;
-  GetController()->Register(accelerator_b, &target_b);
+
+  const std::vector<ui::Accelerator>& accelerators_b = {accelerator_b};
+  GetController()->Register(accelerators_b, &target_b);
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.PressKey(ui::VKEY_A, ui::EF_CONTROL_DOWN);
@@ -757,7 +773,9 @@ TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) {
   DisableIME();
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+  GetController()->Register(accelerators, &target);
 
   // The accelerator is processed only once.
   ui::EventProcessor* dispatcher =