ozone: Fix events_unittests build with use_xkbcommon==1

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.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 "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
 #include <xkbcommon/xkbcommon-names.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 607 matching lines @@
     {0x0163, VKEY_OEM_7},      // t cedilla
     {0x0165, VKEY_5},          // t caron
     {0x016F, VKEY_OEM_1},      // u ring above
     {0x0171, VKEY_OEM_5},      // u double acute
     {0x01A1, VKEY_OEM_6},      // o horn
     {0x01B0, VKEY_OEM_4},      // u horn
     {0x01B6, VKEY_OEM_6},      // z stroke
     {0x0259, VKEY_OEM_3},      // schwa
 };
 
-void ParseLayoutName(const std::string& layout_name,
-                     std::string* layout_id,
-                     std::string* layout_variant) {
-  size_t dash_index = layout_name.find('-');
-  size_t parentheses_index = layout_name.find('(');
-  *layout_id = layout_name;
-  *layout_variant = "";
-  if (parentheses_index != std::string::npos) {
-    *layout_id = layout_name.substr(0, parentheses_index);
-    size_t close_index = layout_name.find(')', parentheses_index);
-    if (close_index == std::string::npos)
-      close_index = layout_name.size();
-    *layout_variant = layout_name.substr(parentheses_index + 1,
-                                         close_index - parentheses_index - 1);
-  } else if (dash_index != std::string::npos) {
-    *layout_id = layout_name.substr(0, dash_index);
-    *layout_variant = layout_name.substr(dash_index + 1);
-  }
-}
-
 void LoadKeymap(const std::string& layout_name,
                 scoped_refptr<base::SingleThreadTaskRunner> reply_runner,
                 const LoadKeymapCallback& reply_callback) {
   std::string layout_id;
   std::string layout_variant;
-  ParseLayoutName(layout_name, &layout_id, &layout_variant);
+  XkbKeyboardLayoutEngine::ParseLayoutName(layout_name, &layout_id,
+                                           &layout_variant);
   xkb_rule_names names = {.rules = NULL,
                           .model = "pc101",
                           .layout = layout_id.c_str(),
                           .variant = layout_variant.c_str(),
                           .options = ""};
   scoped_ptr<xkb_context, XkbContextDeleter> context;
   context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES));
   xkb_context_include_path_append(context.get(), "/usr/share/X11/xkb");
   scoped_ptr<xkb_keymap, XkbKeymapDeleter> keymap;
   keymap.reset(xkb_keymap_new_from_names(context.get(), &names,
@@ skipping 280 matching lines @@
   xkb_mod_mask_t flags = EventFlagsToXkbFlags(ui_flags);
   if (flags == base_flags)
     return base_character;
   xkb_keysym_t keysym;
   base::char16 character = 0;
   if (!XkbLookup(xkb_keycode, flags, &keysym, &character))
     character = kNone;
   return character;
 }
 
+void XkbKeyboardLayoutEngine::ParseLayoutName(const std::string& layout_name,
+                                              std::string* layout_id,
+                                              std::string* layout_variant) {
+  size_t dash_index = layout_name.find('-');
+  size_t parentheses_index = layout_name.find('(');
+  *layout_id = layout_name;
+  *layout_variant = "";
+  if (parentheses_index != std::string::npos) {
+    *layout_id = layout_name.substr(0, parentheses_index);
+    size_t close_index = layout_name.find(')', parentheses_index);
+    if (close_index == std::string::npos)
+      close_index = layout_name.size();
+    *layout_variant = layout_name.substr(parentheses_index + 1,
+                                         close_index - parentheses_index - 1);
+  } else if (dash_index != std::string::npos) {
+    *layout_id = layout_name.substr(0, dash_index);
+    *layout_variant = layout_name.substr(dash_index + 1);
+  }
+}
 }  // namespace ui