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

 // 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/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/ozone/layout/layout_util.h"
@@ skipping 789 matching lines @@
       /* 46 */ {"tr", "tr", ""},
       /* 47 */ {"ua", "ua", ""},
       /* 48 */ {"by", "by", ""},
       /* 49 */ {"am", "am", ""},
       /* 50 */ {"ge", "ge", ""},
       /* 51 */ {"mn", "mn", ""},
       /* 52 */ {"ie", "ie", ""}};
   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);
   }
 }
 
 }  // namespace ui