Remove old (pre-webkit) compositor

chrome/browser/chrome_browser_main_extra_parts_aura.cc

Index: chrome/browser/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index f186ca085edfc2cfbc61e63dc8d257c900a3b262..5ea312d8bfdcdf7cc607d9bc1a872c45db482921 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -12,28 +12,19 @@
 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h"
 #include "chrome/browser/ui/views/aura/screenshot_taker.h"
 #include "ui/aura/root_window.h"
+#include "ui/gfx/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
-
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
     : ChromeBrowserMainExtraParts() {
 }
 
 void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestCompositor)) {
-#if defined(USE_WEBKIT_COMPOSITOR)
     ui::SetupTestCompositor();
-#else
-    ui::gfx_test_utils::SetupTestCompositor();
-#endif
   }
 
 #if defined(OS_CHROMEOS)