Distinguish between keystroke and character events.

ui/base/ime/remote_input_method_win_unittest.cc

 // Copyright 2013 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/base/ime/remote_input_method_win.h"
 
 #include <InputScope.h>
 
 #include <vector>
 
@@ skipping 530 matching lines @@
 }
 
 TEST(RemoteInputMethodWinTest, DispatchKeyEvent_NativeKeyEvent) {
   // Basically RemoteInputMethodWin does not handle native keydown event.
 
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   const MSG wm_keydown = { NULL, WM_KEYDOWN, ui::VKEY_A };
-  ui::KeyEvent native_keydown(wm_keydown, false);
+  ui::KeyEvent native_keydown(wm_keydown);
 
   // This must not cause a crash.
   EXPECT_FALSE(input_method->DispatchKeyEvent(native_keydown));
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
   EXPECT_TRUE(delegate_.fabricated_key_events().empty());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
@@ skipping 21 matching lines @@
 }
 
 TEST(RemoteInputMethodWinTest, DispatchKeyEvent_NativeCharEvent) {
   // RemoteInputMethodWin handles native char event if possible.
 
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   const MSG wm_char = { NULL, WM_CHAR, 'A', 0 };
-  ui::KeyEvent native_char(wm_char, true);
+  ui::KeyEvent native_char(wm_char);
 
   // This must not cause a crash.
   EXPECT_FALSE(input_method->DispatchKeyEvent(native_char));
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
   EXPECT_TRUE(delegate_.fabricated_key_events().empty());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
@@ skipping 22 matching lines @@
 
 TEST(RemoteInputMethodWinTest, DispatchKeyEvent_FabricatedKeyDown) {
   // Fabricated non-char event will be delegated to
   // InputMethodDelegate::DispatchFabricatedKeyEventPostIME as long as the
   // delegate is installed.
 
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
-  ui::KeyEvent fabricated_keydown(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, false);
+  ui::KeyEvent fabricated_keydown(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   fabricated_keydown.set_character(L'A');
 
   // This must not cause a crash.
   EXPECT_TRUE(input_method->DispatchKeyEvent(fabricated_keydown));
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
   ASSERT_EQ(1, delegate_.fabricated_key_events().size());
   EXPECT_EQ(L'A', delegate_.fabricated_key_events()[0]);
   delegate_.Reset();
   mock_text_input_client.Reset();
 
@@ skipping 30 matching lines @@
 }
 
 TEST(RemoteInputMethodWinTest, DispatchKeyEvent_FabricatedChar) {
   // Note: RemoteInputMethodWin::DispatchKeyEvent should always return true
   // for fabricated character events.
 
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
-  ui::KeyEvent fabricated_char(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, true);
-  fabricated_char.set_character(L'A');
+  ui::KeyEvent fabricated_char(L'A', ui::VKEY_A, ui::EF_NONE);
 
   // This must not cause a crash.
   EXPECT_TRUE(input_method->DispatchKeyEvent(fabricated_char));
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
   EXPECT_TRUE(delegate_.fabricated_key_events().empty());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
@@ skipping 139 matching lines @@
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
   input_method->AddObserver(&input_method_observer);
 
   EXPECT_EQ(0u, input_method_observer.on_input_method_destroyed_changed());
   input_method.reset();
   EXPECT_EQ(1u, input_method_observer.on_input_method_destroyed_changed());
 }
 
 }  // namespace
 }  // namespace ui