wip: Add ui::EventType parameter.

ui/base/accelerators/accelerator_manager_unittest.cc

Index: ui/base/accelerators/accelerator_manager_unittest.cc
diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc
index fddd91410615507f6b925dae9d35262bc8947b8d..fb5d603fe64a418e370d2765e47d7b4f89b00896 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -46,10 +46,6 @@ bool TestTarget::CanHandleAccelerators() const {
   return true;
 }
 
-Accelerator GetAccelerator(KeyboardCode code, int mask) {
-  return Accelerator(code, mask);
-}
-
 }  // namespace
 
 class AcceleratorManagerTest : public testing::Test {
@@ -61,7 +57,7 @@ class AcceleratorManagerTest : public testing::Test {
 };
 
 TEST_F(AcceleratorManagerTest, Register) {
-  const Accelerator accelerator_a(VKEY_A, EF_NONE);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE, ET_KEY_PRESSED);
   TestTarget target;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target);
@@ -72,7 +68,7 @@ TEST_F(AcceleratorManagerTest, Register) {
 }
 
 TEST_F(AcceleratorManagerTest, RegisterMultipleTarget) {
-  const Accelerator accelerator_a(VKEY_A, EF_NONE);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE, ET_KEY_PRESSED);
   TestTarget target1;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target1);
@@ -88,11 +84,11 @@ TEST_F(AcceleratorManagerTest, RegisterMultipleTarget) {
 }
 
 TEST_F(AcceleratorManagerTest, Unregister) {
-  const Accelerator accelerator_a(VKEY_A, EF_NONE);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE, ET_KEY_PRESSED);
   TestTarget target;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target);
-  const Accelerator accelerator_b(VKEY_B, EF_NONE);
+  const Accelerator accelerator_b(VKEY_B, EF_NONE, ET_KEY_PRESSED);
   manager_.Register(accelerator_b, AcceleratorManager::kNormalPriority,
                     &target);
 
@@ -110,14 +106,14 @@ TEST_F(AcceleratorManagerTest, Unregister) {
 }
 
 TEST_F(AcceleratorManagerTest, UnregisterAll) {
-  const Accelerator accelerator_a(VKEY_A, EF_NONE);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE, ET_KEY_PRESSED);
   TestTarget target1;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target1);
-  const Accelerator accelerator_b(VKEY_B, EF_NONE);
+  const Accelerator accelerator_b(VKEY_B, EF_NONE, ET_KEY_PRESSED);
   manager_.Register(accelerator_b, AcceleratorManager::kNormalPriority,
                     &target1);
-  const Accelerator accelerator_c(VKEY_C, EF_NONE);
+  const Accelerator accelerator_c(VKEY_C, EF_NONE, ET_KEY_PRESSED);
   TestTarget target2;
   manager_.Register(accelerator_c, AcceleratorManager::kNormalPriority,
                     &target2);
@@ -138,7 +134,7 @@ TEST_F(AcceleratorManagerTest, Process) {
 
   // Test all 2*2*2 cases (shift/control/alt = on/off).
   for (int mask = 0; mask < 2 * 2 * 2; ++mask) {
-    Accelerator accelerator(GetAccelerator(VKEY_A, mask));
+    Accelerator accelerator(VKEY_A, mask, ET_KEY_PRESSED);
     const string16 text = accelerator.GetShortcutText();
     manager_.Register(accelerator, AcceleratorManager::kNormalPriority,
                       &target);
@@ -149,26 +145,30 @@ TEST_F(AcceleratorManagerTest, Process) {
     EXPECT_EQ(last_count + 1, target.accelerator_pressed_count()) << text;
 
     // The non-registered accelerators are not processed.
-    accelerator.set_type(ET_UNKNOWN);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-    accelerator.set_type(ET_TRANSLATED_KEY_PRESS);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-    accelerator.set_type(ET_KEY_RELEASED);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-    accelerator.set_type(ET_TRANSLATED_KEY_RELEASE);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_UNKNOWN, mask)))
+    Accelerator accelerator2(VKEY_A, mask, ET_UNKNOWN);
+    EXPECT_FALSE(manager_.Process(accelerator2)) << text;  // different type
+    Accelerator accelerator3(VKEY_A, mask, ET_TRANSLATED_KEY_PRESS);
+    EXPECT_FALSE(manager_.Process(accelerator3)) << text;  // different type
+    Accelerator accelerator4(VKEY_A, mask, ET_KEY_RELEASED);
+    EXPECT_FALSE(manager_.Process(accelerator4)) << text;  // different type
+    Accelerator accelerator5(VKEY_A, mask, ET_TRANSLATED_KEY_RELEASE);
+    EXPECT_FALSE(manager_.Process(accelerator5)) << text;  // different type
+
+    EXPECT_FALSE(manager_.Process(Accelerator(VKEY_UNKNOWN,
+                                              mask,
+                                              ET_KEY_PRESSED)))
         << text;  // different vkey
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_B, mask)))
+    EXPECT_FALSE(manager_.Process(Accelerator(VKEY_B, mask, ET_KEY_PRESSED)))
         << text;  // different vkey
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_SHIFT, mask)))
+    EXPECT_FALSE(manager_.Process(Accelerator(VKEY_SHIFT,
+                                              mask,
+                                              ET_KEY_PRESSED)))
         << text;  // different vkey
 
     for (int test_mask = 0; test_mask < 2 * 2 * 2; ++test_mask) {
       if (test_mask == mask)
         continue;
-      const Accelerator test_accelerator(GetAccelerator(VKEY_A, test_mask));
+      const Accelerator test_accelerator(VKEY_A, test_mask, ET_KEY_PRESSED);
       const string16 test_text = test_accelerator.GetShortcutText();
       EXPECT_FALSE(manager_.Process(test_accelerator))
           << text << ", " << test_text;  // different modifiers