Calling IBusBridge::Initialize/Shutdown function.

chrome/browser/chromeos/input_method/input_method_configuration.cc

Index: chrome/browser/chromeos/input_method/input_method_configuration.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_configuration.cc b/chrome/browser/chromeos/input_method/input_method_configuration.cc
index f98025f15436453fc71d9bb46314909b364dc157..dc3b2c5dcf584ff0aae230dfd71d8896c11fa04c 100644
--- a/chrome/browser/chromeos/input_method/input_method_configuration.cc
+++ b/chrome/browser/chromeos/input_method/input_method_configuration.cc
@@ -5,12 +5,14 @@
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 
 #include "base/bind.h"
+#include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
 #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
+#include "chromeos/ime/ibus_bridge.h"
 
 namespace chromeos {
 namespace input_method {
@@ -31,6 +33,14 @@ void OnSessionStateChange(InputMethodManagerImpl* input_method_manager_impl,
 void Initialize() {
   DCHECK(!g_input_method_manager);
 
+  if (!base::chromeos::IsRunningOnChromeOS()) {
+    // IBusBridge is for ChromeOS on desktop Linux not for ChromeOS Devices or
+    // production at this moment.
+    // TODO(nona): Remove this condition when ibus-daemon is gone.
+    //             (crbug.com/170671)
+    IBusBridge::Initialize();
+  }
+
   InputMethodManagerImpl* impl = new InputMethodManagerImpl(
       scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl));
   impl->Init();
@@ -59,6 +69,11 @@ void Shutdown() {
   delete g_input_method_manager;
   g_input_method_manager = NULL;
 
+  if (IBusBridge::Get()) {
+    // TODO(nona): Remove this condition when ibus-daemon is gone.
+    IBusBridge::Shutdown();
+  }
+
   DVLOG(1) << "InputMethodManager shutdown";
 }