1 files changed, 9 insertions, 57 deletions

diff --git a/chromium/ui/base/ime/input_method_initializer.cc b/chromium/ui/base/ime/input_method_initializer.cc
index ad29e61f508..2fca46cff47 100644
--- a/chromium/ui/base/ime/input_method_initializer.cc
+++ b/chromium/ui/base/ime/input_method_initializer.cc
@@ -4,27 +4,16 @@
 
 #include "ui/base/ime/input_method_initializer.h"
 
-#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
-#include "ui/base/ime/input_method_factory.h"
-#endif
-
 #if defined(OS_CHROMEOS)
+#include "ui/base/ime/chromeos/ime_bridge.h"
+#elif defined(USE_AURA) && defined(OS_LINUX)
 #include "base/logging.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "ui/base/ime/chromeos/ibus_bridge.h"
-#elif defined(USE_AURA) && defined(USE_X11)
-#include "ui/base/ime/input_method_auralinux.h"
 #include "ui/base/ime/linux/fake_input_method_context_factory.h"
-#elif defined(OS_WIN)
-#include "base/win/metro.h"
-#include "ui/base/ime/win/tsf_bridge.h"
 #endif
 
 namespace {
 
-#if defined(OS_CHROMEOS)
-bool dbus_thread_manager_was_initialized = false;
-#elif defined(USE_AURA) && defined(USE_X11)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
 const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
 #endif
 
@@ -34,37 +23,20 @@ namespace ui {
 
 void InitializeInputMethod() {
 #if defined(OS_CHROMEOS)
-  chromeos::IBusBridge::Initialize();
-#elif defined(USE_AURA) && defined(USE_X11)
-  InputMethodAuraLinux::Initialize();
-#elif defined(OS_WIN)
-  if (base::win::IsTSFAwareRequired())
-    TSFBridge::Initialize();
+  chromeos::IMEBridge::Initialize();
 #endif
 }
 
 void ShutdownInputMethod() {
-#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
-  InputMethodFactory::ClearInstance();
-#endif
 #if defined(OS_CHROMEOS)
-  chromeos::IBusBridge::Shutdown();
-#elif defined(OS_WIN)
-  internal::DestroySharedInputMethod();
-  if (base::win::IsTSFAwareRequired())
-    TSFBridge::Shutdown();
+  chromeos::IMEBridge::Shutdown();
 #endif
 }
 
 void InitializeInputMethodForTesting() {
 #if defined(OS_CHROMEOS)
-  chromeos::IBusBridge::Initialize();
-  // TODO(nona): Remove DBusThreadManager initialize.
-  if (!chromeos::DBusThreadManager::IsInitialized()) {
-    chromeos::DBusThreadManager::InitializeWithStub();
-    dbus_thread_manager_was_initialized = true;
-  }
-#elif defined(USE_AURA) && defined(USE_X11)
+  chromeos::IMEBridge::Initialize();
+#elif defined(USE_AURA) && defined(OS_LINUX)
   if (!g_linux_input_method_context_factory)
     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
   const LinuxInputMethodContextFactory* factory =
@@ -74,27 +46,13 @@ void InitializeInputMethodForTesting() {
       << "else.";
   LinuxInputMethodContextFactory::SetInstance(
       g_linux_input_method_context_factory);
-#elif defined(OS_WIN)
-  if (base::win::IsTSFAwareRequired()) {
-    // Make sure COM is initialized because TSF depends on COM.
-    CoInitialize(NULL);
-    TSFBridge::Initialize();
-  }
 #endif
 }
 
 void ShutdownInputMethodForTesting() {
-#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
-  InputMethodFactory::ClearInstance();
-#endif
 #if defined(OS_CHROMEOS)
-  chromeos::IBusBridge::Shutdown();
-  // TODO(nona): Remove DBusThreadManager finalize.
-  if (dbus_thread_manager_was_initialized) {
-    chromeos::DBusThreadManager::Shutdown();
-    dbus_thread_manager_was_initialized = false;
-  }
-#elif defined(USE_AURA) && defined(USE_X11)
+  chromeos::IMEBridge::Shutdown();
+#elif defined(USE_AURA) && defined(OS_LINUX)
   const LinuxInputMethodContextFactory* factory =
       LinuxInputMethodContextFactory::instance();
   CHECK(!factory || factory == g_linux_input_method_context_factory)
@@ -102,12 +60,6 @@ void ShutdownInputMethodForTesting() {
   LinuxInputMethodContextFactory::SetInstance(NULL);
   delete g_linux_input_method_context_factory;
   g_linux_input_method_context_factory = NULL;
-#elif defined(OS_WIN)
-  internal::DestroySharedInputMethod();
-  if (base::win::IsTSFAwareRequired()) {
-    TSFBridge::Shutdown();
-    CoUninitialize();
-  }
 #endif
 }