Makes tests either use mock compositor or mock WebGraphicsContext3D

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 d1168b9feae52d47109786448d14cddba288e600..c4dde72718456a65749841ff008a43536c179549 100644
--- a/ui/aura_shell/test_suite.cc
+++ b/ui/aura_shell/test_suite.cc
@@ -9,9 +9,9 @@
 #include "build/build_config.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/compositor/compositor_setup.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
-#include "ui/gfx/test/gfx_test_utils.h"
 
 namespace aura_shell {
 namespace test {
@@ -29,7 +29,7 @@ void AuraShellTestSuite::Initialize() {
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstance("en-US");
   ui::CompositorTestSupport::Initialize();
-  ui::gfx_test_utils::SetupTestCompositor();
+  ui::SetupTestCompositor();
 }
 
 void AuraShellTestSuite::Shutdown() {