Refactoring for the InputMethod & InputMethodDelegate interfaces.

ui/base/ime/input_method_auralinux_unittest.cc

 // Copyright 2015 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/input_method_auralinux.h"
 
 #include "base/memory/singleton.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 135 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LinuxInputMethodContextFactoryForTesting);
 };
 
 class InputMethodDelegateForTesting : public internal::InputMethodDelegate {
  public:
   InputMethodDelegateForTesting(){};
   ~InputMethodDelegateForTesting() override{};
 
-  bool DispatchKeyEventPostIME(const ui::KeyEvent& key_event) override {
+  ui::EventDispatchDetails DispatchKeyEventPostIME(
+      ui::KeyEvent* key_event) override {
     std::string action;
-    switch (key_event.type()) {
+    switch (key_event->type()) {
       case ET_KEY_PRESSED:
         action = "keydown:";
         break;
       case ET_KEY_RELEASED:
         action = "keyup:";
         break;
       default:
         break;
     }
     std::stringstream ss;
-    ss << key_event.key_code();
+    ss << key_event->key_code();
     action += std::string(ss.str());
     TestResult::GetInstance()->RecordAction(base::ASCIIToUTF16(action));
-    return false;
+    return ui::EventDispatchDetails();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateForTesting);
 };
 
 class TextInputClientForTesting : public DummyTextInputClient {
  public:
   explicit TextInputClientForTesting(TextInputType text_input_type)
       : DummyTextInputClient(text_input_type){};
@@ skipping 102 matching lines @@
   context_->SetEatKey(true);
   context_->AddCommitAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:97");
   test_result_->Verify();
 
   input_method_auralinux_->DetachTextInputClient(client.get());
   client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD));
   context_simple_->SetSyncMode(true);
   context_simple_->SetEatKey(false);
 
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:97");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, BasicAsyncModeTest) {
   context_->SetSyncMode(false);
   context_->SetEatKey(true);
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
   input_method_auralinux_->OnCommit(base::ASCIIToUTF16("a"));
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("textinput:a");
   test_result_->Verify();
 
   input_method_auralinux_->DetachTextInputClient(client.get());
   client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD));
   context_simple_->SetSyncMode(false);
   context_simple_->SetEatKey(false);
 
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:97");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, IBusUSTest) {
   context_->SetSyncMode(false);
   context_->SetEatKey(true);
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   // IBus mutes the key down.
   test_result_->Verify();
 
   // IBus simulates a faked key down and handle it in sync mode.
   context_->SetSyncMode(true);
   context_->AddCommitAction("a");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:97");
   test_result_->Verify();
 
   // IBus does NOT handle the key up.
   context_->SetEatKey(false);
-  input_method_auralinux_->DispatchKeyEvent(
-      KeyEvent(ET_KEY_RELEASED, VKEY_A, 0));
+  KeyEvent key_up(ET_KEY_RELEASED, VKEY_A, 0);
+  input_method_auralinux_->DispatchKeyEvent(&key_up);
 
   test_result_->ExpectAction("keyup:65");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, IBusPinyinTest) {
   context_->SetSyncMode(false);
   context_->SetEatKey(true);
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   // IBus issues a standalone set_composition action.
   input_method_auralinux_->OnPreeditStart();
   CompositionText comp;
   comp.text = base::ASCIIToUTF16("a");
   input_method_auralinux_->OnPreeditChanged(comp);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   // IBus issues a commit text with composition after muting the space key down.
-  input_method_auralinux_->DispatchKeyEvent(
-      KeyEvent(ET_KEY_PRESSED, VKEY_SPACE, 0));
+  KeyEvent key_up(ET_KEY_RELEASED, VKEY_SPACE, 0);
+  input_method_auralinux_->DispatchKeyEvent(&key_up);
 
   input_method_auralinux_->OnPreeditEnd();
   input_method_auralinux_->OnCommit(base::ASCIIToUTF16("A"));
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("textinput:A");
   test_result_->Verify();
 }
 
 // crbug.com/463491
 TEST_F(InputMethodAuraLinuxTest, DeadKeyTest) {
   context_simple_->SetSyncMode(true);
   context_simple_->SetEatKey(true);
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_NONE));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent dead_key(ET_KEY_PRESSED, VKEY_OEM_7, 0);
   dead_key.set_character(L'\'');
-  input_method_auralinux_->DispatchKeyEvent(dead_key);
+  input_method_auralinux_->DispatchKeyEvent(&dead_key);
 
   // The single quote key is muted.
   test_result_->ExpectAction("keydown:222");
   test_result_->Verify();
 
   context_simple_->AddCommitAction("X");
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   // The following A key generates the accent key: á.
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:88");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, MultiCommitsTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCommitAction("a");
   context_->AddCommitAction("b");
   context_->AddCommitAction("c");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("textinput:abc");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, MixedCompositionAndCommitTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCommitAction("a");
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("b");
   context_->AddCommitAction("c");
   context_->AddCompositionUpdateAction("d");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("textinput:ac");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:d");
   test_result_->Verify();
 
   context_->AddCommitAction("e");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:e");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithoutCommitTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->AddCompositionEndAction();
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithEmptyCommitTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->AddCompositionEndAction();
   context_->AddCommitAction("");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithCommitTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->AddCompositionEndAction();
   context_->AddCommitAction("b");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   // Verifies single char commit under composition mode will call InsertText
   // intead of InsertChar.
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:b");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, CompositionUpdateWithCommitTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("a");
   context_->AddCommitAction("b");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("textinput:b");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   // crbug.com/513124.
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCommitAction("c");
   context_->AddCompositionUpdateAction("");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:c");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, MixedAsyncAndSyncTest) {
   context_->SetSyncMode(false);
   context_->SetEatKey(true);
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
   CompositionText comp;
   comp.text = base::ASCIIToUTF16("a");
   input_method_auralinux_->OnPreeditChanged(comp);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->SetSyncMode(true);
   context_->AddCompositionEndAction();
   context_->AddCommitAction("b");
 
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:b");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, MixedSyncAndAsyncTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionStartAction();
   context_->AddCompositionUpdateAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'a');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->SetSyncMode(false);
 
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
   input_method_auralinux_->OnCommit(base::ASCIIToUTF16("b"));
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:b");
   test_result_->Verify();
 
   context_->SetSyncMode(true);
   context_->AddCommitAction("c");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:99");
   test_result_->Verify();
 }
 
 TEST_F(InputMethodAuraLinuxTest, ReleaseKeyTest) {
   context_->SetSyncMode(true);
   context_->SetEatKey(true);
   context_->AddCompositionUpdateAction("a");
 
   scoped_ptr<TextInputClientForTesting> client(
       new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT));
   input_method_auralinux_->SetFocusedTextInputClient(client.get());
   input_method_auralinux_->OnTextInputTypeChanged(client.get());
 
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0);
   key.set_character(L'A');
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("keydown:229");
   test_result_->ExpectAction("compositionstart");
   test_result_->ExpectAction("compositionupdate:a");
   test_result_->Verify();
 
   context_->SetEatKey(false);
   context_->AddCommitAction("b");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("compositionend");
   test_result_->ExpectAction("textinput:b");
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:65");
   test_result_->Verify();
 
   context_->AddCommitAction("c");
-  input_method_auralinux_->DispatchKeyEvent(key);
+  input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("textinput:c");
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:65");
   test_result_->Verify();
 }
 
 }  // namespace
 }  // namespace ui