Fixes content_browsertests with --enable-text-input-focus-manager flag enabled.

content/public/test/content_browser_test.cc

Index: content/public/test/content_browser_test.cc
diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc
index 73fc7cadf186534dc96da985fd36063cb80f5c7a..aa4c44a1766f727aa92f237b103c30eca69e4103 100644
--- a/content/public/test/content_browser_test.cc
+++ b/content/public/test/content_browser_test.cc
@@ -104,7 +104,7 @@ void ContentBrowserTest::TearDown() {
   BrowserTestBase::TearDown();
 
   // LinuxInputMethodContextFactory has to be shutdown.
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11)

[sky, 2014/06/19 20:14:06]

Can you investigate who added the USE_X11 bits here. I believe your change means
this code is now compiled for the ozone target, and I'm not sure that is
desirable.

[Yuki, 2014/06/20 01:30:50]

Please see line 94 and 107 at
http://src.chromium.org/viewvc/chrome/trunk/src/content/public/test/content_b...

I wrote this line first, and later sadrul@ changed so that ozone calls
ui::InitializeInputMethodForTesting, too, but he forgot to change this line.

+#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
   ui::ShutdownInputMethodForTesting();
 #endif