Remove GetKeyEventsForTesting() from ui::InputMethod.

The same functionality is moved into MockIMEInputContextHandler by this
CL.

Bug: b:148193316
Test: browser_tests
Change-Id: Ibadbd6be50b82a923cba4c46bcc79d82aba397e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210184
Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
Reviewed-by: Keith Lee <keithlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773595}

chrome/browser/chromeos/arc/input_method_manager/input_connection_impl_unittest.cc

@@ -235,11 +235,12 @@ TEST_F(InputConnectionImplTest, CommitText) {
   context_handler()->Reset();
   connection->CommitText(base::ASCIIToUTF16("\n"), 1);
   EXPECT_EQ(0, context_handler()->commit_text_call_count());
-  EXPECT_EQ(2, context_handler()->send_key_event_call_count());
-  EXPECT_EQ(ui::VKEY_RETURN,
-            context_handler()->last_sent_key_event().key_code());
-  EXPECT_EQ(ui::ET_KEY_RELEASED,
-            context_handler()->last_sent_key_event().type());
+  const std::vector<ui::KeyEvent>& sent_key_events =
+      context_handler()->sent_key_events();
+  EXPECT_EQ(2u, sent_key_events.size());
+  const ui::KeyEvent& last_sent_key_event = sent_key_events.back();
+  EXPECT_EQ(ui::VKEY_RETURN, last_sent_key_event.key_code());
+  EXPECT_EQ(ui::ET_KEY_RELEASED, last_sent_key_event.type());
 
   engine()->FocusOut();
 }
@@ -347,8 +348,10 @@ TEST_F(InputConnectionImplTest, SendKeyEvent) {
     auto sent = std::make_unique<ui::KeyEvent>(ui::ET_KEY_PRESSED,
                                                ui::VKEY_RETURN, ui::EF_NONE);
     connection->SendKeyEvent(std::move(sent));
-    EXPECT_EQ(1, context_handler()->send_key_event_call_count());
-    const auto& received = context_handler()->last_sent_key_event();
+    const std::vector<ui::KeyEvent>& sent_key_events =
+        context_handler()->sent_key_events();
+    EXPECT_EQ(1u, sent_key_events.size());
+    const ui::KeyEvent& received = sent_key_events.back();
     EXPECT_EQ(ui::VKEY_RETURN, received.key_code());
     EXPECT_EQ(ui::DomCode::ENTER, received.code());
     EXPECT_EQ("Enter", received.GetCodeString());
@@ -366,8 +369,10 @@ TEST_F(InputConnectionImplTest, SendKeyEvent) {
             ui::EF_CAPS_LOCK_ON);
 
     connection->SendKeyEvent(std::move(sent));
-    EXPECT_EQ(2, context_handler()->send_key_event_call_count());
-    const auto& received = context_handler()->last_sent_key_event();
+    const std::vector<ui::KeyEvent>& sent_key_events =
+        context_handler()->sent_key_events();
+    EXPECT_EQ(2u, sent_key_events.size());
+    const ui::KeyEvent& received = sent_key_events.back();
     EXPECT_EQ(ui::VKEY_A, received.key_code());
     EXPECT_EQ(ui::DomCode::US_A, received.code());
     EXPECT_EQ("KeyA", received.GetCodeString());

chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

@@ -522,7 +522,9 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
     ASSERT_TRUE(content::ExecuteScript(host->host_contents(),
                                        send_key_events_test_script));
 
-    const ui::KeyEvent& key_event = mock_input_context->last_sent_key_event();
+    ASSERT_EQ(1u, mock_input_context->sent_key_events().size());
+    const ui::KeyEvent& key_event =
+        mock_input_context->sent_key_events().back();
     EXPECT_EQ(ui::ET_KEY_PRESSED, key_event.type());
     EXPECT_EQ(L'z', key_event.GetCharacter());
     EXPECT_EQ(ui::DomCode::US_Z, key_event.code());
@@ -548,7 +550,9 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
     ASSERT_TRUE(content::ExecuteScript(host->host_contents(),
                                        send_key_events_test_script));
 
-    const ui::KeyEvent& key_event = mock_input_context->last_sent_key_event();
+    ASSERT_EQ(1u, mock_input_context->sent_key_events().size());
+    const ui::KeyEvent& key_event =
+        mock_input_context->sent_key_events().back();
     EXPECT_EQ(ui::ET_KEY_RELEASED, key_event.type());
     EXPECT_EQ(L'a', key_event.GetCharacter());
     EXPECT_EQ(ui::DomCode::US_Q, key_event.code());
@@ -575,7 +579,9 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
     ASSERT_TRUE(content::ExecuteScript(host->host_contents(),
                                        send_key_events_test_script));
 
-    const ui::KeyEvent& key_event = mock_input_context->last_sent_key_event();
+    ASSERT_EQ(1u, mock_input_context->sent_key_events().size());
+    const ui::KeyEvent& key_event =
+        mock_input_context->sent_key_events().back();
     EXPECT_EQ(ui::ET_KEY_RELEASED, key_event.type());
     EXPECT_EQ(L'a', key_event.GetCharacter());
     EXPECT_EQ(ui::DomCode::US_Q, key_event.code());

ui/base/ime/dummy_input_method.cc

@@ -98,9 +98,4 @@ DummyInputMethod::GetInputMethodKeyboardController() {
   return nullptr;
 }
 
-const std::vector<std::unique_ptr<KeyEvent>>&
-DummyInputMethod::GetKeyEventsForTesting() {
-  return key_events_for_testing_;
-}
-
 }  // namespace ui

