Fix up compositor mocking.

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 4c4faa697ee9a5cee2c5d046fee68b564e87c763..10cef9352b4dd8c2658d9bb4c2f52c2bced37912 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -12,6 +12,7 @@
 #include "ui/gfx/compositor/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gfx/test/gfx_test_utils.h"
 
 namespace aura {
 namespace test {
@@ -29,7 +30,7 @@ void AuraTestSuite::Initialize() {
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstance("en-US");
   ui::CompositorTestSupport::Initialize();
-  ui::CompositorTestSupport::SetupMockCompositor();
+  ui::gfx_test_utils::SetupTestCompositor();
 }
 
 void AuraTestSuite::Shutdown() {