Re-land: ui: Add GLImage unit test framework.

ui/gl/gl_image_io_surface.mm

Index: ui/gl/gl_image_io_surface.mm
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
index 211226a27b373701bda3b7375637823e1c741f66..3f4964e85438c4e4e6d1e2388ce8bf31e1e01e86 100644
--- a/ui/gl/gl_image_io_surface.mm
+++ b/ui/gl/gl_image_io_surface.mm
@@ -138,11 +138,9 @@ GLenum DataType(BufferFormat format) {
 
 }  // namespace
 
-GLImageIOSurface::GLImageIOSurface(gfx::GenericSharedMemoryId io_surface_id,
-                                   const gfx::Size& size,
+GLImageIOSurface::GLImageIOSurface(const gfx::Size& size,
                                    unsigned internalformat)
-    : io_surface_id_(io_surface_id),
-      size_(size),
+    : size_(size),
       internalformat_(internalformat),
       format_(BufferFormat::RGBA_8888) {}
 
@@ -152,6 +150,7 @@ GLImageIOSurface::~GLImageIOSurface() {
 }
 
 bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
+                                  gfx::GenericSharedMemoryId io_surface_id,
                                   BufferFormat format) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!io_surface_);
@@ -168,6 +167,7 @@ bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
 
   format_ = format;
   io_surface_.reset(io_surface, base::scoped_policy::RETAIN);
+  io_surface_id_ = io_surface_id;
   return true;
 }