Unify IMEDriver and IMEServer.

chrome/browser/ui/views/ime_driver/ime_driver_mus.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 "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/views/ime_driver/remote_text_input_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
@@ skipping 21 matching lines @@
   ui::mojom::IMEDriverPtr ime_driver_ptr;
   mojo::MakeStrongBinding(base::MakeUnique<IMEDriver>(),
                           MakeRequest(&ime_driver_ptr));
   ui::mojom::IMERegistrarPtr ime_registrar;
   content::ServiceManagerConnection::GetForProcess()
       ->GetConnector()
       ->BindInterface(ui::mojom::kServiceName, &ime_registrar);
   ime_registrar->RegisterDriver(std::move(ime_driver_ptr));
 }
 
-void IMEDriver::StartSession(int32_t session_id,
-                             ui::mojom::StartSessionDetailsPtr details) {
+void IMEDriver::StartSession(ui::mojom::StartSessionDetailsPtr details) {
 #if defined(OS_CHROMEOS)
   std::unique_ptr<RemoteTextInputClient> remote_client =
       base::MakeUnique<RemoteTextInputClient>(
           std::move(details->client), details->text_input_type,
           details->text_input_mode, details->text_direction,
           details->text_input_flags, details->caret_bounds);
-  input_method_bindings_[session_id] =
-      base::MakeUnique<mojo::Binding<ui::mojom::InputMethod>>(
-          new InputMethodBridge(std::move(remote_client)),
-          std::move(details->input_method_request));
+  mojo::MakeStrongBinding(
+      base::MakeUnique<InputMethodBridge>(std::move(remote_client)),
+      std::move(details->input_method_request));
 #else
-  input_method_bindings_[session_id] =
-      base::MakeUnique<mojo::Binding<ui::mojom::InputMethod>>(
-          new SimpleInputMethod());
+  mojo::MakeStrongBinding(base::MakeUnique<SimpleInputMethod>(),
+                          std::move(details->input_method_request));
 #endif
 }
-
-void IMEDriver::CancelSession(int32_t session_id) {
-  input_method_bindings_.erase(session_id);
-}