views: Fix shifted keyevents in textfield.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2010 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 "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 55 matching lines @@
     widget_->Init(NULL, gfx::Rect());
     widget_->SetContentsView(textfield_);
     textfield_view_
         = static_cast<NativeTextfieldViews*>(textfield_->native_wrapper());
     DCHECK(textfield_view_);
     model_ = textfield_view_->model_.get();
   }
 
   void SendKeyEventToTextfieldViews(app::KeyboardCode key_code,
                                     bool shift,
+                                    bool control,
+                                    bool capslock) {
+    int flags = (shift ? KeyEvent::EF_SHIFT_DOWN : 0) |
+        (control ? KeyEvent::EF_CONTROL_DOWN : 0) |
+        (capslock ? KeyEvent::EF_CAPS_LOCK_DOWN : 0);
+    KeyEvent event(KeyEvent::ET_KEY_PRESSED, key_code, flags, 1, 0);
+    textfield_view_->OnKeyPressed(event);
+  }
+
+  void SendKeyEventToTextfieldViews(app::KeyboardCode key_code,
+                                    bool shift,
                                     bool control) {
-    int flags = (shift ? KeyEvent::EF_SHIFT_DOWN : 0) |
-        (control ? KeyEvent::EF_CONTROL_DOWN : 0);
-    KeyEvent event(KeyEvent::ET_KEY_PRESSED, key_code, flags, 1, 0);
-    textfield_view_->OnKeyPressed(event);
+    SendKeyEventToTextfieldViews(key_code, shift, control, false);
   }
-
   void SendKeyEventToTextfieldViews(app::KeyboardCode key_code) {
-    SendKeyEventToTextfieldViews(key_code, false, false);
+    SendKeyEventToTextfieldViews(key_code, false, false, false);
   }
 
  protected:
   // We need widget to populate wrapper class.
   Widget* widget_;
 
   Textfield* textfield_;
   NativeTextfieldViews* textfield_view_;
   TextfieldViewsModel* model_;
 
@@ skipping 38 matching lines @@
 TEST_F(NativeTextfieldViewsTest, KeyTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   SendKeyEventToTextfieldViews(app::VKEY_C, true, false);
   EXPECT_STR_EQ("C", textfield_->text());
   EXPECT_STR_EQ("C", last_contents_);
   last_contents_.clear();
 
   SendKeyEventToTextfieldViews(app::VKEY_R, false, false);
   EXPECT_STR_EQ("Cr", textfield_->text());
   EXPECT_STR_EQ("Cr", last_contents_);
+
+  textfield_->SetText(ASCIIToUTF16(""));
+  SendKeyEventToTextfieldViews(app::VKEY_C, true, false, true);
+  SendKeyEventToTextfieldViews(app::VKEY_C, false, false, true);
+  SendKeyEventToTextfieldViews(app::VKEY_1, false, false, true);
+  SendKeyEventToTextfieldViews(app::VKEY_1, true, false, true);
+  SendKeyEventToTextfieldViews(app::VKEY_1, true, false, false);
+  EXPECT_STR_EQ("cC1!!", textfield_->text());
+  EXPECT_STR_EQ("cC1!!", last_contents_);
 }
 
 TEST_F(NativeTextfieldViewsTest, ControlAndSelectTest) {
   // Insert a test string in a textfield.
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("one two three"));
   SendKeyEventToTextfieldViews(app::VKEY_RIGHT,
                               true /* shift */, false /* control */);
   SendKeyEventToTextfieldViews(app::VKEY_RIGHT, true, false);
   SendKeyEventToTextfieldViews(app::VKEY_RIGHT, true, false);
@@ skipping 64 matching lines @@
 TEST_F(NativeTextfieldViewsTest, PasswordTest) {
   InitTextfield(Textfield::STYLE_PASSWORD);
   textfield_->SetText(ASCIIToUTF16("my password"));
   // Just to make sure the text() and callback returns
   // the actual text instead of "*".
   EXPECT_STR_EQ("my password", textfield_->text());
   EXPECT_STR_EQ("my password", last_contents_);
 }
 
 }  // namespace views