Fix compositor integration in ui/compositor

mojo/aura/surface_context_factory.cc

 // Copyright 2014 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 "mojo/aura/surface_context_factory.h"
 
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "ui/compositor/reflector.h"
 
 namespace mojo {
 
 SurfaceContextFactory::SurfaceContextFactory(Shell* shell, View* view)
     : surface_binding_(shell, 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(
     ui::Compositor* mirroed_compositor,
     ui::Layer* mirroring_layer) {
   return new ui::Reflector();
 }
 
 void SurfaceContextFactory::RemoveReflector(
     scoped_refptr<ui::Reflector> reflector) {
@@ skipping 23 matching lines @@
 base::MessageLoopProxy* SurfaceContextFactory::GetCompositorMessageLoop() {
   return nullptr;
 }
 
 scoped_ptr<cc::SurfaceIdAllocator>
 SurfaceContextFactory::CreateSurfaceIdAllocator() {
   return nullptr;
 }
 
 }  // namespace mojo