Have a common implementation of cc::OutputSurface

cc/gl_renderer_pixeltest.cc

 // Copyright 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 "cc/gl_renderer.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "cc/compositor_frame_metadata.h"
 #include "cc/draw_quad.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource_provider.h"
 #include "cc/test/paths.h"
-#include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/pixel_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gl/gl_implementation.h"
+#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace cc {
 namespace {
 
 class FakeRendererClient : public RendererClient {
  public:
   FakeRendererClient()
   {
   }
 
@@ skipping 17 matching lines @@
   virtual CompositorFrameMetadata makeCompositorFrameMetadata() const
       OVERRIDE { return CompositorFrameMetadata(); }
 };
 
 class GLRendererPixelTest : public testing::Test {
  protected:
   GLRendererPixelTest() {}
 
   virtual void SetUp() {
     gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
-    output_surface_ = PixelTestOutputSurface::create();
+    scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
+        new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl);
+    context3d->Initialize(WebKit::WebGraphicsContext3D::Attributes(), NULL);
+    output_surface_.reset(new OutputSurface(
+        context3d.PassAs<WebKit::WebGraphicsContext3D>()));
     resource_provider_ = ResourceProvider::create(output_surface_.get());
     renderer_ = GLRenderer::create(&fake_client_,
                                    output_surface_.get(),
                                    resource_provider_.get());
   }
 
   bool PixelsMatchReference(base::FilePath ref_file, gfx::Rect viewport_rect) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                      viewport_rect.width(), viewport_rect.height());
@@ skipping 121 matching lines @@
   renderer_->decideRenderPassAllocationsForFrame(pass_list);
   renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(
       base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect));
 }
 #endif
 
 }  // namespace
 }  // namespace cc