WindowManagerClient::AddAccelerator() should take an array

services/ui/ws/event_dispatcher_unittest.cc

 // Copyright 2015 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/event_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
@@ skipping 367 matching lines @@
 }
 
 TEST_F(EventDispatcherTest, AcceleratorBasic) {
   ClearSetup();
   TestEventDispatcherDelegate event_dispatcher_delegate(nullptr);
   EventDispatcher dispatcher(&event_dispatcher_delegate);
 
   uint32_t accelerator_1 = 1;
   mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
       ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
-  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_1, std::move(matcher)));
+
+  ui::mojom::AcceleratorTransportPtr accelerator_transport(

[mfomitchev, 2016/11/24 21:21:04]

Try to get rid of the duplicated code here, e.g. by putting it into a method.
This code block appears over and over. In general, whenever you find yourself
writing the same code more than once - this is a signal that you should consider
putting it into a function or try to find some other way to remove duplication.

[thanhph, 2016/11/29 00:08:29]

Done, thanks! I use the helper defined in accelerator_transport_util.h.

+      ui::mojom::AcceleratorTransport::New());
+  accelerator_transport->id = accelerator_1;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_1;
+  multi_accelerators_1.push_back(std::move(accelerator_transport));
+
+  EXPECT_TRUE(dispatcher.AddAccelerators(std::move(multi_accelerators_1)));
 
   uint32_t accelerator_2 = 2;
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
                                  ui::mojom::kEventFlagNone);
-  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_2, std::move(matcher)));
+
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_2;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_2;
+  multi_accelerators_2.push_back(std::move(accelerator_transport));
+
+  EXPECT_TRUE(dispatcher.AddAccelerators(std::move(multi_accelerators_2)));
 
   // Attempting to add a new accelerator with the same id should fail.
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
                                  ui::mojom::kEventFlagNone);
-  EXPECT_FALSE(dispatcher.AddAccelerator(accelerator_2, std::move(matcher)));
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_2;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_3;
+  multi_accelerators_3.push_back(std::move(accelerator_transport));
+  EXPECT_FALSE(dispatcher.AddAccelerators(std::move(multi_accelerators_3)));
 
   // Adding the accelerator with the same id should succeed once the existing
   // accelerator is removed.
   dispatcher.RemoveAccelerator(accelerator_2);
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
                                  ui::mojom::kEventFlagNone);
-  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_2, std::move(matcher)));
+
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_2;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_4;
+  multi_accelerators_4.push_back(std::move(accelerator_transport));
+  EXPECT_TRUE(dispatcher.AddAccelerators(std::move(multi_accelerators_4)));
 
   // Attempting to add an accelerator with the same matcher should fail.
   uint32_t accelerator_3 = 3;
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
                                  ui::mojom::kEventFlagNone);
-  EXPECT_FALSE(dispatcher.AddAccelerator(accelerator_3, std::move(matcher)));
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_3;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_5;
+  multi_accelerators_5.push_back(std::move(accelerator_transport));
+  EXPECT_FALSE(dispatcher.AddAccelerators(std::move(multi_accelerators_5)));
 
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
                                  ui::mojom::kEventFlagControlDown);
-  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_3, std::move(matcher)));
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_3;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_6;
+  multi_accelerators_6.push_back(std::move(accelerator_transport));
+  EXPECT_TRUE(dispatcher.AddAccelerators(std::move(multi_accelerators_6)));
 }
 
 TEST_F(EventDispatcherTest, EventMatching) {
   TestEventDispatcherDelegate* event_dispatcher_delegate =
       test_event_dispatcher_delegate();
   EventDispatcher* dispatcher = event_dispatcher();
 
   mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
       ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
   uint32_t accelerator_1 = 1;
-  dispatcher->AddAccelerator(accelerator_1, std::move(matcher));
+
+  ui::mojom::AcceleratorTransportPtr accelerator_transport(
+      ui::mojom::AcceleratorTransport::New());
+  accelerator_transport->id = accelerator_1;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_1;
+  multi_accelerators_1.push_back(std::move(accelerator_transport));
+  dispatcher->AddAccelerators(std::move(multi_accelerators_1));
 
   ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(accelerator_1,
             event_dispatcher_delegate->GetAndClearLastAccelerator());
 
   // EF_NUM_LOCK_ON should be ignored since CreateKeyMatcher defaults to
   // ignoring.
   key = ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_W,
                      ui::EF_CONTROL_DOWN | ui::EF_NUM_LOCK_ON);
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(accelerator_1,
             event_dispatcher_delegate->GetAndClearLastAccelerator());
 
   key = ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_NONE);
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
 
   uint32_t accelerator_2 = 2;
   matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::W,
                                  ui::mojom::kEventFlagNone);
