Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2586)

Unified Diff: ash/accelerators/accelerator_table_unittest.cc

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oshima's comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_table.cc ('k') | ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6c8688278d99b65caf893663f81fb904847eca43 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -76,4 +76,24 @@ 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
« no previous file with comments | « ash/accelerators/accelerator_table.cc ('k') | ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698