Unify InputMethodIMM32 into InputMethodWin again

ui/base/ime/input_method_factory.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 "ui/base/ime/input_method_factory.h"
 
 #include "ui/base/ime/mock_input_method.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
 #include "ui/base/ime/input_method_chromeos.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
-#include "ui/base/ime/input_method_imm32.h"
+#include "ui/base/ime/input_method_win.h"
 #include "ui/base/ime/remote_input_method_win.h"
 #elif defined(USE_AURA) && defined(OS_LINUX)
 #include "ui/base/ime/input_method_auralinux.h"
 #else
 #include "ui/base/ime/input_method_minimal.h"
 #endif
 
 namespace {
 
 bool g_input_method_set_for_testing = false;
@@ skipping 11 matching lines @@
     g_create_input_method_called = true;
 
   if (g_input_method_set_for_testing)
     return scoped_ptr<InputMethod>(new MockInputMethod(delegate));
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate));
 #elif defined(OS_WIN)
   if (IsRemoteInputMethodWinRequired(widget))
     return CreateRemoteInputMethodWin(delegate);
-  return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget));
+  return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget));
 #elif defined(USE_AURA) && defined(OS_LINUX)
   return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
 #else
   return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
 #endif
 }
 
 void SetUpInputMethodFactoryForTesting() {
   if (g_input_method_set_for_testing)
     return;
 
   CHECK(!g_create_input_method_called)
       << "ui::SetUpInputMethodFactoryForTesting was called after use of "
       << "ui::CreateInputMethod.  You must call "
       << "ui::SetUpInputMethodFactoryForTesting earlier.";
 
   g_input_method_set_for_testing = true;
 }
 
 }  // namespace ui