Respect the disabled extension list during binding initialization.

ui/gl/gl_bindings_autogen_egl.cc

Index: ui/gl/gl_bindings_autogen_egl.cc
diff --git a/ui/gl/gl_bindings_autogen_egl.cc b/ui/gl/gl_bindings_autogen_egl.cc
index ea756bc0c863da7f36ed74aa81afc302968de394..981dc8fa7b735164b1ab2894239212beccdebc15 100644
--- a/ui/gl/gl_bindings_autogen_egl.cc
+++ b/ui/gl/gl_bindings_autogen_egl.cc
@@ -30,7 +30,8 @@ void DriverEGL::InitializeStaticBindings() {
       GetGLProcAddress("eglBindTexImage"));
   fn.eglChooseConfigFn = reinterpret_cast<eglChooseConfigProc>(
       GetGLProcAddress("eglChooseConfig"));
-  fn.eglClientWaitSyncKHRFn = 0;
+  fn.eglClientWaitSyncKHRFn = reinterpret_cast<eglClientWaitSyncKHRProc>(
+      GetGLProcAddress("eglClientWaitSyncKHR"));
   fn.eglCopyBuffersFn =
       reinterpret_cast<eglCopyBuffersProc>(GetGLProcAddress("eglCopyBuffers"));
   fn.eglCreateContextFn = reinterpret_cast<eglCreateContextProc>(
@@ -43,7 +44,8 @@ void DriverEGL::InitializeStaticBindings() {
       GetGLProcAddress("eglCreatePbufferSurface"));
   fn.eglCreatePixmapSurfaceFn = reinterpret_cast<eglCreatePixmapSurfaceProc>(
       GetGLProcAddress("eglCreatePixmapSurface"));
-  fn.eglCreateSyncKHRFn = 0;
+  fn.eglCreateSyncKHRFn = reinterpret_cast<eglCreateSyncKHRProc>(
+      GetGLProcAddress("eglCreateSyncKHR"));
   fn.eglCreateWindowSurfaceFn = reinterpret_cast<eglCreateWindowSurfaceProc>(
       GetGLProcAddress("eglCreateWindowSurface"));
   fn.eglDestroyContextFn = reinterpret_cast<eglDestroyContextProc>(
@@ -51,7 +53,8 @@ void DriverEGL::InitializeStaticBindings() {
   fn.eglDestroyImageKHRFn = 0;
   fn.eglDestroySurfaceFn = reinterpret_cast<eglDestroySurfaceProc>(
       GetGLProcAddress("eglDestroySurface"));
-  fn.eglDestroySyncKHRFn = 0;
+  fn.eglDestroySyncKHRFn = reinterpret_cast<eglDestroySyncKHRProc>(
+      GetGLProcAddress("eglDestroySyncKHR"));
   fn.eglGetConfigAttribFn = reinterpret_cast<eglGetConfigAttribProc>(
       GetGLProcAddress("eglGetConfigAttrib"));
   fn.eglGetConfigsFn =
@@ -69,7 +72,8 @@ void DriverEGL::InitializeStaticBindings() {
   fn.eglGetPlatformDisplayEXTFn = 0;
   fn.eglGetProcAddressFn = reinterpret_cast<eglGetProcAddressProc>(
       GetGLProcAddress("eglGetProcAddress"));
-  fn.eglGetSyncAttribKHRFn = 0;
+  fn.eglGetSyncAttribKHRFn = reinterpret_cast<eglGetSyncAttribKHRProc>(
+      GetGLProcAddress("eglGetSyncAttribKHR"));
   fn.eglGetSyncValuesCHROMIUMFn = 0;
   fn.eglInitializeFn =
       reinterpret_cast<eglInitializeProc>(GetGLProcAddress("eglInitialize"));
@@ -104,6 +108,9 @@ void DriverEGL::InitializeStaticBindings() {
   fn.eglWaitNativeFn =
       reinterpret_cast<eglWaitNativeProc>(GetGLProcAddress("eglWaitNative"));
   fn.eglWaitSyncKHRFn = 0;
+}
+
+void DriverEGL::InitializeExtensionBindings() {
   std::string client_extensions(GetClientExtensions());
   client_extensions += " ";
   ALLOW_UNUSED_LOCAL(client_extensions);
@@ -145,13 +152,9 @@ void DriverEGL::InitializeStaticBindings() {
       extensions.find("EGL_KHR_wait_sync ") != std::string::npos;
   ext.b_EGL_NV_post_sub_buffer =
       extensions.find("EGL_NV_post_sub_buffer ") != std::string::npos;
-
-  debug_fn.eglClientWaitSyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglClientWaitSyncKHRFn = reinterpret_cast<eglClientWaitSyncKHRProc>(
-        GetGLProcAddress("eglClientWaitSyncKHR"));
-    DCHECK(fn.eglClientWaitSyncKHRFn);
-  }
+  ext.b_GL_CHROMIUM_egl_khr_fence_sync_hack =
+      extensions.find("GL_CHROMIUM_egl_khr_fence_sync_hack ") !=
+      std::string::npos;
 
   debug_fn.eglCreateImageKHRFn = 0;
   if (ext.b_EGL_KHR_image || ext.b_EGL_KHR_image_base ||
@@ -161,13 +164,6 @@ void DriverEGL::InitializeStaticBindings() {
     DCHECK(fn.eglCreateImageKHRFn);
   }
 
-  debug_fn.eglCreateSyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglCreateSyncKHRFn = reinterpret_cast<eglCreateSyncKHRProc>(
-        GetGLProcAddress("eglCreateSyncKHR"));
-    DCHECK(fn.eglCreateSyncKHRFn);
-  }
-
   debug_fn.eglDestroyImageKHRFn = 0;
   if (ext.b_EGL_KHR_image || ext.b_EGL_KHR_image_base) {
     fn.eglDestroyImageKHRFn = reinterpret_cast<eglDestroyImageKHRProc>(
@@ -175,20 +171,6 @@ void DriverEGL::InitializeStaticBindings() {
     DCHECK(fn.eglDestroyImageKHRFn);
   }
 
-  debug_fn.eglDestroySyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglDestroySyncKHRFn = reinterpret_cast<eglDestroySyncKHRProc>(
-        GetGLProcAddress("eglDestroySyncKHR"));
-    DCHECK(fn.eglDestroySyncKHRFn);
-  }
-
-  debug_fn.eglGetSyncAttribKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglGetSyncAttribKHRFn = reinterpret_cast<eglGetSyncAttribKHRProc>(
-        GetGLProcAddress("eglGetSyncAttribKHR"));
-    DCHECK(fn.eglGetSyncAttribKHRFn);
-  }
-
   debug_fn.eglGetSyncValuesCHROMIUMFn = 0;
   if (ext.b_EGL_CHROMIUM_sync_control) {
     fn.eglGetSyncValuesCHROMIUMFn =