Delete IBusEngineFactoryService.

chromeos/ime/ibus_bridge.cc

 // Copyright (c) 2012 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 "chromeos/ime/ibus_bridge.h"
 
 #include <map>
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 
 namespace chromeos {
 
-namespace {
-void NoOpCreateEngineReply(const dbus::ObjectPath& unused_path) {}
-}  // namespace
-
 static IBusBridge* g_ibus_bridge = NULL;
 
 // An implementation of IBusBridge.
 class IBusBridgeImpl : public IBusBridge {
  public:
   IBusBridgeImpl()
     : input_context_handler_(NULL),
       engine_handler_(NULL),
       candidate_window_handler_(NULL),
       panel_handler_(NULL) {
@@ skipping 43 matching lines @@
   }
 
   // IBusBridge override.
   virtual void SetPropertyHandler(
       IBusPanelPropertyHandlerInterface* handler) OVERRIDE {
     panel_handler_ = handler;
   }
 
   virtual void SetCreateEngineHandler(
       const std::string& engine_id,
-      const IBusEngineFactoryService::CreateEngineHandler& handler) OVERRIDE {
+      const CreateEngineHandler& handler) OVERRIDE {
     create_engine_handler_map_[engine_id] = handler;
   }
 
   // IBusBridge override.
   virtual void UnsetCreateEngineHandler(const std::string& engine_id) OVERRIDE {
     create_engine_handler_map_.erase(engine_id);
   }
 
   // IBusBridge override.
   virtual void CreateEngine(const std::string& engine_id) OVERRIDE {
     // TODO(nona): Change following condition to DCHECK once all legacy IME is
     // migrated to extension IME.
     if (create_engine_handler_map_[engine_id].is_null())
       return;
-    create_engine_handler_map_[engine_id].Run(
-        base::Bind(&NoOpCreateEngineReply));
+    create_engine_handler_map_[engine_id].Run();
   }
 
  private:
   IBusInputContextHandlerInterface* input_context_handler_;
   IBusEngineHandlerInterface* engine_handler_;
   IBusPanelCandidateWindowHandlerInterface* candidate_window_handler_;
   IBusPanelPropertyHandlerInterface* panel_handler_;
-  std::map<std::string, IBusEngineFactoryService::CreateEngineHandler>
-      create_engine_handler_map_;
+  std::map<std::string, CreateEngineHandler> create_engine_handler_map_;
 
   DISALLOW_COPY_AND_ASSIGN(IBusBridgeImpl);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // IBusBridge
 IBusBridge::IBusBridge() {
 }
 
 IBusBridge::~IBusBridge() {
@@ skipping 10 matching lines @@
   delete g_ibus_bridge;
   g_ibus_bridge = NULL;
 }
 
 // static.
 IBusBridge* IBusBridge::Get() {
   return g_ibus_bridge;
 }
 
 }  // namespace chromeos