Fix up compositor mocking.

ui/aura_shell/test_suite.cc

Index: ui/aura_shell/test_suite.cc
diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc
index 07fcddce3a3b366a7a5a1eaf1eed92c27693db4f..c69da8215f4a2eab8b736f28cda21b44d0acd4cf 100644
--- a/ui/aura_shell/test_suite.cc
+++ b/ui/aura_shell/test_suite.cc
@@ -10,6 +10,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/compositor/compositor_test_support.h"
+#include "ui/gfx/compositor/test_compositor.h"
 #include "ui/gfx/gfx_paths.h"
 
 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
@@ -25,7 +26,7 @@ void AuraShellTestSuite::Initialize() {
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstance("en-US");
   ui::CompositorTestSupport::Initialize();
-  ui::CompositorTestSupport::SetupMockCompositor();
+  ui::TestCompositor::SetupTestCompositor();
 }
 
 void AuraShellTestSuite::Shutdown() {