Rename chromeos::input_method::kLeftControl to chromeos::input_method::kControl.

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 33 matching lines @@
   InputMethodWhitelist whitelist_;
   InputMethodUtil util_;
   scoped_ptr<XKeyboard> xkey_;
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
 };
 
 // Returns a ModifierMap object that contains the following mapping:
 // - kSearchKey is mapped to |search|.
-// - kLeftControl key is mapped to |control|.
-// - kLeftAlt key is mapped to |alt|.
+// - kControl key is mapped to |control|.
+// - kAlt key is mapped to |alt|.
 ModifierMap GetMap(ModifierKey search, ModifierKey control, ModifierKey alt) {
   ModifierMap modifier_key;
   // Use the Search key as |search|.
   modifier_key.push_back(ModifierKeyPair(kSearchKey, search));
-  modifier_key.push_back(ModifierKeyPair(kLeftControlKey, control));
-  modifier_key.push_back(ModifierKeyPair(kLeftAltKey, alt));
+  modifier_key.push_back(ModifierKeyPair(kControlKey, control));
+  modifier_key.push_back(ModifierKeyPair(kAltKey, alt));
   return modifier_key;
 }
 
 // Checks |modifier_map| and returns true if the following conditions are met:
 // - kSearchKey is mapped to |search|.
-// - kLeftControl key is mapped to |control|.
-// - kLeftAlt key is mapped to |alt|.
+// - kControl key is mapped to |control|.
+// - kAlt key is mapped to |alt|.
 bool CheckMap(const ModifierMap& modifier_map,
               ModifierKey search, ModifierKey control, ModifierKey alt) {
   ModifierMap::const_iterator begin = modifier_map.begin();
   ModifierMap::const_iterator end = modifier_map.end();
   if ((std::count(begin, end, ModifierKeyPair(kSearchKey, search)) == 1) &&
       (std::count(begin, end,
-                  ModifierKeyPair(kLeftControlKey, control)) == 1) &&
-      (std::count(begin, end, ModifierKeyPair(kLeftAltKey, alt)) == 1)) {
+                  ModifierKeyPair(kControlKey, control)) == 1) &&
+      (std::count(begin, end, ModifierKeyPair(kAltKey, alt)) == 1)) {
     return true;
   }
   return false;
 }
 
 // Returns true if X display is available.
 bool DisplayAvailable() {
   return ui::GetXDisplay() ? true : false;
 }
 
@@ skipping 12 matching lines @@
   // CreateFullXkbLayoutName should not accept an incomplete ModifierMap.
   ModifierMap tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
   tmp_map.pop_back();
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
 
   // CreateFullXkbLayoutName should not accept redundant ModifierMaps.
   tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
   tmp_map.push_back(ModifierKeyPair(kSearchKey, kVoidKey));  // two search maps
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
   tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
-  tmp_map.push_back(ModifierKeyPair(kLeftControlKey, kVoidKey));  // two ctrls
+  tmp_map.push_back(ModifierKeyPair(kControlKey, kVoidKey));  // two ctrls
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
   tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
-  tmp_map.push_back(ModifierKeyPair(kLeftAltKey, kVoidKey));  // two alts.
+  tmp_map.push_back(ModifierKeyPair(kAltKey, kVoidKey));  // two alts.
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
 
   // CreateFullXkbLayoutName should not accept invalid ModifierMaps.
   tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
   tmp_map.push_back(ModifierKeyPair(kVoidKey, kSearchKey));  // can't remap void
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
   tmp_map = GetMap(kVoidKey, kVoidKey, kVoidKey);
   tmp_map.push_back(ModifierKeyPair(kCapsLockKey, kSearchKey));  // ditto
   EXPECT_STREQ("", xkey_->CreateFullXkbLayoutName("us", tmp_map).c_str());
 
@@ skipping 52 matching lines @@
 }
 
 TEST_F(XKeyboardTest, TestCreateFullXkbLayoutNameKeepCapsLock) {
   EXPECT_STREQ("us(colemak)+chromeos(search_disabled_disabled)",
                xkey_->CreateFullXkbLayoutName(
                    "us(colemak)",
                    // The 1st kVoidKey should be ignored.
                    GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
   EXPECT_STREQ("de(neo)+chromeos(search_leftcontrol_leftcontrol_keepralt)",
                xkey_->CreateFullXkbLayoutName(
-                   // The 1st kLeftControlKey should be ignored.
-                   "de(neo)", GetMap(kLeftControlKey,
-                                     kLeftControlKey,
-                                     kLeftControlKey)).c_str());
+                   // The 1st kControlKey should be ignored.
+                   "de(neo)", GetMap(kControlKey,
+                                     kControlKey,
+                                     kControlKey)).c_str());
   EXPECT_STREQ("gb(extd)+chromeos(disabled_disabled_disabled_keepralt)",
                xkey_->CreateFullXkbLayoutName(
                    "gb(extd)",
                    GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
 }
 
 TEST_F(XKeyboardTest, TestCreateFullXkbLayoutNameKeepAlt) {
   EXPECT_STREQ("us(intl)+chromeos(disabled_disabled_disabled_keepralt)",
                xkey_->CreateFullXkbLayoutName(
                    "us(intl)", GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
   EXPECT_STREQ("kr(kr104)+"
                "chromeos(leftcontrol_leftcontrol_leftcontrol_keepralt)",
                xkey_->CreateFullXkbLayoutName(
-                   "kr(kr104)", GetMap(kLeftControlKey,
-                                       kLeftControlKey,
-                                       kLeftControlKey)).c_str());
+                   "kr(kr104)", GetMap(kControlKey,
+                                       kControlKey,
+                                       kControlKey)).c_str());
 }
 
 // Tests if CreateFullXkbLayoutName and ExtractLayoutNameFromFullXkbLayoutName
 // functions could handle all combinations of modifier remapping.
 TEST_F(XKeyboardTest, TestCreateFullXkbLayoutNameModifierKeys) {
   std::set<std::string> layouts;
   for (int i = 0; i < static_cast<int>(kNumModifierKeys); ++i) {
     for (int j = 0; j < static_cast<int>(kNumModifierKeys); ++j) {
       for (int k = 0; k < static_cast<int>(kNumModifierKeys); ++k) {
         const std::string layout = xkey_->CreateFullXkbLayoutName(
@@ skipping 155 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