| Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| index 56469f056cde1fad9ef325091ab76f4c4c38616c..d12ebcd08d3c60bff73ad678266748db27f8b407 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| @@ -493,8 +493,9 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
|
| browser_context_.reset();
|
| aura_test_helper_->TearDown();
|
|
|
| - message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
|
| - message_loop_.RunUntilIdle();
|
| + message_loop_.task_runner()->DeleteSoon(FROM_HERE,
|
| + browser_context_.release());
|
| + base::RunLoop().RunUntilIdle();
|
| ImageTransportFactory::Terminate();
|
| }
|
|
|
| @@ -2445,21 +2446,21 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithMemoryPressure) {
|
|
|
| // If we hide one, it should not get evicted.
|
| views[0]->Hide();
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| EXPECT_TRUE(views[0]->HasFrameData());
|
| // Using a lesser memory pressure event however, should evict.
|
| SimulateMemoryPressure(
|
| base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE);
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| EXPECT_FALSE(views[0]->HasFrameData());
|
|
|
| // Check the same for a higher pressure event.
|
| views[1]->Hide();
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| EXPECT_TRUE(views[1]->HasFrameData());
|
| SimulateMemoryPressure(
|
| base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| EXPECT_FALSE(views[1]->HasFrameData());
|
|
|
| for (size_t i = 0; i < renderer_count; ++i) {
|
| @@ -3306,7 +3307,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest,
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| base::TimeDelta::FromMilliseconds(15));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_mode());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode());
|
| @@ -3413,7 +3414,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest, OverscrollWithTouchEvents) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| base::TimeDelta::FromMilliseconds(10));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_EQ(1U, sink_->message_count());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_mode());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode());
|
| @@ -3459,7 +3460,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest,
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| base::TimeDelta::FromMilliseconds(10));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_mode());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->completed_mode());
|
| @@ -3494,7 +3495,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest,
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
|
| base::TimeDelta::FromMilliseconds(10));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_mode());
|
| EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode());
|
| EXPECT_EQ(OVERSCROLL_EAST, overscroll_delegate()->completed_mode());
|
|
|