Change WGC3DInProcessCBImpl factories to return a base class pointer.

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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 "cc/test/layer_tree_pixel_test.h"
 
 #include "base/path_service.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/texture_mailbox.h"
@@ skipping 32 matching lines @@
               software_output_device.PassAs<SoftwareOutputDevice>()));
       break;
     }
 
     case GL_WITH_DEFAULT:
     case GL_WITH_BITMAP: {
       CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
 
       using WebKit::WebGraphicsContext3D;
       using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-      scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
+      output_surface = make_scoped_ptr(new PixelTestOutputSurface(
           WebGraphicsContext3DInProcessCommandBufferImpl::
-              CreateOffscreenContext(WebGraphicsContext3D::Attributes()));
-      output_surface = make_scoped_ptr(
-          new PixelTestOutputSurface(context3d.PassAs<WebGraphicsContext3D>()));
+              CreateOffscreenContext(WebGraphicsContext3D::Attributes())));
       break;
     }
   }
 
   output_surface->set_viewport_offset(viewport_offset);
   output_surface->set_surface_expansion_size(surface_expansion_size);
   return output_surface.PassAs<OutputSurface>();
 }
 
 scoped_refptr<cc::ContextProvider>
@@ skipping 114 matching lines @@
 }
 
 scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
     gfx::Size size,
     const TextureMailbox& texture_mailbox) {
   DCHECK(texture_mailbox.IsTexture());
   if (!texture_mailbox.IsTexture())
     return scoped_ptr<SkBitmap>();
 
   using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-  scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
+  scoped_ptr<WebKit::WebGraphicsContext3D> context3d(
       WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
           WebKit::WebGraphicsContext3D::Attributes()));
 
   EXPECT_TRUE(context3d->makeContextCurrent());
 
   if (texture_mailbox.sync_point())
     context3d->waitSyncPoint(texture_mailbox.sync_point());
 
   unsigned texture_id = context3d->createTexture();
   context3d->bindTexture(GL_TEXTURE_2D, texture_id);
@@ skipping 49 matching lines @@
       out_pixels[dest_y + x + SK_G32_SHIFT/8] = pixels.get()[src_y + x + 1];
       out_pixels[dest_y + x + SK_B32_SHIFT/8] = pixels.get()[src_y + x + 2];
       out_pixels[dest_y + x + SK_A32_SHIFT/8] = pixels.get()[src_y + x + 3];
     }
   }
 
   return bitmap.Pass();
 }
 
 }  // namespace cc