| Index: content/browser/renderer_host/render_widget_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| index 785288d5c6e2b48d2416037bc03ae731b2360040..2503b5eb7cf0241f18eaf9d464ac6767d539ea66 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -998,7 +998,7 @@ TEST_F(RenderWidgetHostTest, DontPostponeHangMonitorTimeout) {
|
|
|
| // Wait long enough for first timeout and see if it fired.
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(10));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->unresponsive_timer_fired());
|
| @@ -1017,7 +1017,7 @@ TEST_F(RenderWidgetHostTest, StopAndStartHangMonitorTimeout) {
|
|
|
| // Wait long enough for first timeout and see if it fired.
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(40));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->unresponsive_timer_fired());
|
| @@ -1035,7 +1035,7 @@ TEST_F(RenderWidgetHostTest, ShorterDelayHangMonitorTimeout) {
|
|
|
| // Wait long enough for the second timeout and see if it fired.
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(25));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->unresponsive_timer_fired());
|
| @@ -1053,7 +1053,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| // The timeout should not fire.
|
| EXPECT_FALSE(host_->unresponsive_timer_fired());
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_FALSE(host_->unresponsive_timer_fired());
|
| @@ -1061,7 +1061,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| // The timeout should never reactivate while hidden.
|
| SimulateMouseEvent(WebInputEvent::MouseMove, 10, 10, 0, false);
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_FALSE(host_->unresponsive_timer_fired());
|
| @@ -1070,7 +1070,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| // not yet been ack'ed.
|
| host_->WasShown(ui::LatencyInfo());
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->unresponsive_timer_fired());
|
| @@ -1092,7 +1092,7 @@ TEST_F(RenderWidgetHostTest, MultipleInputEvents) {
|
|
|
| // Wait long enough for first timeout and see if it fired.
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->unresponsive_timer_fired());
|
| @@ -1108,7 +1108,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| host_->StartNewContentRenderingTimeout();
|
| host_->OnFirstPaintAfterLoad();
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| base::MessageLoop::current()->Run();
|
|
|
| @@ -1119,7 +1119,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| host_->OnFirstPaintAfterLoad();
|
| host_->StartNewContentRenderingTimeout();
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| base::MessageLoop::current()->Run();
|
|
|
| @@ -1128,7 +1128,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| // Test with a long delay to ensure that it does fire this time.
|
| host_->StartNewContentRenderingTimeout();
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::MessageLoop::QuitClosure(),
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| base::MessageLoop::current()->Run();
|
| EXPECT_TRUE(host_->new_content_rendering_timeout_fired());
|
|
|