Unify IMEDriver and IMEServer.

services/ui/ime/ime_registrar_impl.cc

Index: services/ui/ime/ime_registrar_impl.cc
diff --git a/services/ui/ime/ime_registrar_impl.cc b/services/ui/ime/ime_registrar_impl.cc
index 1696765c2e21c066b31c43dfed56a9deac717a27..0636a5240dd895ed2744ca2e94057481a3d1e940 100644
--- a/services/ui/ime/ime_registrar_impl.cc
+++ b/services/ui/ime/ime_registrar_impl.cc
@@ -6,8 +6,8 @@
 
 namespace ui {
 
-IMERegistrarImpl::IMERegistrarImpl(IMEServerImpl* ime_server)
-    : ime_server_(ime_server) {}
+IMERegistrarImpl::IMERegistrarImpl(IMEDriverBridge* ime_driver_bridge)
+    : ime_driver_bridge_(ime_driver_bridge) {}
 
 IMERegistrarImpl::~IMERegistrarImpl() {}
 
@@ -19,6 +19,6 @@ void IMERegistrarImpl::RegisterDriver(mojom::IMEDriverPtr driver) {
   // TODO(moshayedi): crbug.com/634441. IMERegistrarImpl currently identifies
   // the last registered driver as the current driver. Rethink this once we
   // have more usecases.
-  ime_server_->OnDriverChanged(std::move(driver));
+  ime_driver_bridge_->OnDriverChanged(std::move(driver));

[sky, 2017/06/21 19:29:41]

Can you rename OnDriverChanged to SetDriver as that better indicates what the
function does.

 }
 }  // namespace ui