Change WGC3DInProcessCBImpl factories to return a base class pointer.

ui/compositor/compositor.cc

 // Copyright (c) 2012 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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 154 matching lines @@
 
  protected:
   explicit ContextProviderFromContextFactory(ContextFactory* factory)
       : factory_(factory),
         destroyed_(false) {}
   virtual ~ContextProviderFromContextFactory() {}
 
   bool InitializeOnMainThread() {
     if (context3d_)
       return true;
-    context3d_.reset(factory_->CreateOffscreenContext());
+    context3d_ = factory_->CreateOffscreenContext();
     return !!context3d_;
   }
 
  private:
   ContextFactory* factory_;
   base::Lock destroyed_lock_;
   bool destroyed_;
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
   scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_;
 };
 
 DefaultContextFactory::DefaultContextFactory() {
 }
 
 DefaultContextFactory::~DefaultContextFactory() {
 }
 
 bool DefaultContextFactory::Initialize() {
   if (!gfx::GLSurface::InitializeOneOff() ||
       gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
     LOG(ERROR) << "Could not load the GL bindings";
     return false;
   }
   return true;
 }
 
 cc::OutputSurface* DefaultContextFactory::CreateOutputSurface(
     Compositor* compositor) {
-  return new cc::OutputSurface(
-      make_scoped_ptr(CreateContextCommon(compositor, false)));
+  return new cc::OutputSurface(CreateContextCommon(compositor, false).Pass());
 }
 
-WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateOffscreenContext() {
+scoped_ptr<WebKit::WebGraphicsContext3D>
+DefaultContextFactory::CreateOffscreenContext() {
   return CreateContextCommon(NULL, true);
 }
 
 scoped_refptr<Reflector> DefaultContextFactory::CreateReflector(
     Compositor* mirroed_compositor,
     Layer* mirroring_layer) {
   return NULL;
 }
 
 void DefaultContextFactory::RemoveReflector(
@@ skipping 19 matching lines @@
       !offscreen_contexts_compositor_thread_->DestroyedOnMainThread()) {
     offscreen_contexts_compositor_thread_ =
         ContextProviderFromContextFactory::Create(this);
   }
   return offscreen_contexts_compositor_thread_;
 }
 
 void DefaultContextFactory::RemoveCompositor(Compositor* compositor) {
 }
 
-WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateContextCommon(
-    Compositor* compositor,
-    bool offscreen) {
+scoped_ptr<WebKit::WebGraphicsContext3D>
+DefaultContextFactory::CreateContextCommon(Compositor* compositor,
+                                           bool offscreen) {
   DCHECK(offscreen || compositor);
   WebKit::WebGraphicsContext3D::Attributes attrs;
   attrs.depth = false;
   attrs.stencil = false;
   attrs.antialias = false;
   attrs.shareResources = true;
   using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-  WebKit::WebGraphicsContext3D* context =
-      offscreen ?
-      WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-          attrs) :
-      WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
-          attrs, compositor->widget());
+  scoped_ptr<WebKit::WebGraphicsContext3D> context(
+      offscreen
+          ? WebGraphicsContext3DInProcessCommandBufferImpl::
+                CreateOffscreenContext(attrs)
+          : WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
+                attrs, compositor->widget()));
   if (!context)
-    return NULL;
+    return context.Pass();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!offscreen) {
     context->makeContextCurrent();
     gfx::GLContext* gl_context = gfx::GLContext::GetCurrent();
     bool vsync = !command_line->HasSwitch(switches::kDisableGpuVsync);
     gl_context->SetSwapInterval(vsync ? 1 : 0);
     gl_context->ReleaseCurrent(NULL);
   }
-  return context;
+  return context.Pass();
 }
 
 TestContextFactory::TestContextFactory() {}
 
 TestContextFactory::~TestContextFactory() {}
 
 cc::OutputSurface* TestContextFactory::CreateOutputSurface(
     Compositor* compositor) {
-  return new cc::OutputSurface(make_scoped_ptr(CreateOffscreenContext()));
+  return new cc::OutputSurface(CreateOffscreenContext());
 }
 
-WebKit::WebGraphicsContext3D* TestContextFactory::CreateOffscreenContext() {
-  ui::TestWebGraphicsContext3D* context = new ui::TestWebGraphicsContext3D;
+scoped_ptr<WebKit::WebGraphicsContext3D>
+TestContextFactory::CreateOffscreenContext() {
+  scoped_ptr<ui::TestWebGraphicsContext3D> context(
+      new ui::TestWebGraphicsContext3D);
   context->Initialize();
-  return context;
+  return context.PassAs<WebKit::WebGraphicsContext3D>();
 }
 
 scoped_refptr<Reflector> TestContextFactory::CreateReflector(
     Compositor* mirrored_compositor,
     Layer* mirroring_layer) {
   return new Reflector();
 }
 
 void TestContextFactory::RemoveReflector(scoped_refptr<Reflector> reflector) {
 }
@@ skipping 545 matching lines @@
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   ResetImplicitFactory();
   g_test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return g_test_compositor_enabled;
 }
 
 }  // namespace ui