Delete IBusEngineFactoryService.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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 "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "chromeos/ime/candidate_window.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
 const char* kErrorNotActive = "IME is not active";
 const char* kErrorWrongContext = "Context is not active";
 const char* kCandidateNotFound = "Candidate not found";
 const char* kEngineBusPrefix = "org.freedesktop.IBus.";
 
 namespace {
 const uint32 kIBusAltKeyMask = 1 << 3;
 const uint32 kIBusCtrlKeyMask = 1 << 2;
 const uint32 kIBusShiftKeyMask = 1 << 0;
 const uint32 kIBusCapsLockMask = 1 << 1;
 const uint32 kIBusKeyReleaseMask = 1 << 30;
 }
 
 InputMethodEngineIBus::InputMethodEngineIBus()
     : focused_(false),
       active_(false),
       context_id_(0),
       next_context_id_(1),
+      is_create_engine_handler_called_(false),
       aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
       candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false),
-      ibus_engine_factory_service_(IBusEngineFactoryService::Create()),
       weak_ptr_factory_(this) {}
 
 InputMethodEngineIBus::~InputMethodEngineIBus() {
   input_method::InputMethodManager::Get()->RemoveInputMethodExtension(ibus_id_);
 
-  // Do not unset engine before removing input method extension, above function
-  // may call reset function of engine object.
-  // TODO(nona): Call Reset manually here and remove relevant code from
-  //             InputMethodManager once ibus-daemon is gone. (crbug.com/158273)
-  if (!object_path_.value().empty()) {
+  // Do not unset engine before removing input method extension, above
+  // function may call reset function of engine object.
+  if (is_create_engine_handler_called_) {
     GetCurrentService()->UnsetEngine(this);
     ibus_engine_service_.reset();
   }
 }
 
 void InputMethodEngineIBus::Initialize(
     InputMethodEngine::Observer* observer,
     const char* engine_name,
     const char* extension_id,
     const char* engine_id,
@@ skipping 499 matching lines @@
 }
 
 void InputMethodEngineIBus::OnConnected() {
   RegisterComponent();
 }
 
 void InputMethodEngineIBus::OnDisconnected() {
 }
 
 void InputMethodEngineIBus::RegisterComponent() {
-  ibus_engine_factory_service_->SetCreateEngineHandler(
+  IBusBridge::Get()->SetCreateEngineHandler(
       ibus_id_,
       base::Bind(&InputMethodEngineIBus::CreateEngineHandler,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void InputMethodEngineIBus::CreateEngineHandler(
-    const IBusEngineFactoryService::CreateEngineResponseSender& sender) {
+void InputMethodEngineIBus::CreateEngineHandler() {
   GetCurrentService()->UnsetEngine(this);
   ibus_engine_service_.reset();
-  object_path_ = ibus_engine_factory_service_->GenerateUniqueObjectPath();
-
   GetCurrentService()->SetEngine(this);
-  sender.Run(object_path_);
+  is_create_engine_handler_called_ = true;
 }
 
 }  // namespace chromeos