ui/base/ime/dummy_input_method.h

@@ -49,11 +49,7 @@ class DummyInputMethod : public InputMethod {
   void RemoveObserver(InputMethodObserver* observer) override;
   InputMethodKeyboardController* GetInputMethodKeyboardController() override;
 
-  const std::vector<std::unique_ptr<KeyEvent>>& GetKeyEventsForTesting()
-      override;
-
  private:
-  std::vector<std::unique_ptr<KeyEvent>> key_events_for_testing_;
   DISALLOW_COPY_AND_ASSIGN(DummyInputMethod);
 };
 

ui/base/ime/input_method.h

@@ -18,10 +18,6 @@
 #include "ui/events/platform_event.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace extensions {
-class InputImeApiTest;
-}  // namespace extensions
-
 namespace ui {
 
 namespace internal {
@@ -57,8 +53,6 @@ class TextInputClient;
 // ui::InputMethod and owns it.
 class InputMethod {
  public:
-  InputMethod() : track_key_events_for_testing_(false) {}
-
 #if defined(OS_WIN)
   typedef LRESULT NativeEventResult;
 #else
@@ -174,16 +168,6 @@ class InputMethod {
 
   // Return the keyboard controller; used only on Windows.
   virtual InputMethodKeyboardController* GetInputMethodKeyboardController() = 0;
-
- protected:
-  friend class extensions::InputImeApiTest;
-
-  // Gets the tracked key events of using input.ime.sendKeyEvents API.
-  virtual const std::vector<std::unique_ptr<ui::KeyEvent>>&
-  GetKeyEventsForTesting() = 0;
-
-  // Whether the key events will be tracked. Only used for testing.
-  bool track_key_events_for_testing_;
 };
 
 }  // namespace ui

ui/base/ime/input_method_base.cc

@@ -258,9 +258,6 @@ SurroundingTextInfo InputMethodBase::GetSurroundingTextInfo() {
 }
 
 void InputMethodBase::SendKeyEvent(KeyEvent* event) {
-  if (track_key_events_for_testing_) {
-    key_events_for_testing_.push_back(std::make_unique<KeyEvent>(*event));
-  }
   ui::EventDispatchDetails details = DispatchKeyEvent(event);
   DCHECK(!details.dispatcher_destroyed);
 }
@@ -281,9 +278,4 @@ bool InputMethodBase::HasCompositionText() {
   return client && client->HasCompositionText();
 }
 
-const std::vector<std::unique_ptr<ui::KeyEvent>>&
-InputMethodBase::GetKeyEventsForTesting() {
-  return key_events_for_testing_;
-}
-
 }  // namespace ui

ui/base/ime/input_method_base.h

@@ -137,18 +137,12 @@ class COMPONENT_EXPORT(UI_BASE_IME) InputMethodBase
  private:
   internal::InputMethodDelegate* delegate_;
 
-  // InputMethod:
-  const std::vector<std::unique_ptr<ui::KeyEvent>>& GetKeyEventsForTesting()
-      override;
-
   void SetFocusedTextInputClientInternal(TextInputClient* client);
 
   TextInputClient* text_input_client_ = nullptr;
 
   base::ObserverList<InputMethodObserver>::Unchecked observer_list_;
 
-  std::vector<std::unique_ptr<ui::KeyEvent>> key_events_for_testing_;
-
   // Screen bounds of a on-screen keyboard.
   gfx::Rect keyboard_bounds_;
 

ui/base/ime/mock_ime_input_context_handler.cc

@@ -16,8 +16,7 @@ MockIMEInputContextHandler::MockIMEInputContextHandler()
     : commit_text_call_count_(0),
       set_selection_range_call_count_(0),
       update_preedit_text_call_count_(0),
-      delete_surrounding_text_call_count_(0),
-      last_sent_key_event_(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0) {}
+      delete_surrounding_text_call_count_(0) {}
 
 MockIMEInputContextHandler::~MockIMEInputContextHandler() {}
 
@@ -72,11 +71,11 @@ void MockIMEInputContextHandler::Reset() {
   update_preedit_text_call_count_ = 0;
   delete_surrounding_text_call_count_ = 0;
   last_commit_text_.clear();
-  last_sent_key_event_ = ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0);
+  sent_key_events_.clear();
 }
 
 void MockIMEInputContextHandler::SendKeyEvent(KeyEvent* event) {
-  last_sent_key_event_ = *event;
+  sent_key_events_.emplace_back(*event);
 }
 
 InputMethod* MockIMEInputContextHandler::GetInputMethod() {

ui/base/ime/mock_ime_input_context_handler.h

@@ -66,6 +66,8 @@ class COMPONENT_EXPORT(UI_BASE_IME) MockIMEInputContextHandler
     return delete_surrounding_text_call_count_;
   }
 
