Revert of IME for Mus: Make InputMethodMus use the IME Mojo API.

services/ui/ime/ime_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/cpp/service_test.h"
 #include "services/ui/public/interfaces/ime.mojom.h"
 #include "ui/events/event.h"
 
 class TestTextInputClient : public ui::mojom::TextInputClient {
  public:
   explicit TestTextInputClient(ui::mojom::TextInputClientRequest request)
       : binding_(this, std::move(request)) {}
 
-  ui::mojom::CompositionEventPtr WaitUntilCompositionEvent() {
+  ui::mojom::CompositionEventPtr ReceiveCompositionEvent() {
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
     run_loop_.reset();
 
     return std::move(receieved_composition_event_);
   }
 
-  ui::Event* WaitUntilUnhandledEvent() {
-    run_loop_.reset(new base::RunLoop);
-    run_loop_->Run();
-    run_loop_.reset();
-
-    return unhandled_event_.get();
-  }
-
  private:
   void OnCompositionEvent(ui::mojom::CompositionEventPtr event) override {
     receieved_composition_event_ = std::move(event);
     run_loop_->Quit();
   }
-  void OnUnhandledEvent(std::unique_ptr<ui::Event> char_event) override {
-    unhandled_event_ = std::move(char_event);
-    run_loop_->Quit();
-  }
 
   mojo::Binding<ui::mojom::TextInputClient> binding_;
   std::unique_ptr<base::RunLoop> run_loop_;
   ui::mojom::CompositionEventPtr receieved_composition_event_;
-  std::unique_ptr<ui::Event> unhandled_event_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTextInputClient);
 };
 
 class IMEAppTest : public shell::test::ServiceTest {
  public:
   IMEAppTest() : ServiceTest("exe:mus_ime_unittests") {}
   ~IMEAppTest() override {}
 
   // shell::test::ServiceTest:
@@ skipping 12 matching lines @@
 };
 
 // Tests sending a KeyEvent to the IMEDriver through the Mus IMEServer.
 TEST_F(IMEAppTest, ProcessKeyEvent) {
   ui::mojom::TextInputClientPtr client_ptr;
   TestTextInputClient client(GetProxy(&client_ptr));
 
   ui::mojom::InputMethodPtr input_method;
   ime_server_->StartSession(std::move(client_ptr), GetProxy(&input_method));
 
-  // Send character key event.
-  ui::KeyEvent char_event('A', ui::VKEY_A, 0);
-  input_method->ProcessKeyEvent(ui::Event::Clone(char_event));
+  ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
+
+  input_method->ProcessKeyEvent(ui::Event::Clone(key_event));
 
   ui::mojom::CompositionEventPtr composition_event =
-      client.WaitUntilCompositionEvent();
-  EXPECT_EQ(ui::mojom::CompositionEventType::INSERT_CHAR,
+      client.ReceiveCompositionEvent();
+  ASSERT_EQ(ui::mojom::CompositionEventType::INSERT_CHAR,
             composition_event->type);
-  EXPECT_TRUE(composition_event->key_event);
-  EXPECT_TRUE(composition_event->key_event.value()->IsKeyEvent());
+  ASSERT_TRUE(composition_event->key_event);
+  ASSERT_TRUE(composition_event->key_event.value()->IsKeyEvent());
 
   ui::KeyEvent* received_key_event =
       composition_event->key_event.value()->AsKeyEvent();
-  EXPECT_EQ(ui::ET_KEY_PRESSED, received_key_event->type());
-  EXPECT_TRUE(received_key_event->is_char());
-  EXPECT_EQ(char_event.GetCharacter(), received_key_event->GetCharacter());
-
-  // Send non-character key event.
-  ui::KeyEvent nonchar_event(ui::ET_KEY_PRESSED, ui::VKEY_LEFT, 0);
-  input_method->ProcessKeyEvent(ui::Event::Clone(nonchar_event));
-
-  ui::Event* unhandled_event = client.WaitUntilUnhandledEvent();
-  EXPECT_TRUE(unhandled_event);
-  EXPECT_TRUE(unhandled_event->IsKeyEvent());
-  EXPECT_FALSE(unhandled_event->AsKeyEvent()->is_char());
-  EXPECT_EQ(ui::ET_KEY_PRESSED, unhandled_event->type());
-  EXPECT_EQ(nonchar_event.key_code(),
-            unhandled_event->AsKeyEvent()->key_code());
+  ASSERT_EQ(ui::ET_KEY_PRESSED, received_key_event->type());
+  ASSERT_EQ(key_event.GetCharacter(), received_key_event->GetCharacter());
 }