ui/gl: Initialize the ANGLE Platform on all configurations

ui/gl/gl_surface_egl.cc

Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index ab258625a0417e09f34b1583cc63a69ec602fd8a..0eef4b27c672338c10268a85248bf5714a6ffecb 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ -21,6 +22,7 @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gl/angle_platform_impl.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_context_egl.h"
@@ -132,6 +134,10 @@ bool g_egl_surfaceless_context_supported = false;
 bool g_egl_surface_orientation_supported = false;
 bool g_use_direct_composition = false;
 
+base::LazyInstance<ANGLEPlatformImpl> g_angle_platform_impl =
+    LAZY_INSTANCE_INITIALIZER;
+ANGLEPlatformShutdownFunc g_angle_platform_shutdown = nullptr;
+
 EGLDisplay GetPlatformANGLEDisplay(EGLNativeDisplayType native_display,
                                    EGLenum platform_type,
                                    bool warpDevice) {
@@ -527,7 +533,11 @@ bool GLSurfaceEGL::InitializeOneOff(EGLNativeDisplayType native_display) {
 }
 
 // static
-void GLSurfaceEGL::ResetForTesting() {
+void GLSurfaceEGL::ShutdownOneOff() {
+  if (g_angle_platform_shutdown) {
+    g_angle_platform_shutdown();
+  }
+
   if (g_display != EGL_NO_DISPLAY)
     eglTerminate(g_display);
   g_display = EGL_NO_DISPLAY;
@@ -591,6 +601,17 @@ EGLDisplay GLSurfaceEGL::InitializeDisplay(
 
   g_native_display = native_display;
 
+  // Init ANGLE platform here, before we call GetPlatformDisplay().
+  ANGLEPlatformInitializeFunc angle_platform_init =
+      reinterpret_cast<ANGLEPlatformInitializeFunc>(
+          eglGetProcAddress("ANGLEPlatformInitialize"));
+  if (angle_platform_init) {
+    angle_platform_init(&g_angle_platform_impl.Get());
+
+    g_angle_platform_shutdown = reinterpret_cast<ANGLEPlatformShutdownFunc>(
+        eglGetProcAddress("ANGLEPlatformShutdown"));
+  }
+
   // If EGL_EXT_client_extensions not supported this call to eglQueryString
   // will return NULL.
   const char* client_extensions =