+  int send_key_event_call_count() const { return sent_key_events_.size(); }
+
   const std::string& last_commit_text() const { return last_commit_text_; }
 
   const UpdateCompositionTextArg& last_update_composition_arg() const {
@@ -76,8 +78,8 @@ class COMPONENT_EXPORT(UI_BASE_IME) MockIMEInputContextHandler
     return last_delete_surrounding_text_arg_;
   }
 
-  const ui::KeyEvent& last_sent_key_event() const {
-    return last_sent_key_event_;
+  const std::vector<ui::KeyEvent>& sent_key_events() const {
+    return sent_key_events_;
   }
 
   // Resets all call count.
@@ -89,7 +91,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) MockIMEInputContextHandler
   int update_preedit_text_call_count_;
   int delete_surrounding_text_call_count_;
   std::string last_commit_text_;
-  ui::KeyEvent last_sent_key_event_;
+  std::vector<ui::KeyEvent> sent_key_events_;
   UpdateCompositionTextArg last_update_composition_arg_;
   DeleteSurroundingTextArg last_delete_surrounding_text_arg_;
 };

ui/base/ime/mock_input_method.cc

@@ -129,9 +129,4 @@ MockInputMethod::GetInputMethodKeyboardController() {
   return &keyboard_controller_;
 }
 
-const std::vector<std::unique_ptr<ui::KeyEvent>>&
-MockInputMethod::GetKeyEventsForTesting() {
-  return key_events_for_testing_;
-}
-
 }  // namespace ui

ui/base/ime/mock_input_method.h

@@ -61,15 +61,11 @@ class COMPONENT_EXPORT(UI_BASE_IME) MockInputMethod : public InputMethod {
   InputMethodKeyboardController* GetInputMethodKeyboardController() override;
 
  private:
-  // InputMethod:
-  const std::vector<std::unique_ptr<ui::KeyEvent>>& GetKeyEventsForTesting()
-      override;
 
   TextInputClient* text_input_client_;
   base::ObserverList<InputMethodObserver>::Unchecked observer_list_;
   internal::InputMethodDelegate* delegate_;
 
-  std::vector<std::unique_ptr<ui::KeyEvent>> key_events_for_testing_;
   InputMethodKeyboardControllerStub keyboard_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MockInputMethod);