Fix compositor integration in ui/compositor

mojo/aura/surface_context_factory.cc

Index: mojo/aura/surface_context_factory.cc
diff --git a/mojo/aura/surface_context_factory.cc b/mojo/aura/surface_context_factory.cc
index 1d8cf9cf56ac54031b100b9bc8de646a97767fc7..3e1422f9a95c9cececdd2e1bd34fb6a7552148e8 100644
--- a/mojo/aura/surface_context_factory.cc
+++ b/mojo/aura/surface_context_factory.cc
@@ -20,10 +20,10 @@ SurfaceContextFactory::SurfaceContextFactory(Shell* shell, View* view)
 SurfaceContextFactory::~SurfaceContextFactory() {
 }
 
-scoped_ptr<cc::OutputSurface> SurfaceContextFactory::CreateOutputSurface(
-    ui::Compositor* compositor,
+void SurfaceContextFactory::CreateOutputSurface(
+    base::WeakPtr<ui::Compositor> compositor,
     bool software_fallback) {
-  return surface_binding_.CreateOutputSurface();
+  compositor->SetOutputSurface(surface_binding_.CreateOutputSurface());
 }
 
 scoped_refptr<ui::Reflector> SurfaceContextFactory::CreateReflector(