Index: ui/gl/gl_image_shared_memory_unittest.cc |
diff --git a/ui/gl/gl_image_shared_memory_unittest.cc b/ui/gl/gl_image_shared_memory_unittest.cc |
index 48dfce6a519bac4ff416364be41d48ff2a35c0bb..c7b85db3351866f5878fad215213dc5bd938d8d1 100644 |
--- a/ui/gl/gl_image_shared_memory_unittest.cc |
+++ b/ui/gl/gl_image_shared_memory_unittest.cc |
@@ -14,8 +14,9 @@ namespace { |
template <BufferFormat format> |
class GLImageSharedMemoryTestDelegate { |
public: |
- scoped_refptr<GLImage> CreateSolidColorImage(const Size& size, |
- const uint8_t color[4]) const { |
+ scoped_refptr<gl::GLImage> CreateSolidColorImage( |
+ const Size& size, |
+ const uint8_t color[4]) const { |
DCHECK_EQ(NumberOfPlanesForBufferFormat(format), 1u); |
base::SharedMemory shared_memory; |
bool rv = shared_memory.CreateAndMapAnonymous( |
@@ -25,8 +26,8 @@ class GLImageSharedMemoryTestDelegate { |
size.width(), size.height(), |
static_cast<int>(RowSizeForBufferFormat(size.width(), format, 0)), |
format, color, reinterpret_cast<uint8_t*>(shared_memory.memory())); |
- scoped_refptr<GLImageSharedMemory> image(new GLImageSharedMemory( |
- size, GLImageMemory::GetInternalFormatForTesting(format))); |
+ scoped_refptr<gl::GLImageSharedMemory> image(new gl::GLImageSharedMemory( |
+ size, gl::GLImageMemory::GetInternalFormatForTesting(format))); |
rv = image->Initialize( |
base::SharedMemory::DuplicateHandle(shared_memory.handle()), |
GenericSharedMemoryId(0), format, 0); |
@@ -51,7 +52,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageSharedMemory, |
class GLImageSharedMemoryPoolTestDelegate { |
public: |
- scoped_refptr<GLImage> CreateSolidColorImage(const Size& size, |
+ scoped_refptr<gl::GLImage> CreateSolidColorImage(const Size& size, |
const uint8_t color[4]) const { |
// Create a shared memory segment that is 2 pages larger than image. |
size_t pool_size = |
@@ -70,8 +71,8 @@ class GLImageSharedMemoryPoolTestDelegate { |
RowSizeForBufferFormat(size.width(), BufferFormat::RGBA_8888, 0)), |
BufferFormat::RGBA_8888, color, |
reinterpret_cast<uint8_t*>(shared_memory.memory()) + buffer_offset); |
- scoped_refptr<GLImageSharedMemory> image( |
- new GLImageSharedMemory(size, GL_RGBA)); |
+ scoped_refptr<gl::GLImageSharedMemory> image( |
+ new gl::GLImageSharedMemory(size, GL_RGBA)); |
rv = image->Initialize( |
base::SharedMemory::DuplicateHandle(shared_memory.handle()), |
GenericSharedMemoryId(0), BufferFormat::RGBA_8888, buffer_offset); |