content/public/test/content_browser_test.cc - Issue 340413002: Fixes content_browsertests with --enable-text-input-focus-manager flag enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/test/content_browser_test.cc

Issue 340413002: Fixes content_browsertests with --enable-text-input-focus-manager flag enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed sky's comments. Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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)

+#if !defined(OS_CHROMEOS) && defined(OS_LINUX)

ui::ShutdownInputMethodForTesting();

#endif

« no previous file with comments | « content/browser/bookmarklet_browsertest.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »