| 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 27b5cdf9c79cc3f469cac33d94c0c6d5a62ea7b0..e9cbd459cb34d8af24eb6d49d292ecc6308d0d94 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -1080,7 +1080,7 @@ TEST_F(RenderWidgetHostTest, DontPostponeHangMonitorTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(10));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(delegate_->unresponsive_timer_fired());
|
| }
|
|
|
| @@ -1099,7 +1099,7 @@ TEST_F(RenderWidgetHostTest, StopAndStartHangMonitorTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(40));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(delegate_->unresponsive_timer_fired());
|
| }
|
|
|
| @@ -1117,7 +1117,7 @@ TEST_F(RenderWidgetHostTest, ShorterDelayHangMonitorTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMilliseconds(25));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(delegate_->unresponsive_timer_fired());
|
| }
|
|
|
| @@ -1135,7 +1135,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_FALSE(delegate_->unresponsive_timer_fired());
|
|
|
| // The timeout should never reactivate while hidden.
|
| @@ -1143,7 +1143,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_FALSE(delegate_->unresponsive_timer_fired());
|
|
|
| // Showing the widget should restore the timeout, as the events have
|
| @@ -1152,7 +1152,7 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(2));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(delegate_->unresponsive_timer_fired());
|
| }
|
|
|
| @@ -1174,7 +1174,7 @@ TEST_F(RenderWidgetHostTest, MultipleInputEvents) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(delegate_->unresponsive_timer_fired());
|
| }
|
|
|
| @@ -1190,7 +1190,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| EXPECT_FALSE(host_->new_content_rendering_timeout_fired());
|
|
|
| @@ -1201,7 +1201,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| EXPECT_FALSE(host_->new_content_rendering_timeout_fired());
|
|
|
| @@ -1210,7 +1210,7 @@ TEST_F(RenderWidgetHostTest, NewContentRenderingTimeout) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| TimeDelta::FromMicroseconds(20));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(host_->new_content_rendering_timeout_fired());
|
| }
|
|
|
|
|