Generate located Windows keycodes for number pad keys under Ozone

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
@@ skipping 27 matching lines @@
   enum class EntryType { NONE, PRINTABLE, KEYSYM };
   struct PrintableEntry {
     base::char16 plain_character;
     base::char16 shift_character;
     base::char16 altgr_character;
     DomCode dom_code;
   };
   struct KeysymEntry {
     DomCode dom_code;
     xkb_keysym_t keysym;
+    base::char16 character;
   };
 
   struct RuleNames {
     std::string layout_name;
     std::string layout;
     std::string variant;
   };
 
  public:
   VkTestXkbKeyboardLayoutEngine(const XkbKeyCodeConverter& keycode_converter)
@@ skipping 63 matching lines @@
           *character = printable_entry_->plain_character;
         *xkb_keysym = CharacterToKeySym(*character);
         return *character != 0;
       case EntryType::KEYSYM:
         if (!keysym_entry_ ||
             (xkb_keycode !=
              static_cast<xkb_keycode_t>(keysym_entry_->dom_code))) {
           return false;
         }
         *xkb_keysym = keysym_entry_->keysym;
-        *character = 0;
+        *character = keysym_entry_->character;
         return true;
     }
     return false;
   }
 
  private:
   EntryType entry_type_;
   const PrintableEntry* printable_entry_;
   const KeysymEntry* keysym_entry_;
 };
@@ skipping 666 matching lines @@
     {{DomCode::OS_RIGHT, XKB_KEY_Super_R}, VKEY_LWIN},
     {{DomCode::ALT_LEFT, XKB_KEY_Alt_L}, VKEY_MENU},
     {{DomCode::ALT_RIGHT, XKB_KEY_Alt_R}, VKEY_MENU},
     {{DomCode::ALT_RIGHT, XKB_KEY_ISO_Level3_Shift}, VKEY_ALTGR},
     {{DomCode::DIGIT1, XKB_KEY_1}, VKEY_1},
     {{DomCode::NUMPAD1, XKB_KEY_KP_1}, VKEY_1},
     {{DomCode::CAPS_LOCK, XKB_KEY_Caps_Lock}, VKEY_CAPITAL},
     {{DomCode::ENTER, XKB_KEY_Return}, VKEY_RETURN},
     {{DomCode::NUMPAD_ENTER, XKB_KEY_KP_Enter}, VKEY_RETURN},
     {{DomCode::SLEEP, XKB_KEY_XF86Sleep}, VKEY_SLEEP},
+    // Verify that number pad digits produce located VKEY codes.
+    {{DomCode::NUMPAD0, XKB_KEY_KP_0, '0'}, VKEY_NUMPAD0},
+    {{DomCode::NUMPAD9, XKB_KEY_KP_9, '9'}, VKEY_NUMPAD9},
   };
   for (const auto& e : kVkeyTestCase) {
     SCOPED_TRACE(static_cast<int>(e.test.dom_code));
     layout_engine_->SetEntry(&e.test);
     DomKey dom_key = DomKey::NONE;
     KeyboardCode key_code = VKEY_UNKNOWN;
     EXPECT_TRUE(layout_engine_->Lookup(e.test.dom_code, EF_NONE, &dom_key,
                                        &key_code));
     EXPECT_EQ(e.key_code, key_code);
   }
@@ skipping 61 matching lines @@
     std::string layout_id;
     std::string layout_variant;
     XkbKeyboardLayoutEngine::ParseLayoutName(e->layout_name, &layout_id,
                                              &layout_variant);
     EXPECT_EQ(layout_id, e->layout);
     EXPECT_EQ(layout_variant, e->variant);
   }
 }
 
 }  // namespace ui