Unify IMEDriver and IMEServer.

ui/aura/mus/input_method_mus.h

 // Copyright (c) 2015 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.
 
 #ifndef UI_AURA_MUS_INPUT_METHOD_MUS_H_
 #define UI_AURA_MUS_INPUT_METHOD_MUS_H_
 
 #include <deque>
 
 #include "base/macros.h"
@@ skipping 61 matching lines @@
   // Called when the server responds to our request to process an event.
   void ProcessKeyEventCallback(
       const ui::KeyEvent& event,
       bool handled);
 
   // The toplevel window which is not owned by this class. This may be null
   // for tests.
   Window* window_;
 
   // May be null in tests.
-  ui::mojom::IMEServerPtr ime_server_;
+  ui::mojom::IMEDriverPtr ime_driver_;
   ui::mojom::InputMethodPtr input_method_ptr_;
   // Typically this is the same as |input_method_ptr_|, but it may be mocked
   // in tests.
   ui::mojom::InputMethod* input_method_ = nullptr;
   std::unique_ptr<TextInputClientImpl> text_input_client_;
 
   // Callbacks supplied to DispatchKeyEvent() are added here while awaiting
   // the response from the server. These are removed when the response is
   // received (ProcessKeyEventCallback()).
   std::deque<std::unique_ptr<EventResultCallback>> pending_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_INPUT_METHOD_MUS_H_