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

content/public/test/content_browser_test.cc

 // Copyright (c) 2011 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 "content/public/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 86 matching lines @@
 
   setup_called_ = true;
 
   BrowserTestBase::SetUp();
 }
 
 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
 
 #if defined(OS_ANDROID)
   shell_main_delegate_.reset();
 #endif
 }
 
 void ContentBrowserTest::RunTestOnMainThreadLoop() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
@@ skipping 48 matching lines @@
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(url::kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
       gfx::Size());
 }
 
 }  // namespace content