| Index: chrome/browser/ui/views/accelerator_table_unittest.cc
|
| diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc
|
| index 9eaf616e704f890f1517cbfdfb68298bf9c3f3d3..00a96325000567c5f64e3a876bbe3497f74ff8dd 100644
|
| --- a/chrome/browser/ui/views/accelerator_table_unittest.cc
|
| +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
|
| @@ -43,16 +43,6 @@ TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
|
|
|
| #if defined(USE_ASH)
|
| TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
|
| - std::set<AcceleratorMapping, Cmp> allowed_duplicates;
|
| -#if defined(OS_CHROMEOS)
|
| - AcceleratorMapping exception_entry;
|
| - // Both Chrome and Ash have a shortcut for F4
|
| - exception_entry.keycode = ui::VKEY_F4;
|
| - exception_entry.modifiers = ui::EF_NONE;
|
| - exception_entry.command_id = 0; // dummy
|
| - allowed_duplicates.insert(exception_entry);
|
| -#endif
|
| -
|
| std::set<AcceleratorMapping, Cmp> acclerators;
|
| for (size_t i = 0; i < kAcceleratorMapLength; ++i) {
|
| const AcceleratorMapping& entry = kAcceleratorMap[i];
|
| @@ -66,13 +56,11 @@ TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
|
| entry.keycode = ash_entry.keycode;
|
| entry.modifiers = ash_entry.modifiers;
|
| entry.command_id = 0; // dummy
|
| - if (allowed_duplicates.find(entry) == allowed_duplicates.end()) {
|
| - EXPECT_TRUE(acclerators.insert(entry).second)
|
| - << "Duplicated accelerator: " << entry.keycode << ", "
|
| - << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
|
| - << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
|
| - << (entry.modifiers & ui::EF_ALT_DOWN);
|
| - }
|
| + EXPECT_TRUE(acclerators.insert(entry).second)
|
| + << "Duplicated accelerator: " << entry.keycode << ", "
|
| + << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
|
| + << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
|
| + << (entry.modifiers & ui::EF_ALT_DOWN);
|
| }
|
| }
|
| #endif // USE_ASH
|
|
|