From 25cc88bf02e1ea4a4b19e15cb5a046532c521442 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Wed, 7 Aug 2013 14:23:31 +0000 Subject: Revert "Clean up compositor initialization/destruction." This reverts commit d65d6fe3c667835a8a0ddc0b917519115321d605. The CL needs to be rebased. TBR=piman BUG=258625, 266565 Review URL: https://codereview.chromium.org/22570003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216183 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/run_all_unittests.cc | 3 +++ ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'ui/views') diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 6c425d7..cd73011 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -7,6 +7,7 @@ #include "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/compositor/compositor_setup.h" #include "ui/views/view.h" class ViewTestSuite : public base::TestSuite { @@ -18,6 +19,8 @@ class ViewTestSuite : public base::TestSuite { base::TestSuite::Initialize(); ui::RegisterPathProvider(); ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); + + ui::SetupTestCompositor(); } private: 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 d96c445..eafeee6 100644 --- a/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc @@ -45,14 +45,6 @@ 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(); -- cgit v1.1