ChromeOS: Remove unused IBus classes from chromeos/.

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>
 
@@ skipping 36 matching lines @@
       next_context_id_(1),
       aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
       component_(new IBusComponent()),
       candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false),
       weak_ptr_factory_(this) {
+  ibus_engine_factory_service_.reset(IBusEngineFactoryService::Create());

[satorux1, 2013/11/05 03:37:55]

do this in the initializer list?

   ibus_engine_factory_service_(IBusEngineFactoryService::Create())

[pneubeck (no reviews), 2013/11/06 09:07:56]

Done.

 }
 
 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()) {
     GetCurrentService()->UnsetEngine(this);
-    DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
+    ibus_engine_service_.reset();
   }
 }
 
 void InputMethodEngineIBus::Initialize(
     InputMethodEngine::Observer* observer,
     const char* engine_name,
     const char* extension_id,
     const char* engine_id,
     const char* description,
     const std::vector<std::string>& languages,
@@ skipping 441 matching lines @@
 void InputMethodEngineIBus::SetSurroundingText(const std::string& text,
                                                uint32 cursor_pos,
                                                uint32 anchor_pos) {
   observer_->OnSurroundingTextChanged(engine_id_,
                                       text,
                                       static_cast<int>(cursor_pos),
                                       static_cast<int>(anchor_pos));
 }
 
 IBusEngineService* InputMethodEngineIBus::GetCurrentService() {
-  return DBusThreadManager::Get()->GetIBusEngineService(object_path_);
+  if (!ibus_engine_service_)
+    ibus_engine_service_.reset(IBusEngineService::Create());
+  return ibus_engine_service_.get();
 }
 
 void InputMethodEngineIBus::MenuItemToProperty(
     const MenuItem& item,
     input_method::InputMethodProperty* property) {
   property->key = item.id;
 
   if (item.modified & MENU_ITEM_MODIFIED_LABEL) {
     property->label = item.label;
   }
@@ skipping 45 matching lines @@
   IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
   client->RegisterComponent(
       *component_.get(),
       base::Bind(&InputMethodEngineIBus::OnComponentRegistered,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&InputMethodEngineIBus::OnComponentRegistrationFailed,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void InputMethodEngineIBus::OnComponentRegistered() {
-  DBusThreadManager::Get()->GetIBusEngineFactoryService()->
-      SetCreateEngineHandler(ibus_id_,
-                             base::Bind(
-                                 &InputMethodEngineIBus::CreateEngineHandler,
-                                 weak_ptr_factory_.GetWeakPtr()));
+  ibus_engine_factory_service_->SetCreateEngineHandler(
+      ibus_id_,
+      base::Bind(&InputMethodEngineIBus::CreateEngineHandler,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void InputMethodEngineIBus::OnComponentRegistrationFailed() {
   DVLOG(1) << "Failed to register input method components.";
   // TODO(nona): Implement error handling.
 }
 
 void InputMethodEngineIBus::CreateEngineHandler(
     const IBusEngineFactoryService::CreateEngineResponseSender& sender) {
   GetCurrentService()->UnsetEngine(this);
-  DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
-
-  object_path_ = DBusThreadManager::Get()->GetIBusEngineFactoryService()->
-      GenerateUniqueObjectPath();
+  ibus_engine_service_.reset();
+  object_path_ = ibus_engine_factory_service_->GenerateUniqueObjectPath();
 
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos