Android: Use virtualized context only for those with compatible config

ui/gl/gl_surface_osmesa.h

Index: ui/gl/gl_surface_osmesa.h
diff --git a/ui/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h
index 6c317ea3e92146fd1eee668e7d4581713014b255..d46a55c300ee8709914957339a5151d1144859a9 100644
--- a/ui/gl/gl_surface_osmesa.h
+++ b/ui/gl/gl_surface_osmesa.h
@@ -14,14 +14,12 @@
 
 namespace gfx {
 
-enum OSMesaSurfaceFormat { OSMesaSurfaceFormatBGRA, OSMesaSurfaceFormatRGBA };
-
 // A surface that the Mesa software renderer draws to. This is actually just a
 // buffer in system memory. GetHandle returns a pointer to the buffer. These
 // surfaces can be resized and resizing preserves the contents.
 class GL_EXPORT GLSurfaceOSMesa : public GLSurface {
  public:
-  GLSurfaceOSMesa(OSMesaSurfaceFormat format, const gfx::Size& size);
+  GLSurfaceOSMesa(GLSurface::Format format, const gfx::Size& size);
 
   // Implement GLSurface.
   bool Initialize(GLSurface::Format format) override;
@@ -33,14 +31,14 @@ class GL_EXPORT GLSurfaceOSMesa : public GLSurface {
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   void* GetHandle() override;
-  unsigned GetFormat() override;
+  GLSurface::Format GetFormat() override;
 
  protected:
   ~GLSurfaceOSMesa() override;
 
  private:
-  unsigned format_;
   gfx::Size size_;
+  GLSurface::Format format_;
   scoped_ptr<int32_t[]> buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesa);