Unify IMEDriver and IMEServer.

services/ui/ime/ime_unittest.cc

Index: services/ui/ime/ime_unittest.cc
diff --git a/services/ui/ime/ime_unittest.cc b/services/ui/ime/ime_unittest.cc
index c65d5f141b094aa382ef2728a2f8bfec25f336d8..8471c680096e4253924cd2ff0ee7af4875165c2d 100644
--- a/services/ui/ime/ime_unittest.cc
+++ b/services/ui/ime/ime_unittest.cc
@@ -57,7 +57,7 @@ class IMEAppTest : public service_manager::test::ServiceTest {
     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,
@@ -80,14 +80,14 @@ class IMEAppTest : public service_manager::test::ServiceTest {
     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));
@@ -97,7 +97,7 @@ TEST_F(IMEAppTest, ProcessKeyEvent) {
       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);