Revert "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 6c8688278d99b65caf893663f81fb904847eca43..b04c579594e443b1da57f8abec1ba59ba4800abd 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -76,24 +76,4 @@ TEST(AcceleratorTableTest, CheckDuplicatedNonrepeatableActions) {
   }
 }
 
-#if defined(OS_CHROMEOS)
-
-TEST(AcceleratorTableTest, CheckDeprecatedAccelerators) {
-  std::set<AcceleratorAction> deprecated_actions;
-  for (size_t i = 0; i < kDeprecatedAcceleratorsLength; ++i) {
-    // A deprecated action can never appear twice in the list.
-    AcceleratorAction deprecated_action =
-        kDeprecatedAccelerators[i].deprecated_accelerator.action;
-    EXPECT_TRUE(deprecated_actions.insert(deprecated_action).second)
-        << "Duplicated action: " << deprecated_action << " at index: " << i;
-
-    // The UMA histogram name must be of the format "Ash.Accelerators.*"
-    std::string uma_histogram(kDeprecatedAccelerators[i].uma_histogram_name);
-    EXPECT_TRUE(uma_histogram.find("Ash.Accelerators.") != std::string::npos);
-    EXPECT_TRUE(uma_histogram.find("Ash.Accelerators.") == 0);
-  }
-}
-
-#endif  // defined(OS_CHROMEOS)
-
 }  // namespace ash