Rename input_method_linux_x11 as input_method_auralinux.

ui/base/ime/input_method_initializer.cc

Index: ui/base/ime/input_method_initializer.cc
diff --git a/ui/base/ime/input_method_initializer.cc b/ui/base/ime/input_method_initializer.cc
index 5731a2500565aa60b387f2ee970de0a53c839354..f254b3bbf442e360af17f1f74b3418e16c369f82 100644
--- a/ui/base/ime/input_method_initializer.cc
+++ b/ui/base/ime/input_method_initializer.cc
@@ -10,9 +10,9 @@
 #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)
+#elif defined(USE_AURA)
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ime/input_method_linux_x11.h"
+#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"
@@ -23,7 +23,7 @@ namespace {
 
 #if defined(OS_CHROMEOS)
 bool dbus_thread_manager_was_initialized = false;
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
 const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
 #endif
 
@@ -34,8 +34,8 @@ namespace ui {
 void InitializeInputMethod() {
 #if defined(OS_CHROMEOS)
   chromeos::IBusBridge::Initialize();
-#elif defined(USE_AURA) && defined(USE_X11)
-  InputMethodLinuxX11::Initialize();
+#elif defined(USE_AURA)
+  InputMethodAuraLinux::Initialize();
 #elif defined(OS_WIN)
   if (base::win::IsTSFAwareRequired())
     TSFBridge::Initialize();
@@ -60,7 +60,7 @@ void InitializeInputMethodForTesting() {
     chromeos::DBusThreadManager::InitializeWithStub();
     dbus_thread_manager_was_initialized = true;
   }
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
   if (!g_linux_input_method_context_factory)
     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
   const LinuxInputMethodContextFactory* factory =
@@ -87,7 +87,7 @@ void ShutdownInputMethodForTesting() {
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_was_initialized = false;
   }
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
   const LinuxInputMethodContextFactory* factory =
       LinuxInputMethodContextFactory::instance();
   CHECK(!factory || factory == g_linux_input_method_context_factory)