sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

chromeos/ime/mock_ime_engine_handler.cc

Index: chromeos/ime/mock_ime_engine_handler.cc
diff --git a/chromeos/ime/mock_ime_engine_handler.cc b/chromeos/ime/mock_ime_engine_handler.cc
index d7089715de647c463865fa91133f4323c3e3b787..6d306e51f7d6bca9c0acb68fb3f3a14a67c3fbd4 100644
--- a/chromeos/ime/mock_ime_engine_handler.cc
+++ b/chromeos/ime/mock_ime_engine_handler.cc
@@ -15,9 +15,11 @@ MockIMEEngineHandler::MockIMEEngineHandler()
       last_text_input_type_(ibus::TEXT_INPUT_TYPE_NONE),
       last_set_surrounding_cursor_pos_(0),
       last_set_surrounding_anchor_pos_(0),
-      last_processed_keysym_(0),
-      last_processed_keycode_(0),
-      last_processed_state_(0) {
+      last_processed_is_key_down_(false),
+      last_processed_is_alt_down_(false),
+      last_processed_is_ctrl_down_(false),
+      last_processed_is_shift_down_(false),
+      last_processed_is_caps_lock_down_(false) {
 }
 
 MockIMEEngineHandler::~MockIMEEngineHandler() {
@@ -55,14 +57,22 @@ void MockIMEEngineHandler::Reset() {
 }
 
 void MockIMEEngineHandler::ProcessKeyEvent(
-    uint32 keysym,
-    uint32 keycode,
-    uint32 state,
+    const std::string& keysym,
+    const std::string& keycode,
+    bool is_key_down,
+    bool is_alt_down,
+    bool is_ctrl_down,
+    bool is_shift_down,
+    bool is_caps_lock_down,
     const KeyEventDoneCallback& callback) {
   ++process_key_event_call_count_;
   last_processed_keysym_ = keysym;
   last_processed_keycode_ = keycode;
-  last_processed_state_ = state;
+  last_processed_is_key_down_ = is_key_down;
+  last_processed_is_alt_down_ = is_alt_down;
+  last_processed_is_ctrl_down_ = is_ctrl_down;
+  last_processed_is_shift_down_ = is_shift_down;
+  last_processed_is_caps_lock_down_ = is_caps_lock_down;
   last_passed_callback_ = callback;
 }
 
@@ -81,4 +91,3 @@ void MockIMEEngineHandler::SetSurroundingText(const std::string& text,
 }
 
 } // namespace chromeos
-