Use a mocked compositor for unit tests

ui/aura/desktop.h

Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index 521876a273e99f7a1d353e75d33d505681d616d6..ec60431271fcac0245e17e04d363308ac73b20ed 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -70,10 +70,12 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate {
 
   Window* window() { return window_.get(); }
 
-  static void set_compositor_factory_for_testing(ui::Compositor*(*factory)()) {
+  static void set_compositor_factory_for_testing(
+      ui::Compositor*(*factory)(ui::CompositorDelegate* owner)) {
     compositor_factory_ = factory;
   }
-  static ui::Compositor* (*compositor_factory())() {
+  static ui::Compositor* (*compositor_factory())(
+      ui::CompositorDelegate *owner) {
     return compositor_factory_;
   }

[danakj, 2011/10/14 15:15:13]

Since this is in ui::Compositor now, it can just use those and we don't need two
copies of this code.  Removing this one.

 
@@ -120,7 +122,7 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate {
   base::WeakPtrFactory<Desktop> schedule_paint_factory_;
 
   // Factory used to create Compositors. Settable by tests.
-  static ui::Compositor*(*compositor_factory_)();
+  static ui::Compositor*(*compositor_factory_)(ui::CompositorDelegate* owner);
 
   Window* active_window_;