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

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

Issue 22648006: Revert 216780 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/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: trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc (revision 216906)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc (working copy)
@@ -45,14 +45,6 @@
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();
Property changes on: trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « trunk/src/ui/views/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698