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

chrome/browser/chromeos/input_method/xkeyboard_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 38 matching lines @@
   content::TestBrowserThread ui_thread_;
 };
 
 // Returns true if X display is available.
 bool DisplayAvailable() {
   return ui::GetXDisplay() ? true : false;
 }
 
 }  // namespace
 
-// Tests CreateFullXkbLayoutName() function.
-TEST_F(XKeyboardTest, TestCreateFullXkbLayoutNameBasic) {
-  // CreateFullXkbLayoutName should not accept non-alphanumeric characters
+// Tests CheckLayoutName() function.
+TEST_F(XKeyboardTest, TestCheckLayoutName) {
+  // CheckLayoutName should not accept non-alphanumeric characters
   // except "()-_".
-  EXPECT_EQ("", xkey_->CreateFullXkbLayoutName("us!"));
-  EXPECT_EQ("", xkey_->CreateFullXkbLayoutName("us; /bin/sh"));
-  EXPECT_EQ("ab-c_12+chromeos(search_leftcontrol_leftalt_keepralt)",
-            xkey_->CreateFullXkbLayoutName("ab-c_12"));
+  EXPECT_FALSE(XKeyboard::CheckLayoutNameForTesting("us!"));
+  EXPECT_FALSE(XKeyboard::CheckLayoutNameForTesting("us; /bin/sh"));
+  EXPECT_TRUE(XKeyboard::CheckLayoutNameForTesting("ab-c_12"));
 
-  // CreateFullXkbLayoutName should not accept upper-case ascii characters.
-  EXPECT_EQ("", xkey_->CreateFullXkbLayoutName("US"));
+  // CheckLayoutName should not accept upper-case ascii characters.
+  EXPECT_FALSE(XKeyboard::CheckLayoutNameForTesting("US"));
 
-  // CreateFullXkbLayoutName should accept lower-case ascii characters.
+  // CheckLayoutName should accept lower-case ascii characters.
   for (int c = 'a'; c <= 'z'; ++c) {
-    EXPECT_NE("", xkey_->CreateFullXkbLayoutName(std::string(3, c)));
+    EXPECT_TRUE(XKeyboard::CheckLayoutNameForTesting(std::string(3, c)));
   }
 
-  // CreateFullXkbLayoutName should accept numbers.
+  // CheckLayoutName should accept numbers.
   for (int c = '0'; c <= '9'; ++c) {
-    EXPECT_NE("", xkey_->CreateFullXkbLayoutName(std::string(3, c)));
+    EXPECT_TRUE(XKeyboard::CheckLayoutNameForTesting(std::string(3, c)));
   }
 
-  // CreateFullXkbLayoutName should accept a layout with a variant name.
-  EXPECT_EQ("us(dvorak)+chromeos(search_leftcontrol_leftalt_keepralt)",
-            xkey_->CreateFullXkbLayoutName("us(dvorak)"));
-  EXPECT_EQ("jp+chromeos(search_leftcontrol_leftalt_keepralt)",
-            xkey_->CreateFullXkbLayoutName("jp"));
+  // CheckLayoutName should accept a layout with a variant name.
+  EXPECT_TRUE(XKeyboard::CheckLayoutNameForTesting("us(dvorak)"));
+  EXPECT_TRUE(XKeyboard::CheckLayoutNameForTesting("jp"));
 }
 
 TEST_F(XKeyboardTest, TestSetCapsLockEnabled) {
   if (!DisplayAvailable()) {
     // Do not fail the test to allow developers to run unit_tests without an X
     // server (e.g. via ssh). Note that both try bots and waterfall always have
     // an X server for running browser_tests.
     DVLOG(1) << "X server is not available. Skip the test.";
     return;
   }
@@ skipping 119 matching lines @@
 
   // Restore the initial state.
   EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate));
   EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
   EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms);
   EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms);
 }
 
 }  // namespace input_method
 }  // namespace chromeos