Remove old (pre-webkit) compositor

chrome/test/gpu/gpu_pixel_browsertest.cc

Index: chrome/test/gpu/gpu_pixel_browsertest.cc
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 086a65551b1eb21508a8a70eb5ccf3cb53a10df5..b4b98c3a9a09069d2616834ba7d90550fcd56660 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -25,14 +25,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/test/gfx_test_utils.h"
-
-#if defined(USE_WEBKIT_COMPOSITOR)
 #include "ui/gfx/compositor/compositor_setup.h"
-#elif defined(VIEWS_COMPOSITOR)
-#include "ui/gfx/compositor/compositor.h"
-#endif
+#include "ui/gfx/size.h"
 
 namespace {
 
@@ -105,11 +99,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
           &test_name_, 0, test_status_prefixes[i], "");
     }
 
-#if defined(USE_WEBKIT_COMPOSITOR)
     ui::DisableTestCompositor();
-#elif defined(VIEWS_COMPOSITOR)
-    ui::Compositor::set_compositor_factory_for_testing(NULL);
-#endif
   }
 
   // If the existing ref image was saved from an revision older than the