Use DOM- rather than Windows-based key code for non-layout cases.

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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom3/dom_key.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
-#include "ui/events/ozone/layout/layout_util.h"
 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
 namespace ui {
 
 namespace {
 
 // This XkbKeyCodeConverter simply uses the numeric value of the DomCode.
 class VkTestXkbKeyCodeConverter : public XkbKeyCodeConverter {
  public:
   VkTestXkbKeyCodeConverter() {
@@ skipping 44 matching lines @@
   xkb_keysym_t CharacterToKeySym(base::char16 c) const {
     return 0x01000000u + c;
   }
 
   KeyboardCode GetKeyboardCode(DomCode dom_code,
                                int flags,
                                base::char16 character) const {
     KeyboardCode key_code = DifficultKeyboardCode(
         dom_code, flags, key_code_converter_.DomCodeToXkbKeyCode(dom_code),
         flags, CharacterToKeySym(character), DomKey::CHARACTER, character);
-    if (key_code == VKEY_UNKNOWN)
-      key_code = DomCodeToNonLocatedKeyboardCode(dom_code);
+    if (key_code == VKEY_UNKNOWN) {
+      DomKey dummy_dom_key;
+      base::char16 dummy_character;
+      // If this fails, key_code remains VKEY_UNKNOWN.
+      ignore_result(DomCodeToUsLayoutMeaning(dom_code, EF_NONE, &dummy_dom_key,
+                                             &dummy_character, &key_code));
+    }
     return key_code;
   }
 
   // XkbKeyboardLayoutEngine overrides:
   bool XkbLookup(xkb_keycode_t xkb_keycode,
-                         xkb_mod_mask_t xkb_flags,
-                         xkb_keysym_t* xkb_keysym,
-                         base::char16* character) const override {
+                 xkb_mod_mask_t xkb_flags,
+                 xkb_keysym_t* xkb_keysym,
+                 base::char16* character) const override {
     if (!entry_ ||
         (xkb_keycode != static_cast<xkb_keycode_t>(entry_->dom_code)))
       return false;
     if (xkb_flags & EF_ALTGR_DOWN)
       *character = entry_->altgr_character;
     else if (xkb_flags & EF_SHIFT_DOWN)
       *character = entry_->shift_character;
     else
       *character = entry_->plain_character;
     *xkb_keysym = CharacterToKeySym(*character);
@@ skipping 629 matching lines @@
     layout_engine_->SetEntry(e);
 
     // Test with predetermined plain character.
     KeyboardCode key_code = layout_engine_->GetKeyboardCode(
         e->dom_code, EF_NONE, e->plain_character);
     EXPECT_EQ(e->key_code, key_code);
 
     if (e->shift_character) {
       // Test with predetermined shifted character.
       key_code = layout_engine_->GetKeyboardCode(e->dom_code, EF_SHIFT_DOWN,
-                                                e->shift_character);
+                                                 e->shift_character);
       EXPECT_EQ(e->key_code, key_code);
     }
 
     if (e->altgr_character) {
       // Test with predetermined AltGr character.
       key_code = layout_engine_->GetKeyboardCode(e->dom_code, EF_ALTGR_DOWN,
-          e->altgr_character);
+                                                 e->altgr_character);
       EXPECT_EQ(e->key_code, key_code);
     }
 
     // Test with unrelated predetermined character.
     key_code =
         layout_engine_->GetKeyboardCode(e->dom_code, EF_MOD3_DOWN, 0xFFFFu);
     EXPECT_EQ(e->key_code, key_code);
   }
 }
 
@@ skipping 58 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