Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_capture_client.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 27 matching lines @@
                                           desktop_position_client_.get());
 
     second_desktop_position_client_.reset(new DesktopScreenPositionClient());
     aura::client::SetScreenPositionClient(
         second_root_.get(),
         second_desktop_position_client_.get());
   }
 
   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();
   }
 
   scoped_ptr<DesktopCaptureClient> desktop_capture_client_;
   scoped_ptr<aura::RootWindow> second_root_;
   scoped_ptr<DesktopCaptureClient> second_desktop_capture_client_;
   scoped_ptr<aura::client::ScreenPositionClient> desktop_position_client_;
   scoped_ptr<aura::client::ScreenPositionClient>
@@ skipping 156 matching lines @@
   root2->DispatchGestureEvent(&g1);
   EXPECT_TRUE(v2->received_gesture_event());
   EXPECT_FALSE(v1->received_gesture_event());
 
   widget1->CloseNow();
   widget2->CloseNow();
   RunPendingMessages();
 }
 
 }  // namespace views