Revert of ozone: xkb: Load keymaps on worker thread & cache them

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 21 matching lines @@
 class VkTestXkbKeyboardLayoutEngine : public XkbKeyboardLayoutEngine {
  public:
   struct Entry {
     base::char16 plain_character;
     base::char16 shift_character;
     base::char16 altgr_character;
     ui::DomCode dom_code;
     ui::KeyboardCode key_code;
   };
 
-  struct RuleNames {
-    std::string layout_name;
-    std::string layout;
-    std::string variant;
-  };
-
  public:
   VkTestXkbKeyboardLayoutEngine(const XkbKeyCodeConverter& keycode_converter)
       : XkbKeyboardLayoutEngine(keycode_converter), entry_(nullptr) {
     // For testing, use the same modifier values as ui::EventFlags.
     static const int kTestFlags[] = {
         EF_SHIFT_DOWN, EF_ALTGR_DOWN, EF_MOD3_DOWN};
     xkb_flag_map_.clear();
     xkb_flag_map_.resize(arraysize(kTestFlags));
     for (size_t i = 0; i < arraysize(kTestFlags); ++i) {
       XkbFlagMapEntry e = {kTestFlags[i], kTestFlags[i]};
@@ skipping 684 matching lines @@
       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);
   }
 }
 
-TEST_F(XkbLayoutEngineVkTest, XkbRuleNamesForLayoutName) {
-  static const VkTestXkbKeyboardLayoutEngine::RuleNames kVkeyTestCase[] = {
-      /* 0 */ {"us", "us", ""},
-      /* 1 */ {"jp", "jp", ""},
-      /* 2 */ {"us(intl)", "us", "intl"},
-      /* 3 */ {"us(altgr-intl)", "us", "altgr-intl"},
-      /* 4 */ {"us(dvorak)", "us", "dvorak"},
-      /* 5 */ {"us(colemak)", "us", "colemak"},
-      /* 6 */ {"be", "be", ""},
-      /* 7 */ {"fr", "fr", ""},
-      /* 8 */ {"ca", "ca", ""},
-      /* 9 */ {"ch(fr)", "ch", "fr"},
-      /* 10 */ {"ca(multix)", "ca", "multix"},
-      /* 11 */ {"de", "de", ""},
-      /* 12 */ {"de(neo)", "de", "neo"},
-      /* 13 */ {"ch", "ch", ""},
-      /* 14 */ {"ru", "ru", ""},
-      /* 15 */ {"ru(phonetic)", "ru", "phonetic"},
-      /* 16 */ {"br", "br", ""},
-      /* 17 */ {"bg", "bg", ""},
-      /* 18 */ {"bg(phonetic)", "bg", "phonetic"},
-      /* 19 */ {"ca(eng)", "ca", "eng"},
-      /* 20 */ {"cz", "cz", ""},
-      /* 21 */ {"cz(qwerty)", "cz", "qwerty"},
-      /* 22 */ {"ee", "ee", ""},
-      /* 23 */ {"es", "es", ""},
-      /* 24 */ {"es(cat)", "es", "cat"},
-      /* 25 */ {"dk", "dk", ""},
-      /* 26 */ {"gr", "gr", ""},
-      /* 27 */ {"il", "il", ""},
-      /* 28 */ {"latam", "latam", ""},
-      /* 29 */ {"lt", "lt", ""},
-      /* 30 */ {"lv(apostrophe)", "lv", "apostrophe"},
-      /* 31 */ {"hr", "hr", ""},
-      /* 32 */ {"gb(extd)", "gb", "extd"},
-      /* 33 */ {"gb(dvorak)", "gb", "dvorak"},
-      /* 34 */ {"fi", "fi", ""},
-      /* 35 */ {"hu", "hu", ""},
-      /* 36 */ {"it", "it", ""},
-      /* 37 */ {"is", "is", ""},
-      /* 38 */ {"no", "no", ""},
-      /* 39 */ {"pl", "pl", ""},
-      /* 40 */ {"pt", "pt", ""},
-      /* 41 */ {"ro", "ro", ""},
-      /* 42 */ {"se", "se", ""},
-      /* 43 */ {"sk", "sk", ""},
-      /* 44 */ {"si", "si", ""},
-      /* 45 */ {"rs", "rs", ""},
-      /* 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);
-  }
-}
-
 }  // namespace ui