Use a mocked compositor for unit tests

views/test/views_test_base.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/test/views_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
+#include "ui/gfx/compositor/compositor.h"
 #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"
 #endif
 
 namespace views {
 
-static ui::Compositor* TestCreateCompositor() {
-  return new ui::TestCompositor();
+static ui::Compositor* TestCreateCompositor(ui::CompositorDelegate *owner) {
+  return new ui::TestCompositor(owner);
 }
 
 ViewsTestBase::ViewsTestBase()
     : setup_called_(false),
       teardown_called_(false) {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
+  ui::Compositor::set_compositor_factory_for_testing(&TestCreateCompositor);
 #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
 }
 
 ViewsTestBase::~ViewsTestBase() {
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overrideen TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 }
 
 void ViewsTestBase::TearDown() {
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunPendingMessages();
   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
+  ui::Compositor::set_compositor_factory_for_testing(NULL);
 }
 
 void ViewsTestBase::RunPendingMessages() {
 #if defined(USE_AURA)
   message_loop_.RunAllPendingWithDispatcher(
       aura::Desktop::GetInstance()->GetDispatcher());
 #else
   message_loop_.RunAllPending();
 #endif
 }
 
 }  // namespace views