diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 19:18:08 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 19:18:08 +0000 |
| commit | 60740513788fc4c870e0f120f3246a8db30ebfa8 (patch) | |
| tree | 1f9deae7302f38e54aaa49516251cf03c9d9ee61 /content | |
| parent | e710476c0c796591dba6eb8aafcce7392f5cd51a (diff) | |
| download | chromium_src-60740513788fc4c870e0f120f3246a8db30ebfa8.zip chromium_src-60740513788fc4c870e0f120f3246a8db30ebfa8.tar.gz chromium_src-60740513788fc4c870e0f120f3246a8db30ebfa8.tar.bz2 | |
Fixes content_browsertests with --enable-text-input-focus-manager flag enabled.
Some tests in content_browsertests are broken if --enable-text-input-focus-manager is enabled. Fix those tests.
Since not all unittests run wm::FocusController::SetFocusedWindow, it turned out that we need WMTestHelper (instead of FocusController) to clear the text input client.
BUG=290701
TEST=Run content_browsertests with --enable-text-input-focus-manager enabled.
Review URL: https://codereview.chromium.org/340413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/bookmarklet_browsertest.cc | 2 | ||||
| -rw-r--r-- | content/public/test/content_browser_test.cc | 2 | ||||
| -rw-r--r-- | content/shell/browser/shell_views.cc | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc index 9381962..5ec10d5 100644 --- a/content/browser/bookmarklet_browsertest.cc +++ b/content/browser/bookmarklet_browsertest.cc @@ -70,6 +70,4 @@ IN_PROC_BROWSER_TEST_F(BookmarkletTest, DocumentWrite) { EXPECT_EQ("hello world", GetBodyText()); } - } // namespace content - diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc index 73fc7ca..aa4c44a 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 diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc index 5bc6852..d1f4862 100644 --- a/content/shell/browser/shell_views.cc +++ b/content/shell/browser/shell_views.cc @@ -437,6 +437,7 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) { void Shell::PlatformExit() { #if defined(OS_CHROMEOS) delete wm_test_helper_; + wm_test_helper_ = NULL; #endif delete views_delegate_; views_delegate_ = NULL; |