MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

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 1c3402d73e2b161fa4d018a5658424c451ad8b5a..bba3443a47bc61bf95d075ccc867fb627a815772 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -67,7 +67,7 @@ TEST_F(AcceleratorManagerTest, Register) {
                     &target);
 
   // The registered accelerator is processed.
-  EXPECT_TRUE(manager_.Process(accelerator_a));
+  EXPECT_TRUE(manager_.ProcessAccelerator(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
@@ -82,7 +82,7 @@ TEST_F(AcceleratorManagerTest, RegisterMultipleTarget) {
 
   // If multiple targets are registered with the same accelerator, the target
   // registered later processes the accelerator.
-  EXPECT_TRUE(manager_.Process(accelerator_a));
+  EXPECT_TRUE(manager_.ProcessAccelerator(accelerator_a));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
@@ -99,13 +99,13 @@ TEST_F(AcceleratorManagerTest, Unregister) {
   // Unregistering a different accelerator does not affect the other
   // accelerator.
   manager_.Unregister(accelerator_b, &target);
-  EXPECT_TRUE(manager_.Process(accelerator_a));
+  EXPECT_TRUE(manager_.ProcessAccelerator(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 
   // The unregistered accelerator is no longer processed.
   target.set_accelerator_pressed_count(0);
   manager_.Unregister(accelerator_a, &target);
-  EXPECT_FALSE(manager_.Process(accelerator_a));
+  EXPECT_FALSE(manager_.ProcessAccelerator(accelerator_a));
   EXPECT_EQ(0, target.accelerator_pressed_count());
 }
 
@@ -124,12 +124,12 @@ TEST_F(AcceleratorManagerTest, UnregisterAll) {
   manager_.UnregisterAll(&target1);
 
   // All the accelerators registered for |target1| are no longer processed.
-  EXPECT_FALSE(manager_.Process(accelerator_a));
-  EXPECT_FALSE(manager_.Process(accelerator_b));
+  EXPECT_FALSE(manager_.ProcessAccelerator(accelerator_a));
+  EXPECT_FALSE(manager_.ProcessAccelerator(accelerator_b));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
 
   // UnregisterAll with a different target does not affect the other target.
-  EXPECT_TRUE(manager_.Process(accelerator_c));
+  EXPECT_TRUE(manager_.ProcessAccelerator(accelerator_c));
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
 
@@ -145,24 +145,29 @@ TEST_F(AcceleratorManagerTest, Process) {
 
     // The registered accelerator is processed.
     const int last_count = target.accelerator_pressed_count();
-    EXPECT_TRUE(manager_.Process(accelerator)) << text;
+    EXPECT_TRUE(manager_.ProcessAccelerator(accelerator)) << text;
     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
+    EXPECT_FALSE(manager_.ProcessAccelerator(accelerator))
+        << text;  // different type
     accelerator.set_type(ET_TRANSLATED_KEY_PRESS);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
+    EXPECT_FALSE(manager_.ProcessAccelerator(accelerator))
+        << text;  // different type
     accelerator.set_type(ET_KEY_RELEASED);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
+    EXPECT_FALSE(manager_.ProcessAccelerator(accelerator))
+        << text;  // different type
     accelerator.set_type(ET_TRANSLATED_KEY_RELEASE);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
+    EXPECT_FALSE(manager_.ProcessAccelerator(accelerator))
+        << text;  // different type
 
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_UNKNOWN, mask)))
+    EXPECT_FALSE(
+        manager_.ProcessAccelerator(GetAccelerator(VKEY_UNKNOWN, mask)))
         << text;  // different vkey
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_B, mask)))
+    EXPECT_FALSE(manager_.ProcessAccelerator(GetAccelerator(VKEY_B, mask)))
         << text;  // different vkey
-    EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_SHIFT, mask)))
+    EXPECT_FALSE(manager_.ProcessAccelerator(GetAccelerator(VKEY_SHIFT, mask)))
         << text;  // different vkey
 
     for (int test_mask = 0; test_mask < 2 * 2 * 2; ++test_mask) {
@@ -170,7 +175,7 @@ TEST_F(AcceleratorManagerTest, Process) {
         continue;
       const Accelerator test_accelerator(GetAccelerator(VKEY_A, test_mask));
       const base::string16 test_text = test_accelerator.GetShortcutText();
-      EXPECT_FALSE(manager_.Process(test_accelerator))
+      EXPECT_FALSE(manager_.ProcessAccelerator(test_accelerator))
           << text << ", " << test_text;  // different modifiers
     }