Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc

Issue 848713003: 1. Adds null check when keymap is failed to load. 2. Moves xkb_rule_names construction into worker … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2272
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
}
« no previous file with comments | « ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698