| Index: content/common/gpu/gpu_memory_buffer_factory_test_template.h
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_test_template.h b/content/common/gpu/gpu_memory_buffer_factory_test_template.h
|
| index 1305d90f0340814fefb92569d27479d65c752f02..dac3b059548a37889ecb3d3d40cd47fe04fbcab0 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_test_template.h
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_test_template.h
|
| @@ -52,48 +52,6 @@ TYPED_TEST_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer) {
|
| // from a GpuMemoryBuffer factory in order to be conformant.
|
| REGISTER_TYPED_TEST_CASE_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer);
|
|
|
| -template <typename GpuMemoryBufferFactoryType>
|
| -class GpuMemoryBufferFactoryImportTest
|
| - : public GpuMemoryBufferFactoryTest<GpuMemoryBufferFactoryType> {};
|
| -
|
| -TYPED_TEST_CASE_P(GpuMemoryBufferFactoryImportTest);
|
| -
|
| -TYPED_TEST_P(GpuMemoryBufferFactoryImportTest,
|
| - CreateGpuMemoryBufferFromHandle) {
|
| - const int kClientId = 1;
|
| -
|
| - gfx::Size buffer_size(2, 2);
|
| -
|
| - for (auto format : gfx::GetBufferFormatsForTesting()) {
|
| - if (!gpu::IsNativeGpuMemoryBufferConfigurationSupported(
|
| - format, gfx::BufferUsage::GPU_READ)) {
|
| - continue;
|
| - }
|
| -
|
| - const gfx::GpuMemoryBufferId kBufferId1(1);
|
| - gfx::GpuMemoryBufferHandle handle1 =
|
| - TestFixture::factory_.CreateGpuMemoryBuffer(
|
| - kBufferId1, buffer_size, format, gfx::BufferUsage::GPU_READ,
|
| - kClientId, gfx::kNullPluginWindow);
|
| - EXPECT_NE(handle1.type, gfx::EMPTY_BUFFER);
|
| -
|
| - // Create new buffer from |handle1|.
|
| - const gfx::GpuMemoryBufferId kBufferId2(2);
|
| - gfx::GpuMemoryBufferHandle handle2 =
|
| - TestFixture::factory_.CreateGpuMemoryBufferFromHandle(
|
| - handle1, kBufferId2, buffer_size, format, kClientId);
|
| - EXPECT_NE(handle2.type, gfx::EMPTY_BUFFER);
|
| -
|
| - TestFixture::factory_.DestroyGpuMemoryBuffer(kBufferId1, kClientId);
|
| - TestFixture::factory_.DestroyGpuMemoryBuffer(kBufferId2, kClientId);
|
| - }
|
| -}
|
| -
|
| -// The GpuMemoryBufferFactoryImportTest test case verifies that the
|
| -// GpuMemoryBufferFactory implementation handles import of buffers correctly.
|
| -REGISTER_TYPED_TEST_CASE_P(GpuMemoryBufferFactoryImportTest,
|
| - CreateGpuMemoryBufferFromHandle);
|
| -
|
| } // namespace content
|
|
|
| #endif // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
|
|
|