-  dispatcher->AddAccelerator(accelerator_2, std::move(matcher));
+  accelerator_transport = ui::mojom::AcceleratorTransport::New();
+  accelerator_transport->id = accelerator_2;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_2;
+  multi_accelerators_2.push_back(std::move(accelerator_transport));
+  dispatcher->AddAccelerators(std::move(multi_accelerators_2));
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(accelerator_2,
             event_dispatcher_delegate->GetAndClearLastAccelerator());
 
   dispatcher->RemoveAccelerator(accelerator_2);
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
 }
 
 // Tests that a post-target accelerator is not triggered by ProcessEvent.
 TEST_F(EventDispatcherTest, PostTargetAccelerator) {
   TestEventDispatcherDelegate* event_dispatcher_delegate =
       test_event_dispatcher_delegate();
   EventDispatcher* dispatcher = event_dispatcher();
 
   mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
       ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
   matcher->accelerator_phase = ui::mojom::AcceleratorPhase::POST_TARGET;
   uint32_t accelerator_1 = 1;
-  dispatcher->AddAccelerator(accelerator_1, std::move(matcher));
+  ui::mojom::AcceleratorTransportPtr accelerator_transport(
+      ui::mojom::AcceleratorTransport::New());
+  accelerator_transport->id = accelerator_1;
+  accelerator_transport->event_matcher = std::move(matcher);
+  std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_1;
+  multi_accelerators_1.push_back(std::move(accelerator_transport));
+  dispatcher->AddAccelerators(std::move(multi_accelerators_1));
 
   ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
   // The post-target accelerator should be fired if there is no focused window.
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
   EXPECT_EQ(accelerator_1,
             event_dispatcher_delegate->GetAndClearLastAccelerator());
   std::unique_ptr<DispatchedEventDetails> details =
       event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
   EXPECT_FALSE(details);
 
@@ skipping 24 matching lines @@
 TEST_F(EventDispatcherTest, ProcessPost) {
   TestEventDispatcherDelegate* event_dispatcher_delegate =
       test_event_dispatcher_delegate();
   EventDispatcher* dispatcher = event_dispatcher();
 
   uint32_t pre_id = 1;
   {
     mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
         ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
     matcher->accelerator_phase = ui::mojom::AcceleratorPhase::PRE_TARGET;
-    dispatcher->AddAccelerator(pre_id, std::move(matcher));
+
+    ui::mojom::AcceleratorTransportPtr accelerator_transport(
+        ui::mojom::AcceleratorTransport::New());
+    accelerator_transport->id = pre_id;
+    accelerator_transport->event_matcher = std::move(matcher);
+    std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_1;
+    multi_accelerators_1.push_back(std::move(accelerator_transport));
+    dispatcher->AddAccelerators(std::move(multi_accelerators_1));
   }
 
   uint32_t post_id = 2;
   {
     mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
         ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
     matcher->accelerator_phase = ui::mojom::AcceleratorPhase::POST_TARGET;
-    dispatcher->AddAccelerator(post_id, std::move(matcher));
+    ui::mojom::AcceleratorTransportPtr accelerator_transport(
+        ui::mojom::AcceleratorTransport::New());
+    accelerator_transport->id = post_id;
+    accelerator_transport->event_matcher = std::move(matcher);
+    std::vector<ui::mojom::AcceleratorTransportPtr> multi_accelerators_2;
+    multi_accelerators_2.push_back(std::move(accelerator_transport));
+    dispatcher->AddAccelerators(std::move(multi_accelerators_2));
   }
 
   // Set focused window for EventDispatcher dispatches key events.
   std::unique_ptr<ServerWindow> child = CreateChildWindow(WindowId(1, 3));
   event_dispatcher_delegate->SetFocusedWindowFromEventDispatcher(child.get());
 
   // Dispatch for ANY, which should trigger PRE and not call
   // DispatchInputEventToWindow().
   ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
   dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
@@ skipping 1173 matching lines @@
   // The delegate can decide if it really wants to forward the event or not.
   EXPECT_EQ(child.get(),
             test_event_dispatcher_delegate()->lost_capture_window());
   EXPECT_EQ(child.get(), event_dispatcher()->capture_window());
   EXPECT_EQ(kClientAreaId, event_dispatcher()->capture_window_client_id());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui