ui::TestCompositor::TestCompositor() constructor has been changed to take a a CompositorDelegate* as a parameter. It can be NULL to get the same behaviour as before. But some tests actually require ScheduleDraw() to cause a draw to happen, in order to test that their real delegate is doing its job. Also, we move the compositor_factory from views::Widget and aura::Desktop to ui::Compositor.

BUG=101091
TEST=bots stay green

Review URL: http://codereview.chromium.org/8240006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107103 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 3 deletions

diff --git a/ui/gfx/compositor/test_compositor.cc b/ui/gfx/compositor/test_compositor.cc
index f34021e..4bc6faa 100644
--- a/ui/gfx/compositor/test_compositor.cc
+++ b/ui/gfx/compositor/test_compositor.cc
@@ -19,9 +19,11 @@ class TestCompositorDelegate : public ui::CompositorDelegate {
   DISALLOW_COPY_AND_ASSIGN(TestCompositorDelegate);
 };
 
-TestCompositor::TestCompositor()
-    : Compositor(new TestCompositorDelegate, gfx::Size(100, 100)) {
-  owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
+TestCompositor::TestCompositor(CompositorDelegate *owner)
+    : Compositor((owner ? owner : new TestCompositorDelegate),
+                 gfx::Size(100, 100)) {
+  if (!owner)
+    owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
 }
 
 TestCompositor::~TestCompositor() {
@@ -46,6 +48,10 @@ void TestCompositor::DrawTree() {
 #endif
 }
 
+ui::Compositor* TestCompositor::Create(ui::CompositorDelegate* owner) {
+  return new ui::TestCompositor(owner);
+}
+
 void TestCompositor::OnWidgetSizeChanged() {
 }