Aura: Nuke the timeout in DrawWaiterForTest::Wait
The valgrind and heapcheck bots take much longer to issue a draw (especially
with a software rasterizer). So drop the timeout and let the test
infrastructure detect a hang on failure (rather than a failed test expectation
on our own timeout).
BUG=173417,230082
Review URL: https://chromiumcodereview.appspot.com/14029007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193783 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index c103714f..d33eef2 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -8,7 +8,6 @@
#include <deque>
#include "base/bind.h"
-#include "base/cancelable_callback.h"
#include "base/command_line.h"
#include "base/memory/singleton.h"
#include "base/message_loop.h"
@@ -338,37 +337,22 @@
}
// static
-bool DrawWaiterForTest::Wait(Compositor* compositor) {
+void DrawWaiterForTest::Wait(Compositor* compositor) {
DrawWaiterForTest waiter;
- return waiter.WaitImpl(compositor);
+ waiter.WaitImpl(compositor);
}
-DrawWaiterForTest::DrawWaiterForTest()
- : kDrawWaitTimeOutMs(1000),
- did_draw_(false) {
+DrawWaiterForTest::DrawWaiterForTest() {
}
DrawWaiterForTest::~DrawWaiterForTest() {
}
-bool DrawWaiterForTest::WaitImpl(Compositor* compositor) {
- did_draw_ = false;
+void DrawWaiterForTest::WaitImpl(Compositor* compositor) {
compositor->AddObserver(this);
wait_run_loop_.reset(new base::RunLoop());
- base::CancelableClosure timeout(
- base::Bind(&DrawWaiterForTest::TimedOutWhileWaiting,
- base::Unretained(this)));
- MessageLoop::current()->PostDelayedTask(
- FROM_HERE, timeout.callback(),
- base::TimeDelta::FromMilliseconds(kDrawWaitTimeOutMs));
wait_run_loop_->Run();
compositor->RemoveObserver(this);
- return did_draw_;
-}
-
-void DrawWaiterForTest::TimedOutWhileWaiting() {
- LOG(ERROR) << "Timed out waiting for draw.";
- wait_run_loop_->Quit();
}
void DrawWaiterForTest::OnCompositingDidCommit(Compositor* compositor) {
@@ -379,7 +363,6 @@
}
void DrawWaiterForTest::OnCompositingEnded(Compositor* compositor) {
- did_draw_ = true;
wait_run_loop_->Quit();
}
