diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 21:04:22 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 21:04:22 +0000 |
| commit | 364a42af4c025f845321f4f0752099d90a56ac2c (patch) | |
| tree | c450c60c74d21ba4273a637348e6786fa0951a68 /chrome_frame | |
| parent | 820677c8903792306eb74e69a623cc6b5584c4a2 (diff) | |
| download | chromium_src-364a42af4c025f845321f4f0752099d90a56ac2c.zip chromium_src-364a42af4c025f845321f4f0752099d90a56ac2c.tar.gz chromium_src-364a42af4c025f845321f4f0752099d90a56ac2c.tar.bz2 | |
Disable CF/FullTabUITest.TabCrashReload/0 under use_aura=1.
It seems that initial focus is wrong; see bug for details.
BUG=235411
Review URL: https://chromiumcodereview.appspot.com/14471030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/ie_event_sink.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc index 9bc5f53..f8baff0 100644 --- a/chrome_frame/test/ie_event_sink.cc +++ b/chrome_frame/test/ie_event_sink.cc @@ -337,7 +337,7 @@ void IEEventSink::ExpectRendererWindowHasFocus() { ASSERT_TRUE(AttachThreadInput(GetCurrentThreadId(), renderer_thread, TRUE)); HWND focus_window = GetFocus(); - EXPECT_TRUE(focus_window == renderer_window); + EXPECT_EQ(renderer_window, focus_window); EXPECT_TRUE(AttachThreadInput(GetCurrentThreadId(), renderer_thread, FALSE)); } diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 66a6fcf..2342ca3 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -360,7 +360,12 @@ void NavigateToCurrentUrl(MockIEEventSink* mock) { // Tests that Chrome gets re-instantiated after crash if we reload via // the address bar or via a new navigation. +#if defined(USE_AURA) +// Renderer doesn't have focus; see http://crbug.com/235411. +TEST_P(FullTabUITest, DISABLED_TabCrashReload) { +#else TEST_P(FullTabUITest, TabCrashReload) { +#endif using testing::DoAll; if (!GetParam().invokes_cf()) { |