Use a mocked compositor for unit tests

views/test/views_test_base.cc

Index: views/test/views_test_base.cc
diff --git a/views/test/views_test_base.cc b/views/test/views_test_base.cc
index 264a58a6a9f69f1a56bfa1e0e16016100f1e6e82..0a3568a3cd11c86b7c724b688303a1c5eb40c2b3 100644
--- a/views/test/views_test_base.cc
+++ b/views/test/views_test_base.cc
@@ -8,9 +8,6 @@
 #include <ole2.h>
 #endif
 
-#include "ui/gfx/compositor/test_compositor.h"
-#include "views/widget/widget.h"
-
 #if defined(USE_AURA)
 #include "ui/aura/desktop.h"
 #include "ui/aura/test/test_desktop_delegate.h"
@@ -18,10 +15,6 @@
 
 namespace views {
 
-static ui::Compositor* TestCreateCompositor() {
-  return new ui::TestCompositor();
-}
-
 ViewsTestBase::ViewsTestBase()
     : setup_called_(false),
       teardown_called_(false) {
@@ -29,10 +22,7 @@ ViewsTestBase::ViewsTestBase()
   OleInitialize(NULL);
 #endif
 #if defined(USE_AURA)
-  aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor);
   new aura::test::TestDesktopDelegate;
-#else
-  Widget::set_compositor_factory_for_testing(&TestCreateCompositor);
 #endif
 }
 
@@ -60,11 +50,6 @@ void ViewsTestBase::TearDown() {
   teardown_called_ = true;
   views_delegate_.reset();
   testing::Test::TearDown();
-#if defined(USE_AURA)
-  aura::Desktop::set_compositor_factory_for_testing(NULL);
-#else
-  Widget::set_compositor_factory_for_testing(NULL);
-#endif
 }
 
 void ViewsTestBase::RunPendingMessages() {