| Index: ui/events/keycodes/dom/keycode_converter_unittest.cc
|
| diff --git a/ui/events/keycodes/dom/keycode_converter_unittest.cc b/ui/events/keycodes/dom/keycode_converter_unittest.cc
|
| index c3149ce40b6989a2b1f1bd019545d6c5423c7385..f5da9a09226a447f0b7f82d77038ec84f134f507 100644
|
| --- a/ui/events/keycodes/dom/keycode_converter_unittest.cc
|
| +++ b/ui/events/keycodes/dom/keycode_converter_unittest.cc
|
| @@ -38,7 +38,7 @@ TEST(UsbKeycodeMap, Basic) {
|
| EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
|
| keycode_map[0].native_keycode);
|
| EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
|
| - ui::KeycodeConverter::CodeToNativeKeycode("Unidentified"));
|
| + ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::NONE));
|
|
|
| // Verify that there are no duplicate entries in the mapping.
|
| std::map<uint32_t, uint16_t> usb_to_native;
|
| @@ -55,17 +55,14 @@ TEST(UsbKeycodeMap, Basic) {
|
| entry->native_keycode,
|
| ui::KeycodeConverter::UsbKeycodeToNativeKeycode(entry->usb_keycode));
|
|
|
| - // Verify CodeToNativeKeycode and NativeKeycodeToCode work correctly.
|
| + // Verify DomCodeToNativeKeycode works correctly.
|
| + ui::DomCode dom_code =
|
| + ui::KeycodeConverter::CodeStringToDomCode(entry->code);
|
| if (entry->code) {
|
| EXPECT_EQ(entry->native_keycode,
|
| - ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
|
| - EXPECT_STREQ(
|
| - entry->code,
|
| - ui::KeycodeConverter::NativeKeycodeToCode(entry->native_keycode));
|
| - }
|
| - else {
|
| - EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
|
| - ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
|
| + ui::KeycodeConverter::DomCodeToNativeKeycode(dom_code));
|
| + } else {
|
| + EXPECT_EQ(ui::DomCode::NONE, dom_code);
|
| }
|
|
|
| // Verify that the USB or native codes aren't duplicated.
|
|
|