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

Unified Diff: ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel Created 7 years, 4 months 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 | « ui/views/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc b/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
index eafeee6123182669582e1d350671f93e32c4b46b..d96c445672406cc112e66842bae894c29e638c11 100644
--- a/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
@@ -45,6 +45,14 @@ class DesktopCaptureClientTest : public aura::test::AuraTestBase {
virtual void TearDown() OVERRIDE {
RunAllPendingInMessageLoop();
+
+ second_desktop_position_client_.reset();
+ second_desktop_capture_client_.reset();
+
+ // Kill any active compositors before we hit the compositor shutdown paths.
+ second_root_.reset();
+
+ desktop_position_client_.reset();
desktop_capture_client_.reset();
AuraTestBase::TearDown();
« no previous file with comments | « ui/views/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698