Refactoring the ownership of ui::InputMethod.

ui/base/ime/input_method_factory.cc

Index: ui/base/ime/input_method_factory.cc
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc
index c80e75a3d85872e89d898b05760dc76a43402ca0..1950b6af0f444d2c4ca2167cdff6493dd27bd2ee 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -14,7 +14,8 @@
 #include "ui/base/ime/remote_input_method_win.h"
 #elif defined(OS_MACOSX)
 #include "ui/base/ime/input_method_mac.h"
-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \

[sadrul, 2015/06/09 15:29:33]

I don't see anything x11 specific in InputMethodAuraLinux. Why make this change?
(I think intel folks use this for non-x11 desktop-ozone builds)

[Shu Chen, 2015/06/10 03:01:35]

Done. I recall this was to fix tests but cannot remember the exact reason. Let
me revert this and see the trybots.

[Shu Chen, 2015/06/10 04:11:43]

Looks like the ChromecastShellBrowserTest in bot cast_shell_linux will be broken
if revert this change.
The CastShell should use InputMethodMinimal instead of InputMethodAuraLinux.

InputMethodAuraLinux uses ui::LinuxInputMethodContext which is implemented by
X11InputMethodContextImplGtk2 which depends on x11 stuff.

So for linux-desktop-ozone builds, there is no native IME support in Chromium
yet.

+    !defined(OS_CHROMEOS)
 #include "ui/base/ime/input_method_auralinux.h"
 #else
 #include "ui/base/ime/input_method_minimal.h"
@@ -47,7 +48,8 @@ scoped_ptr<InputMethod> CreateInputMethod(
   return make_scoped_ptr(new InputMethodWin(delegate, widget));
 #elif defined(OS_MACOSX)
   return make_scoped_ptr(new InputMethodMac(delegate));
-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
+    !defined(OS_CHROMEOS)
   return make_scoped_ptr(new InputMethodAuraLinux(delegate));
 #else
   return make_scoped_ptr(new InputMethodMinimal(delegate));