Move attributes and context type out to ContextProviderCommandBuffer.

content/browser/gpu/gpu_ipc_browsertests.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 "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu_process_launch_causes.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "ui/gl/gl_switches.h"
 
 namespace {
 
-using content::WebGraphicsContext3DCommandBufferImpl;
-
 const content::CauseForGpuLaunch kInitCause =
     content::
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
 
-std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext(
+scoped_refptr<content::ContextProviderCommandBuffer> CreateContext(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) {
   // This is for an offscreen context, so the default framebuffer doesn't need
   // any alpha, depth, stencil, antialiasing.
   gpu::gles2::ContextCreationAttribHelper attributes;
   attributes.alpha_size = -1;
   attributes.depth_size = 0;
   attributes.stencil_size = 0;
   attributes.samples = 0;
   attributes.sample_buffers = 0;
   attributes.bind_generates_resource = false;
   bool automatic_flushes = false;
-  return base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
-      gpu::kNullSurfaceHandle, GURL(), std::move(gpu_channel_host), attributes,
-      gfx::PreferIntegratedGpu, automatic_flushes));
+  return make_scoped_refptr(new content::ContextProviderCommandBuffer(
+      base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl(
+          gpu::kNullSurfaceHandle, GURL(), std::move(gpu_channel_host),
+          gfx::PreferIntegratedGpu, automatic_flushes)),
+      gpu::SharedMemoryLimits(), attributes, nullptr,
+      content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING));
 }
 
 class ContextTestBase : public content::ContentBrowserTest {
  public:
   void SetUpOnMainThread() override {
     // This may leave the provider_ null in some cases, so tests need to early
     // out.
     if (!content::BrowserGpuChannelHostFactory::CanUseForTesting())
       return;
 
     if (!content::BrowserGpuChannelHostFactory::instance())
       content::BrowserGpuChannelHostFactory::Initialize(true);
 
     content::BrowserGpuChannelHostFactory* factory =
         content::BrowserGpuChannelHostFactory::instance();
     CHECK(factory);
     base::RunLoop run_loop;
     factory->EstablishGpuChannel(kInitCause, run_loop.QuitClosure());
     run_loop.Run();
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(
         factory->GetGpuChannel());
     CHECK(gpu_channel_host);
 
-    provider_ = new content::ContextProviderCommandBuffer(
-        CreateContext(std::move(gpu_channel_host)), gpu::SharedMemoryLimits(),
-        nullptr, content::OFFSCREEN_CONTEXT_FOR_TESTING);
+    provider_ = CreateContext(std::move(gpu_channel_host));
     bool bound = provider_->BindToCurrentThread();
     CHECK(bound);
     gl_ = provider_->ContextGL();
     context_support_ = provider_->ContextSupport();
 
     ContentBrowserTest::SetUpOnMainThread();
   }
 
   void TearDownOnMainThread() override {
     // Must delete the context first.
@@ skipping 136 matching lines @@
   // a ContextProviderCommandBuffer will keep the gpu channel alive after the
   // provider has been destroyed. Without this behavior, user code would have
   // to be careful to destroy objects in the right order to avoid using freed
   // memory as a function pointer in the GrContext's GrGLInterface instance.
   DCHECK(!IsChannelEstablished());
   EstablishAndWait();
 
   // Step 2: verify that holding onto the provider's GrContext will
   // retain the host after provider is destroyed.
   scoped_refptr<ContextProviderCommandBuffer> provider =
-      new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
-                                       gpu::SharedMemoryLimits(), nullptr,
-                                       OFFSCREEN_CONTEXT_FOR_TESTING);
+      CreateContext(GetGpuChannel());
   EXPECT_TRUE(provider->BindToCurrentThread());
 
   sk_sp<GrContext> gr_context = sk_ref_sp(provider->GrContext());
 
   SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
   sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(
       gr_context.get(), SkBudgeted::kNo, info);
   EXPECT_TRUE(surface);
 
   // Destroy the GL context after we made a surface.
@@ skipping 26 matching lines @@
 #else
 #define MAYBE_CrashAndRecover DISABLED_CrashAndRecover
 #endif
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
                        MAYBE_CrashAndRecover) {
   DCHECK(!IsChannelEstablished());
   EstablishAndWait();
   scoped_refptr<gpu::GpuChannelHost> host = GetGpuChannel();
 
   scoped_refptr<ContextProviderCommandBuffer> provider =
-      new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
-                                       gpu::SharedMemoryLimits(), nullptr,
-                                       OFFSCREEN_CONTEXT_FOR_TESTING);
+      CreateContext(GetGpuChannel());
   base::RunLoop run_loop;
   int counter = 0;
   provider->SetLostContextCallback(
       base::Bind(&BrowserGpuChannelHostFactoryTest::OnContextLost,
                  base::Unretained(this), run_loop.QuitClosure(), &counter));
   EXPECT_TRUE(provider->BindToCurrentThread());
   GpuProcessHostUIShim* shim =
       GpuProcessHostUIShim::FromID(GetFactory()->GpuProcessHostId());
   EXPECT_TRUE(shim != NULL);
   shim->SimulateCrash();
   run_loop.Run();
 
   EXPECT_EQ(1, counter);
   EXPECT_FALSE(IsChannelEstablished());
   EstablishAndWait();
   EXPECT_TRUE(IsChannelEstablished());
 }
 
 }  // namespace content