Unify IMEDriver and IMEServer.

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"
@@ skipping 39 matching lines @@
 class IMEAppTest : public service_manager::test::ServiceTest {
  public:
   IMEAppTest() : ServiceTest("ime_unittests") {}
   ~IMEAppTest() override {}
 
   // service_manager::test::ServiceTest:
   void SetUp() override {
     ServiceTest::SetUp();
     // test_ime_driver will register itself as the current IMEDriver.
     connector()->StartService("test_ime_driver");
-    connector()->BindInterface(ui::mojom::kServiceName, &ime_server_);
+    connector()->BindInterface(ui::mojom::kServiceName, &ime_driver_);
   }
 
   bool ProcessKeyEvent(ui::mojom::InputMethodPtr* input_method,
                        std::unique_ptr<ui::Event> event) {
     (*input_method)
         ->ProcessKeyEvent(std::move(event),
                           base::Bind(&IMEAppTest::ProcessKeyEventCallback,
                                      base::Unretained(this)));
 
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
     run_loop_.reset();
 
     return handled_;
   }
 
  protected:
   void ProcessKeyEventCallback(bool handled) {
     handled_ = handled;
     run_loop_->Quit();
   }
 
-  ui::mojom::IMEServerPtr ime_server_;
+  ui::mojom::IMEDriverPtr ime_driver_;
   std::unique_ptr<base::RunLoop> run_loop_;
   bool handled_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEAppTest);
 };
 
-// Tests sending a KeyEvent to the IMEDriver through the Mus IMEServer.
+// Tests sending a KeyEvent to the IMEDriver through the Mus IMEDriver.
 TEST_F(IMEAppTest, ProcessKeyEvent) {
   ui::mojom::TextInputClientPtr client_ptr;
   TestTextInputClient client(MakeRequest(&client_ptr));
 
   ui::mojom::InputMethodPtr input_method;
   ui::mojom::StartSessionDetailsPtr details =
       ui::mojom::StartSessionDetails::New();
   details->client = std::move(client_ptr);
   details->input_method_request = MakeRequest(&input_method);
-  ime_server_->StartSession(std::move(details));
+  ime_driver_->StartSession(std::move(details));
 
   // Send character key event.
   ui::KeyEvent char_event('A', ui::VKEY_A, 0);
   EXPECT_TRUE(ProcessKeyEvent(&input_method, ui::Event::Clone(char_event)));
 
   std::unique_ptr<ui::Event> received_event = client.WaitUntilInsertChar();
   ASSERT_TRUE(received_event && received_event->IsKeyEvent());
 
   ui::KeyEvent* received_key_event = received_event->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);
   EXPECT_FALSE(ProcessKeyEvent(&input_method, ui::Event::Clone(nonchar_event)));
 }