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
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index f3ebe9b..9bb0835 100644
--- a/ash/test/test_suite.cc
+++ b/ash/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.
@@ -12,11 +12,7 @@
#include "ui/gfx/compositor/test/compositor_test_support.h"
#include "ui/gfx/gfx_paths.h"
-#if defined(USE_WEBKIT_COMPOSITOR)
#include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
namespace ash {
namespace test {
@@ -34,11 +30,7 @@
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstance("en-US");
ui::CompositorTestSupport::Initialize();
-#if defined(USE_WEBKIT_COMPOSITOR)
ui::SetupTestCompositor();
-#else
- ui::gfx_test_utils::SetupTestCompositor();
-#endif
}
void AuraShellTestSuite::Shutdown() {
