Ignore inserting character with Search as a modifier on ChromeOS

ui/views/controls/textfield/textfield_unittest.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/views/controls/textfield/textfield.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 439 matching lines @@
 
   // True if native Mac keystrokes should be used (to avoid ifdef litter).
   bool TestingNativeMac() {
 #if defined(OS_MACOSX)
     return true;
 #else
     return false;
 #endif
   }
 
+  bool TestingNativeCrOs() const {
+#if defined(OS_CHROMEOS)
+    return true;
+#else
+    return false;
+#endif  // defined(OS_CHROMEOS)
+  }
+
  protected:
+  void SendKeyPress(ui::KeyboardCode key_code, int flags) {
+#if defined(OS_MACOSX) && !defined(USE_AURA)
+    // The Mac EventGenerator hooks in before IME. It sends events first to an
+    // NSResponder, which is necessary to interpret keyboard events into
+    // appropriate editing commands.
+    event_generator_->PressKey(key_code, flags);
+#else
+    // TODO(shuchen): making EventGenerator support input method and using
+    // EventGenerator here. crbug.com/512315.
+    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, flags);
+    input_method_->DispatchKeyEvent(&event);
+#endif
+  }
+
   void SendKeyEvent(ui::KeyboardCode key_code,
                     bool alt,
                     bool shift,
                     bool control_or_command,
                     bool caps_lock) {
     bool control = control_or_command;
     bool command = false;
 
     // By default, swap control and command for native events on Mac. This
     // handles most cases.
     if (TestingNativeMac())
       std::swap(control, command);
 
     int flags = (alt ? ui::EF_ALT_DOWN : 0) | (shift ? ui::EF_SHIFT_DOWN : 0) |
                 (control ? ui::EF_CONTROL_DOWN : 0) |
                 (command ? ui::EF_COMMAND_DOWN : 0) |
                 (caps_lock ? ui::EF_CAPS_LOCK_DOWN : 0);
 
-#if defined(OS_MACOSX) && !defined(USE_AURA)
-    // The Mac EventGenerator hooks in before IME. It sends events first to an
-    // NSResponder, which is necessary to interpret keyboard events into
-    // appropriate editing commands.
-    event_generator_->PressKey(key_code, flags);
-#else
-    // TODO(shuchen): making EventGenerator support input method and using
-    // EventGenerator here. crbug.com/512315.
-    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, flags);
-    input_method_->DispatchKeyEvent(&event);
-#endif
+    SendKeyPress(key_code, flags);
   }
 
   void SendKeyEvent(ui::KeyboardCode key_code,
                     bool shift,
                     bool control_or_command) {
     SendKeyEvent(key_code, false, shift, control_or_command, false);
   }
 
   void SendKeyEvent(ui::KeyboardCode key_code) {
     SendKeyEvent(key_code, false, false);
@@ skipping 200 matching lines @@
   SendKeyEvent(ui::VKEY_1, false, true,  false, true);
   SendKeyEvent(ui::VKEY_1, false, false, false, true);
 
   // On Mac, Caps+Shift remains uppercase.
   if (TestingNativeMac())
     EXPECT_STR_EQ("TeXT!1!1", textfield_->text());
   else
     EXPECT_STR_EQ("TexT!1!1", textfield_->text());
 }
 
+TEST_F(TextfieldTest, KeysWithModifiersTest) {
+  InitTextfield();
+  const int ctrl = ui::EF_CONTROL_DOWN;
+  const int alt = ui::EF_ALT_DOWN;
+  const int command = ui::EF_COMMAND_DOWN;
+  const int altgr = ui::EF_ALTGR_DOWN;
+  const int shift = ui::EF_SHIFT_DOWN;
+
+  SendKeyPress(ui::VKEY_T, shift);
+  SendKeyPress(ui::VKEY_E, shift | altgr);
+  SendKeyPress(ui::VKEY_X, 0);
+  SendKeyPress(ui::VKEY_T, ctrl);
+  SendKeyPress(ui::VKEY_1, alt);
+  SendKeyPress(ui::VKEY_2, command);
+  SendKeyPress(ui::VKEY_3, 0);
+  SendKeyPress(ui::VKEY_4, 0);
+
+  if (TestingNativeCrOs())
+    EXPECT_STR_EQ("TEx34", textfield_->text());
+  else
+    EXPECT_STR_EQ("TEx234", textfield_->text());
+}
+
 TEST_F(TextfieldTest, ControlAndSelectTest) {
   // Insert a test string in a textfield.
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("one two three"));
   SendHomeEvent(false);
   SendKeyEvent(ui::VKEY_RIGHT, true, false);
   SendKeyEvent(ui::VKEY_RIGHT, true, false);
   SendKeyEvent(ui::VKEY_RIGHT, true, false);
 
   EXPECT_STR_EQ("one", textfield_->GetSelectedText());
@@ skipping 1831 matching lines @@
 
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   ui::AXViewState state_protected;
   textfield_->GetAccessibleState(&state_protected);
   EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, state_protected.role);
   EXPECT_EQ(ASCIIToUTF16("********"), state_protected.value);
   EXPECT_TRUE(state_protected.HasStateFlag(ui::AX_STATE_PROTECTED));
 }
 
 }  // namespace views