Enable Config::MUS to use classic IME instead of servicified IME.

ui/aura/mus/input_method_mus_unittest.cc

Index: ui/aura/mus/input_method_mus_unittest.cc
diff --git a/ui/aura/mus/input_method_mus_unittest.cc b/ui/aura/mus/input_method_mus_unittest.cc
index 9ee10bf7c07bd549d32f93c7acf16e8acd9d3ada..fc334c089da8fd57f63a286abf47d5af31af7f60 100644
--- a/ui/aura/mus/input_method_mus_unittest.cc
+++ b/ui/aura/mus/input_method_mus_unittest.cc
@@ -31,7 +31,6 @@ class TestInputMethodDelegate : public ui::internal::InputMethodDelegate {
 
 using ProcessKeyEventCallback = base::Callback<void(bool)>;
 using ProcessKeyEventCallbacks = std::vector<ProcessKeyEventCallback>;
-using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;
 
 // InputMethod implementation that queues up the callbacks supplied to
 // ProcessKeyEvent().
@@ -66,7 +65,7 @@ using InputMethodMusTest = test::AuraTestBaseMus;
 namespace {
 
 // Used in closure supplied to processing the event.
-void RunFunctionWithEventResult(bool* was_run, ui::mojom::EventResult result) {
+void RunFunctionWithHandled(bool* was_run, bool handled) {
   *was_run = true;
 }
 
@@ -83,9 +82,9 @@ TEST_F(InputMethodMusTest, PendingCallbackRunFromDestruction) {
     TestInputMethod test_input_method;
     InputMethodMusTestApi::SetInputMethod(&input_method_mus,
                                           &test_input_method);
-    std::unique_ptr<EventResultCallback> callback =
-        base::MakeUnique<EventResultCallback>(base::Bind(
-            &RunFunctionWithEventResult, &was_event_result_callback_run));
+    std::unique_ptr<InputMethodMus::AckCallback> callback =
+        base::MakeUnique<InputMethodMus::AckCallback>(base::Bind(
+            &RunFunctionWithHandled, &was_event_result_callback_run));
     InputMethodMusTestApi::CallSendKeyEventToInputMethod(
         &input_method_mus, ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0),
         std::move(callback));
@@ -113,9 +112,9 @@ TEST_F(InputMethodMusTest, PendingCallbackRunFromOnDidChangeFocusedClient) {
   InputMethodMus input_method_mus(&input_method_delegate, &window);
   TestInputMethod test_input_method;
   InputMethodMusTestApi::SetInputMethod(&input_method_mus, &test_input_method);
-  std::unique_ptr<EventResultCallback> callback =
-      base::MakeUnique<EventResultCallback>(base::Bind(
-          &RunFunctionWithEventResult, &was_event_result_callback_run));
+  std::unique_ptr<InputMethodMus::AckCallback> callback =
+      base::MakeUnique<InputMethodMus::AckCallback>(
+          base::Bind(&RunFunctionWithHandled, &was_event_result_callback_run));
   InputMethodMusTestApi::CallSendKeyEventToInputMethod(
       &input_method_mus, ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0),
       std::move(callback));
@@ -176,9 +175,9 @@ TEST_F(InputMethodMusTest, ChangeTextInputTypeWhileProcessingCallback) {
                                                 &test_input_client);
   TestInputMethod test_input_method;
   InputMethodMusTestApi::SetInputMethod(&input_method_mus, &test_input_method);
-  std::unique_ptr<EventResultCallback> callback =
-      base::MakeUnique<EventResultCallback>(base::Bind(
-          &RunFunctionWithEventResult, &was_event_result_callback_run));
+  std::unique_ptr<InputMethodMus::AckCallback> callback =
+      base::MakeUnique<InputMethodMus::AckCallback>(
+          base::Bind(&RunFunctionWithHandled, &was_event_result_callback_run));
   const ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0);
   InputMethodMusTestApi::CallSendKeyEventToInputMethod(
       &input_method_mus, key_event, std::move(callback));