| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index e92ea0db55093922a9a53aba87ed40150de744e4..966032718f515df95dea899286936bf078ef00a0 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -163,6 +163,10 @@ void AshTestHelper::SetUp(bool start_session,
|
| void AshTestHelper::TearDown() {
|
| // Tear down the shell.
|
| Shell::DeleteInstance();
|
| +
|
| + // Suspend the tear down until all resources are returned via
|
| + // MojoCompositorFrameSinkClient::ReclaimResources()
|
| + RunAllPendingInMessageLoop();
|
| material_design_state_.reset();
|
| test::MaterialDesignControllerTestAPI::Uninitialize();
|
| ash_test_environment_->TearDown();
|
|
|