Clean up compositor initialization/destruction.

ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc

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();