Unify IMEDriver and IMEServer.

services/ui/ime/test_ime_driver/test_ime_driver.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 "services/ui/ime/test_ime_driver/test_ime_driver.h"
 
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/public/interfaces/ime/ime.mojom.h"
 
 namespace ui {
 namespace test {
 
 class TestInputMethod : public mojom::InputMethod {
  public:
   explicit TestInputMethod(mojom::TextInputClientPtr client)
       : client_(std::move(client)) {}
   ~TestInputMethod() override {}
@@ skipping 17 matching lines @@
 
   mojom::TextInputClientPtr client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInputMethod);
 };
 
 TestIMEDriver::TestIMEDriver() {}
 
 TestIMEDriver::~TestIMEDriver() {}
 
-void TestIMEDriver::StartSession(int32_t session_id,
-                                 mojom::StartSessionDetailsPtr details) {
-  input_method_bindings_[session_id].reset(
-      new mojo::Binding<mojom::InputMethod>(
-          new TestInputMethod(std::move(details->client)),
-          std::move(details->input_method_request)));
-}
-
-void TestIMEDriver::CancelSession(int32_t session_id) {
-  input_method_bindings_.erase(session_id);
+void TestIMEDriver::StartSession(mojom::StartSessionDetailsPtr details) {
+  mojo::MakeStrongBinding(
+      base::MakeUnique<TestInputMethod>(std::move(details->client)),
+      std::move(details->input_method_request));
 }
 
 }  // namespace test
 }  // namespace ui