Attempt 3 at:

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 bbf34282adfebf60236e71a65d1a0b13a0e8e929..8fb8d2e550e065f14d195d948b3099b028ebdb58 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -12,7 +12,12 @@
 #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 {
@@ -30,7 +35,12 @@ void AuraTestSuite::Initialize() {
   // 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 AuraTestSuite::Shutdown() {