Stop using "+chromeos(...)" in an XKB layout name.

chrome/browser/chromeos/input_method/xkeyboard.h

Index: chrome/browser/chromeos/input_method/xkeyboard.h
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.h b/chrome/browser/chromeos/input_method/xkeyboard.h
index 148cea815ac5f7f027c192e0054b7e81a9424e37..9d06001c69ea63758539c328dd4c940dc52395c7 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.h
+++ b/chrome/browser/chromeos/input_method/xkeyboard.h
@@ -85,15 +85,6 @@ class XKeyboard {
   // threads.
   virtual bool CapsLockIsEnabled() = 0;
 
-  // Creates a full XKB layout name like
-  //   "gb(extd)+chromeos(leftcontrol_disabled_leftalt),us"
-  // from modifier key mapping and |layout_name|, such as "us", "us(dvorak)",
-  // and "gb(extd)". Returns an empty string on error. Do not call this function
-  // directly: it is public for testability.
-  // TODO(yusukes): Remove this method from the interface class.
-  virtual std::string CreateFullXkbLayoutName(
-      const std::string& layout_name) = 0;
-
   // Returns a mask (e.g. 1U<<4) for Num Lock. On error, returns 0. Do not call
   // the function from non-UI threads.
   // TODO(yusukes): Move this and webdriver::GetXModifierMask() functions in
@@ -126,6 +117,9 @@ class XKeyboard {
   // Returns false otherwise. This function is protected: for testability.
   static bool GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate);
 
+  // Returns false if |layout_name| contains a bad character.
+  static bool CheckLayoutNameForTesting(const std::string& layout_name);
+
   // Note: At this moment, classes other than InputMethodManager should not
   // instantiate the XKeyboard class.
   static XKeyboard* Create(const InputMethodUtil& util);