diff options
Diffstat (limited to 'ui/aura/test/test_suite.cc')
| -rw-r--r-- | ui/aura/test/test_suite.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index 8fb8d2e..3d6c1b2 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -1,4 +1,4 @@ -// 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. @@ -9,16 +9,11 @@ #include "build/build_config.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/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.h" -#if defined(USE_WEBKIT_COMPOSITOR) -#include "ui/gfx/compositor/compositor_setup.h" -#else -#include "ui/gfx/test/gfx_test_utils.h" -#endif - namespace aura { namespace test { @@ -36,11 +31,7 @@ void AuraTestSuite::Initialize() { ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); -#if defined(USE_WEBKIT_COMPOSITOR) ui::SetupTestCompositor(); -#else - ui::gfx_test_utils::SetupTestCompositor(); -#endif } void AuraTestSuite::Shutdown() { |