1. Adds null check when keymap is failed to load. 2. Moves xkb_rule_names construction into worker …

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

Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
index 0ae34b6151d95e891416a6bc3f15c2d21217de49..1cfa79ad1f8d0ea8324aee6736401d86a2f24934 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc
@@ -807,10 +807,12 @@ TEST_F(XkbLayoutEngineVkTest, XkbRuleNamesForLayoutName) {
   for (size_t i = 0; i < arraysize(kVkeyTestCase); ++i) {
     SCOPED_TRACE(i);
     const VkTestXkbKeyboardLayoutEngine::RuleNames* e = &kVkeyTestCase[i];
-    scoped_ptr<xkb_rule_names> names =
-        layout_engine_->GetXkbRuleNames(e->layout_name);
-    EXPECT_EQ(names.get()->layout, e->layout);
-    EXPECT_EQ(names.get()->variant, e->variant);
+    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);
   }
 }