Android: Use virtualized context only for those with compatible config

ui/gl/gl_surface.cc

Index: ui/gl/gl_surface.cc
diff --git a/ui/gl/gl_surface.cc b/ui/gl/gl_surface.cc
index 2fccf8783179654eceec09112831715299684f3e..7c779d95d8d3f1778c2c72c8875f9a10fef39596 100644
--- a/ui/gl/gl_surface.cc
+++ b/ui/gl/gl_surface.cc
@@ -96,10 +96,11 @@ bool GLSurface::InitializeOneOffImplementation(GLImplementation impl,
 GLSurface::GLSurface() {}
 
 bool GLSurface::Initialize() {
-  return Initialize(SURFACE_DEFAULT);
+  return Initialize(GetDefaultFormat());
 }
 
 bool GLSurface::Initialize(GLSurface::Format format) {
+  format_ = format;
   return true;
 }
 
@@ -190,9 +191,12 @@ void* GLSurface::GetConfig() {
   return NULL;
 }
 
-unsigned GLSurface::GetFormat() {
-  NOTIMPLEMENTED();
-  return 0;
+GLSurface::Format GLSurface::GetDefaultFormat() const {
+  return SURFACE_DEFAULT;
+}
+
+GLSurface::Format GLSurface::GetFormat() {
+  return format_;
 }
 
 VSyncProvider* GLSurface::GetVSyncProvider() {
@@ -373,7 +377,7 @@ void* GLSurfaceAdapter::GetConfig() {
   return surface_->GetConfig();
 }
 
-unsigned GLSurfaceAdapter::GetFormat() {
+GLSurface::Format GLSurfaceAdapter::GetFormat() {
   return surface_->GetFormat();
 }