Unify IMEDriver and IMEServer.

services/ui/ime/test_ime_driver/test_ime_driver.h

Index: services/ui/ime/test_ime_driver/test_ime_driver.h
diff --git a/services/ui/ime/test_ime_driver/test_ime_driver.h b/services/ui/ime/test_ime_driver/test_ime_driver.h
index 3e26953a5a5f9680b19298b4c16f8c8223858b02..121b887336401a9861f3bf27f61457ce351b7a54 100644
--- a/services/ui/ime/test_ime_driver/test_ime_driver.h
+++ b/services/ui/ime/test_ime_driver/test_ime_driver.h
@@ -10,7 +10,6 @@
 #include <map>
 #include <memory>
 
-#include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/ime/ime.mojom.h"
 
 namespace ui {
@@ -23,12 +22,7 @@ class TestIMEDriver : public ui::mojom::IMEDriver {
 
  private:
   // ui::mojom::IMEDriver:
-  void StartSession(int32_t session_id,
-                    ui::mojom::StartSessionDetailsPtr details) override;
-  void CancelSession(int32_t session_id) override;
-
-  std::map<int32_t, std::unique_ptr<mojo::Binding<mojom::InputMethod>>>
-      input_method_bindings_;
+  void StartSession(ui::mojom::StartSessionDetailsPtr details) override;
 
   DISALLOW_COPY_AND_ASSIGN(TestIMEDriver);
 };