Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: ash/test/ash_test_helper.cc

Issue 2493223002: Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink (Closed)
Patch Set: Override DesktopMediaListAshTest::TearDown() to reset list_ Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 5764c4af79f2b452d383e52d9da5268da7df7aa8..e28ad840df1bfe97163769c950a49f53ae6c0a5d 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -160,6 +160,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();
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698