Unify IMEDriver and IMEServer.

services/ui/ime/ime_server_impl.h

Index: services/ui/ime/ime_server_impl.h
diff --git a/services/ui/ime/ime_server_impl.h b/services/ui/ime/ime_server_impl.h
deleted file mode 100644
index ba4026ff757c88ee7f54e7e796002bd078a3d4f3..0000000000000000000000000000000000000000
--- a/services/ui/ime/ime_server_impl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.
-
-#ifndef SERVICES_UI_IME_IME_SERVER_IMPL_H_
-#define SERVICES_UI_IME_IME_SERVER_IMPL_H_
-
-#include <utility>
-
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/ui/public/interfaces/ime/ime.mojom.h"
-
-namespace service_manager {
-class Connector;
-}
-
-namespace ui {
-
-class IMEServerImpl : public mojom::IMEServer {
- public:
-  IMEServerImpl();
-  ~IMEServerImpl() override;
-
-  void Init(service_manager::Connector* connector, bool is_test_config);
-  void AddBinding(mojom::IMEServerRequest request);
-  void OnDriverChanged(mojom::IMEDriverPtr driver);
-
- private:
-  // mojom::IMEServer:
-  void StartSession(mojom::StartSessionDetailsPtr details) override;
-
-  mojo::BindingSet<mojom::IMEServer> bindings_;
-  mojom::IMEDriverPtr driver_;
-  int current_id_;
-
-  std::queue<mojom::StartSessionDetailsPtr> pending_requests_;
-
-  DISALLOW_COPY_AND_ASSIGN(IMEServerImpl);
-};
-
-}  // namespace ui
-
-#endif  // SERVICES_UI_IME_IME_SERVER_IMPL_H_