Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/gpu/config/gpu_info_collector_android.cc

Index: trunk/src/gpu/config/gpu_info_collector_android.cc
===================================================================
--- trunk/src/gpu/config/gpu_info_collector_android.cc	(revision 247809)
+++ trunk/src/gpu/config/gpu_info_collector_android.cc	(working copy)
@@ -65,19 +65,23 @@
   // Chromium native code, but created by Android system itself.
   DCHECK(!gfx::GLContext::GetCurrent());
 
-  context_ = eglGetCurrentContext();
-  display_ = eglGetCurrentDisplay();
-  draw_surface_ = eglGetCurrentSurface(EGL_DRAW);
-  read_surface_ = eglGetCurrentSurface(EGL_READ);
+  if (gfx::GLSurface::InitializeOneOff()) {
+    context_ = eglGetCurrentContext();
+    display_ = eglGetCurrentDisplay();
+    draw_surface_ = eglGetCurrentSurface(EGL_DRAW);
+    read_surface_ = eglGetCurrentSurface(EGL_READ);
+  }
 }
 
 ScopedRestoreNonOwnedEGLContext::~ScopedRestoreNonOwnedEGLContext() {
   if (context_ == EGL_NO_CONTEXT || display_ == EGL_NO_DISPLAY ||
-      draw_surface_ == EGL_NO_SURFACE || read_surface_ == EGL_NO_SURFACE)
+      draw_surface_ == EGL_NO_SURFACE || read_surface_ == EGL_NO_SURFACE) {
     return;
+  }
 
-  if (!eglMakeCurrent(display_, draw_surface_, read_surface_, context_))
+  if (!eglMakeCurrent(display_, draw_surface_, read_surface_, context_)) {
     LOG(WARNING) << "Failed to restore EGL context";
+  }
 }
 
 }