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 789 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