Refactor GL surface format handling

ui/gl/gl_surface_osmesa_win.cc

Index: ui/gl/gl_surface_osmesa_win.cc
diff --git a/ui/gl/gl_surface_osmesa_win.cc b/ui/gl/gl_surface_osmesa_win.cc
index b65e46c32375ad8ee6454af2ffccf64c3546fbf5..4e13201eca226f20b509dd6cc8e64f461cbb972a 100644
--- a/ui/gl/gl_surface_osmesa_win.cc
+++ b/ui/gl/gl_surface_osmesa_win.cc
@@ -26,7 +26,8 @@
 namespace gl {
 
 GLSurfaceOSMesaWin::GLSurfaceOSMesaWin(gfx::AcceleratedWidget window)
-    : GLSurfaceOSMesa(SURFACE_OSMESA_RGBA, gfx::Size(1, 1)),
+    : GLSurfaceOSMesa(GLSurfaceFormat(GLSurfaceFormat::PIXEL_LAYOUT_RGBA),
+                      gfx::Size(1, 1)),
       window_(window),
       device_context_(NULL) {
   DCHECK(window);
@@ -36,7 +37,7 @@ GLSurfaceOSMesaWin::~GLSurfaceOSMesaWin() {
   Destroy();
 }
 
-bool GLSurfaceOSMesaWin::Initialize(GLSurface::Format format) {
+bool GLSurfaceOSMesaWin::Initialize(GLSurfaceFormat format) {
   if (!GLSurfaceOSMesa::Initialize(format))
     return false;