diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:48:24 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:48:24 +0000 |
| commit | 0472d93e6feea49df59caadb7ab849a9599f916f (patch) | |
| tree | 80a07a819383af87f1aaed5db02fbba2f03a723b /ui | |
| parent | 077bfb3c0d4458cdc2a847254d30f645938369b8 (diff) | |
| download | chromium_src-0472d93e6feea49df59caadb7ab849a9599f916f.zip chromium_src-0472d93e6feea49df59caadb7ab849a9599f916f.tar.gz chromium_src-0472d93e6feea49df59caadb7ab849a9599f916f.tar.bz2 | |
aura: Make tests pass Desktop's dispatcher to message loop.
Pass the Desktop's MessageLoop::Dispatcher to
MessageLoopForUI::RunAllPendingWithDispatcher() instead of
just calling RunAllPending() without a dispatcher.
Otherwise, we frequently get stuck forever in
MessagePumpX::RunOnce(). g_main_context_iteration() appears
to return true (indicating that it performed work)
indefinitely there for reasons that are unclear to me.
BUG=100671
TEST=ran aura_unittests successfully locally in conjunction with a change that was previously hanging consistently
Review URL: http://codereview.chromium.org/8346023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index a0e27ce..c2cff110 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -44,7 +44,8 @@ AuraTestBase::~AuraTestBase() { // Flush the message loop because we have pending release tasks // and these tasks if un-executed would upset Valgrind. - message_loop_.RunAllPending(); + message_loop_.RunAllPendingWithDispatcher( + Desktop::GetInstance()->GetDispatcher()); // Ensure that we don't use the previously-allocated static Desktop object // later -- on Linux, it holds a reference to our message loop's X connection. |