| Index: content/browser/gpu/gpu_ipc_browsertests.cc
|
| diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc
|
| index c4d7fdde65fe4bc26ce4ecac5f8521abe7075111..03a7a1f6f0edaf658f932f65483108b2fd20ad5f 100644
|
| --- a/content/browser/gpu/gpu_ipc_browsertests.cc
|
| +++ b/content/browser/gpu/gpu_ipc_browsertests.cc
|
| @@ -39,11 +39,10 @@ std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext(
|
| attributes.samples = 0;
|
| attributes.sample_buffers = 0;
|
| attributes.bind_generates_resource = false;
|
| - bool share_resources = false;
|
| bool automatic_flushes = false;
|
| return base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
|
| gpu::kNullSurfaceHandle, GURL(), gpu_channel_host, attributes,
|
| - gfx::PreferIntegratedGpu, share_resources, automatic_flushes, nullptr));
|
| + gfx::PreferIntegratedGpu, automatic_flushes));
|
| }
|
|
|
| class ContextTestBase : public content::ContentBrowserTest {
|
| @@ -69,7 +68,7 @@ class ContextTestBase : public content::ContentBrowserTest {
|
|
|
| provider_ = new content::ContextProviderCommandBuffer(
|
| CreateContext(gpu_channel_host.get()), gpu::SharedMemoryLimits(),
|
| - content::OFFSCREEN_CONTEXT_FOR_TESTING);
|
| + nullptr, content::OFFSCREEN_CONTEXT_FOR_TESTING);
|
| bool bound = provider_->BindToCurrentThread();
|
| CHECK(bound);
|
| gl_ = provider_->ContextGL();
|
| @@ -227,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
|
| // retain the host after provider is destroyed.
|
| scoped_refptr<ContextProviderCommandBuffer> provider =
|
| new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
|
| - gpu::SharedMemoryLimits(),
|
| + gpu::SharedMemoryLimits(), nullptr,
|
| OFFSCREEN_CONTEXT_FOR_TESTING);
|
| EXPECT_TRUE(provider->BindToCurrentThread());
|
|
|
| @@ -276,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
|
|
|
| scoped_refptr<ContextProviderCommandBuffer> provider =
|
| new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
|
| - gpu::SharedMemoryLimits(),
|
| + gpu::SharedMemoryLimits(), nullptr,
|
| OFFSCREEN_CONTEXT_FOR_TESTING);
|
| base::RunLoop run_loop;
|
| int counter = 0;
|
|
|