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

chrome/browser/chromeos/input_method/xkeyboard.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 67 matching lines @@
   virtual void SetCapsLockEnabled(bool enable_caps_lock) = 0;
 
   // Returns true if num lock is enabled. Do not call the function from non-UI
   // threads.
   virtual bool NumLockIsEnabled() = 0;
 
   // Returns true if caps lock is enabled. Do not call the function from non-UI
   // 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
   // chrome/test/webdriver/keycode_text_conversion_x.cc to ui/base/x/x11_util.
   // The two functions are almost the same.
   virtual unsigned int GetNumLockMask() = 0;
 
   // Set true on |out_caps_lock_enabled| if Caps Lock is enabled. Set true on
   // |out_num_lock_enabled| if Num Lock is enabled. Both out parameters can be
   // NULL. Do not call the function from non-UI threads.
@@ skipping 12 matching lines @@
   static bool SetAutoRepeatRate(const AutoRepeatRate& rate);
 
   // Returns true if auto repeat is enabled. This function is protected: for
   // testability.
   static bool GetAutoRepeatEnabledForTesting();
 
   // On success, set current auto repeat rate on |out_rate| and returns true.
   // 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);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_