diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 20:50:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 20:50:39 +0000 |
| commit | 73ed7bb4c25ed6d77a6080bdfe83aadd5a7e17ee (patch) | |
| tree | 562b84ba12602e4b1dc64c8c405b0ef12bcab0a4 /chrome/test | |
| parent | 466640fc7b8e220830e974fbb805019ddd028fe5 (diff) | |
| download | chromium_src-73ed7bb4c25ed6d77a6080bdfe83aadd5a7e17ee.zip chromium_src-73ed7bb4c25ed6d77a6080bdfe83aadd5a7e17ee.tar.gz chromium_src-73ed7bb4c25ed6d77a6080bdfe83aadd5a7e17ee.tar.bz2 | |
Revert 55602 - Attempt at making BrowserKeyboardAccessibility lets flaky. If an
accessibility event was received before the tab key was seen, then we
would prematurely quit the message loop and end up in
ui_controls::SendKeyPressNotifyWhenDone again, resulting in hitting
the DCHECK in ui_controls. Additionally if the test timed out we would
keep running other tests, resulting in hitting the DCHECK in ui_controls. I'm not sure which was happening, but either could have caused the DCHECK to get hit.
I'm going to leave the debugging code in for a few cycles.
I think we need a SendKeyPressAndBlock and callers ASSERT that it returns true. I'll look into that later though.
BUG=50864
TEST=this is only a test change
Review URL: http://codereview.chromium.org/3058039
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/3174001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 39d9681..5d7e2be 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -334,10 +334,9 @@ void InProcessBrowserTest::TimedOut() { error_message += base::IntToString(initial_timeout_); error_message += " ms (kInitialTimeoutInMS)."; - MessageLoopForUI::current()->Quit(); + GTEST_NONFATAL_FAILURE_(error_message.c_str()); - // WARNING: This must be after Quit as it returns. - FAIL() << error_message; + MessageLoopForUI::current()->Quit(); } void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) { |