Fixs bug resulting in double event delivery in mus

ui/aura/mus/input_method_mus_unittest.cc

 // Copyright 2017 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/aura/mus/input_method_mus.h"
 
 #include "services/ui/public/interfaces/ime/ime.mojom.h"
 #include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/mus/input_method_mus_test_api.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_delegate.h"
 
 namespace aura {
 namespace {
 
 // Empty implementation of InputMethodDelegate.
 class TestInputMethodDelegate : public ui::internal::InputMethodDelegate {
  public:
   TestInputMethodDelegate() {}
@@ skipping 35 matching lines @@
  private:
   ProcessKeyEventCallbacks process_key_event_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInputMethod);
 };
 
 }  // namespace
 
 using InputMethodMusTest = test::AuraTestBaseMus;
 
-class InputMethodMusTestApi {
- public:
-  static void SetInputMethod(InputMethodMus* input_method_mus,
-                             ui::mojom::InputMethod* input_method) {
-    input_method_mus->input_method_ = input_method;
-  }
-  static void CallSendKeyEventToInputMethod(
-      InputMethodMus* input_method_mus,
-      const ui::KeyEvent& event,
-      std::unique_ptr<EventResultCallback> ack_callback) {
-    input_method_mus->SendKeyEventToInputMethod(event, std::move(ack_callback));
-  }
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(InputMethodMusTestApi);
-};
-
 namespace {
 
 // Used in closure supplied to processing the event.
 void RunFunctionWithEventResult(bool* was_run, ui::mojom::EventResult result) {
   *was_run = true;
 }
 
 }  // namespace
 
 TEST_F(InputMethodMusTest, PendingCallbackRunFromDestruction) {
@@ skipping 21 matching lines @@
     EXPECT_EQ(2u, test_input_method.process_key_event_callbacks()->size());
     // Callback should not have been run yet.
     EXPECT_FALSE(was_event_result_callback_run);
   }
 
   // When the destructor is run the callback should be run.
   EXPECT_TRUE(was_event_result_callback_run);
 }
 
 }  // namespace aura