From 578c81bf2adf9cb973f6a8e759a81bbdf5416226 Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Fri, 27 Jan 2012 07:25:02 +0000 Subject: Remove old (pre-webkit) compositor BUG=103948 TEST=builds, tests pass Review URL: http://codereview.chromium.org/9288053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119402 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/run_all_unittests.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'ui/views/run_all_unittests.cc') diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 9273994..8458072 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -1,19 +1,14 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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 "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/compositor/compositor_setup.h" #include "ui/gfx/compositor/test/compositor_test_support.h" #include "ui/views/view.h" -#if defined(USE_WEBKIT_COMPOSITOR) -#include "ui/gfx/compositor/compositor_setup.h" -#else -#include "ui/gfx/test/gfx_test_utils.h" -#endif - class ViewTestSuite : public base::TestSuite { public: ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} @@ -26,11 +21,7 @@ class ViewTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); -#if defined(USE_WEBKIT_COMPOSITOR) ui::SetupTestCompositor(); -#else - ui::gfx_test_utils::SetupTestCompositor(); -#endif } virtual void Shutdown() { -- cgit v1.1