Deprecating high-conflict accelerators

ash/accelerators/accelerator_table_unittest.cc

 // Copyright (c) 2012 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 <set>
 
 #include "base/basictypes.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 58 matching lines @@
 
 TEST(AcceleratorTableTest, CheckDuplicatedNonrepeatableActions) {
   std::set<AcceleratorAction> actions;
   for (size_t i = 0; i < kNonrepeatableActionsLength; ++i) {
     EXPECT_TRUE(actions.insert(kNonrepeatableActions[i]).second)
         << "Duplicated action: " << kNonrepeatableActions[i]
         << " at index: " << i;
   }
 }
 
+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