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 0846c34fad55a2d2ab5c4ea9d7706df70222bfb0..a1dea13b427cf9affe932ed5b8c362c9f9ecd8cb 100644
--- a/ash/mus/accelerators/accelerator_controller_unittest.cc
+++ b/ash/mus/accelerators/accelerator_controller_unittest.cc
@@ -345,8 +345,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};

[mfomitchev, 2017/01/24 21:00:30]

no need for the local variable when it's only used once. There's more cases like
this below.

[thanhph1, 2017/01/24 21:17:06]

Done, thanks!

   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  GetController()->Register(accelerators, &target);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessInController(accelerator_a));
@@ -355,10 +357,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};

[mfomitchev, 2017/01/24 21:00:30]

Nit: I wouldn't declare a local var for this either. We do use it twice, but
using {accelerator_a} instead works pretty well too. Same in other similar
places.

[thanhph1, 2017/01/24 21:17:06]

Done.

+
   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.
@@ -368,11 +373,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.
@@ -388,14 +397,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.
@@ -410,8 +426,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));
@@ -426,7 +443,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);