Fix compositor integration in ui/compositor

mojo/aura/surface_binding.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_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 163 matching lines @@
 }
 
 scoped_ptr<cc::OutputSurface>
 SurfaceBinding::PerViewManagerState::CreateOutputSurface(View* view) {
   // TODO(sky): figure out lifetime here. Do I need to worry about the return
   // value outliving this?
   CommandBufferPtr cb;
   gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
   scoped_refptr<cc::ContextProvider> context_provider(
       new ContextProviderMojo(cb.PassMessagePipe()));
-  return scoped_ptr<cc::OutputSurface>(new OutputSurfaceImpl(
+  return make_scoped_ptr(new OutputSurfaceImpl(
       view, context_provider, surface_.get(), surface_id_allocator_.get()));
 }
 
 SurfaceBinding::PerViewManagerState::PerViewManagerState(
     Shell* shell,
     ViewManager* view_manager)
     : shell_(shell), view_manager_(view_manager) {
 }
 
 SurfaceBinding::PerViewManagerState::~PerViewManagerState() {
@@ skipping 48 matching lines @@
 }
 
 SurfaceBinding::~SurfaceBinding() {
 }
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(view_);
 }
 
 }  // namespace mojo