Index: gpu/ipc/service/gpu_memory_buffer_factory_test_template.h |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_test_template.h b/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h |
similarity index 88% |
rename from content/common/gpu/gpu_memory_buffer_factory_test_template.h |
rename to gpu/ipc/service/gpu_memory_buffer_factory_test_template.h |
index 1305d90f0340814fefb92569d27479d65c752f02..991df28782207a04c5a70437ed2b6317240cd2c7 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_test_template.h |
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h |
@@ -5,15 +5,15 @@ |
// This file defines tests that implementations of GpuMemoryBufferFactory should |
// pass in order to be conformant. |
-#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |
-#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |
+#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |
-#include "content/common/gpu/gpu_memory_buffer_factory.h" |
+#include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
#include "gpu/ipc/common/gpu_memory_buffer_support.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gfx/buffer_format_util.h" |
-namespace content { |
+namespace gpu { |
template <typename GpuMemoryBufferFactoryType> |
class GpuMemoryBufferFactoryTest : public testing::Test { |
@@ -35,7 +35,7 @@ TYPED_TEST_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer) { |
gfx::BufferUsage::GPU_READ_CPU_READ_WRITE, |
gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT}; |
for (auto usage : usages) { |
- if (!gpu::IsNativeGpuMemoryBufferConfigurationSupported(format, usage)) |
+ if (!IsNativeGpuMemoryBufferConfigurationSupported(format, usage)) |
continue; |
gfx::GpuMemoryBufferHandle handle = |
@@ -65,7 +65,7 @@ TYPED_TEST_P(GpuMemoryBufferFactoryImportTest, |
gfx::Size buffer_size(2, 2); |
for (auto format : gfx::GetBufferFormatsForTesting()) { |
- if (!gpu::IsNativeGpuMemoryBufferConfigurationSupported( |
+ if (!IsNativeGpuMemoryBufferConfigurationSupported( |
format, gfx::BufferUsage::GPU_READ)) { |
continue; |
} |
@@ -94,6 +94,6 @@ TYPED_TEST_P(GpuMemoryBufferFactoryImportTest, |
REGISTER_TYPED_TEST_CASE_P(GpuMemoryBufferFactoryImportTest, |
CreateGpuMemoryBufferFromHandle); |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |
+#endif // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_ |