Use a mocked compositor for unit tests

ui/aura/test/aura_test_base.cc

Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 1e4eb41e5f2148fcb03690933c7148c506a16ebe..58a58655721399a7a6380b3b58711cd61012a968 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -10,13 +10,14 @@
 
 #include "ui/aura/desktop.h"
 #include "ui/aura/test/test_desktop_delegate.h"
+#include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/test_compositor.h"
 
 namespace aura {
 namespace test {
 
-static ui::Compositor* TestCreateCompositor() {
-  return new ui::TestCompositor();
+static ui::Compositor* TestCreateCompositor(ui::CompositorDelegate* owner) {
+  return new ui::TestCompositor(owner);
 }
 
 AuraTestBase::AuraTestBase()
@@ -40,7 +41,7 @@ AuraTestBase::~AuraTestBase() {
 void AuraTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
-  aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor);
+  ui::Compositor::set_compositor_factory_for_testing(&TestCreateCompositor);
   // TestDesktopDelegate is owned by the desktop.
   new TestDesktopDelegate();
   Desktop::GetInstance()->Show();
@@ -53,7 +54,7 @@ void AuraTestBase::TearDown() {
   RunPendingMessages();
   teardown_called_ = true;
   testing::Test::TearDown();
-  aura::Desktop::set_compositor_factory_for_testing(NULL);
+  ui::Compositor::set_compositor_factory_for_testing(NULL);
 }
 
 }  // namespace test