Use platform-neutral initialize/shutdown functions for IME

This patch set replaces platform-specific initialize/shutdown
functions for IME with platform-neutral ones.

BUG=246534

Review URL: https://chromiumcodereview.appspot.com/16258007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205801 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 8 deletions

diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 461f41b..9198d29 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -15,11 +15,11 @@
 #include "content/browser/notification_service_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
+#include "ui/base/ime/input_method_initializer.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
-#include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
@@ -88,17 +88,14 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
     // are NOT deleted. If you need something to run during WM_ENDSESSION add it
     // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
-#if defined(OS_WIN)
-#if !defined(NO_TCMALLOC)
+#if defined(OS_WIN) && !defined(NO_TCMALLOC)
     // When linking shared libraries, NO_TCMALLOC is defined, and dynamic
     // allocator selection is not supported.
 
     // Make this call before going multithreaded, or spawning any subprocesses.
     base::allocator::SetupSubprocessAllocator();
 #endif
-    if (base::win::IsTSFAwareRequired())
-      ui::TSFBridge::Initialize();
-#endif  // OS_WIN
+    ui::InitializeInputMethod();
 
     main_loop_->CreateThreads();
     int result_code = main_loop_->GetResultCode();
@@ -125,9 +122,8 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
     if (created_threads_)
       main_loop_->ShutdownThreadsAndCleanUp();
 
+    ui::ShutdownInputMethod();
 #if defined(OS_WIN)
-    if (base::win::IsTSFAwareRequired())
-      ui::TSFBridge::Shutdown();
     ole_initializer_.reset(NULL);
 #endif