Deprecating high-conflict accelerators

ash/accelerators/accelerator_table_unittest.cc

Index: ash/accelerators/accelerator_table_unittest.cc
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc
index b04c579594e443b1da57f8abec1ba59ba4800abd..a3e708430925ce57c2dcd53c2f1bc07d830af2b7 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -76,4 +76,24 @@ TEST(AcceleratorTableTest, CheckDuplicatedNonrepeatableActions) {
   }
 }
 
+TEST(AcceleratorTableTest, CheckDeprecatedAccelerators) {
+  std::set<AcceleratorAction> non_deprecated_actions;
+  for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
+    non_deprecated_actions.insert(kAcceleratorData[i].action);
+  }

[oshima, 2015/06/16 05:54:17]

nuke {}

[afakhry, 2015/06/16 22:30:33]

Done.

+
+  // 1- A deprecated action can never be part of the non-deprecated actions.
+  // 2- A new accelerator replacing a deprecated one must be mapped to the same
+  //    action.
+  for (size_t i = 0; i < kDeprecatedAcceleratorsLength; ++i) {
+    AcceleratorAction deprecated_action =
+        kDeprecatedAccelerators[i].deprecated_accelerator.action;
+    EXPECT_FALSE(non_deprecated_actions.count(deprecated_action));
+
+    AcceleratorAction new_action =
+        kDeprecatedAccelerators[i].new_accelerator.action;
+    EXPECT_EQ(deprecated_action, new_action);
+  }
+}
+
 }  // namespace ash