Change WGC3DInProcessCBImpl factories to return a base class pointer.

content/browser/renderer_host/image_transport_factory_android.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 "content/browser/renderer_host/image_transport_factory_android.h"
 
 #include "base/memory/singleton.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
@@ skipping 29 matching lines @@
   virtual void AcquireTexture(
       uint32 texture_id, const signed char* mailbox_name) OVERRIDE {}
   virtual void ReleaseTexture(
       uint32 texture_id, const signed char* mailbox_name) OVERRIDE {}
   virtual WebKit::WebGraphicsContext3D* GetContext3D() OVERRIDE {
     return context_.get();
   }
   virtual GLHelper* GetGLHelper() OVERRIDE { return NULL; }
 
  private:
-  scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context_;
+  scoped_ptr<WebKit::WebGraphicsContext3D> context_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectGLImageTransportFactory);
 };
 
 DirectGLImageTransportFactory::DirectGLImageTransportFactory() {
   WebKit::WebGraphicsContext3D::Attributes attrs;
   attrs.shareResources = true;
   attrs.noAutomaticFlushes = true;
-  context_.reset(webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl::
-                     CreateViewContext(attrs, NULL));
+  context_ = webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl::
+      CreateViewContext(attrs, NULL);
   if (context_->makeContextCurrent())
     context_->pushGroupMarkerEXT(
         base::StringPrintf("DirectGLImageTransportFactory-%p", this).c_str());
 }
 
 DirectGLImageTransportFactory::~DirectGLImageTransportFactory() {
 }
 
 class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid {
  public:
@@ skipping 129 matching lines @@
   return g_factory;
 }
 
 ImageTransportFactoryAndroid::ImageTransportFactoryAndroid() {
 }
 
 ImageTransportFactoryAndroid::~ImageTransportFactoryAndroid() {
 }
 
 } // namespace content