Remove old (pre-webkit) compositor

ui/aura/test/test_suite.cc

Index: ui/aura/test/test_suite.cc
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 8fb8d2e550e065f14d195d948b3099b028ebdb58..ff1989b3c1620b48a38fbbac9a5063c605d3ac82 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -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() {