Update from https://crrev.com/315085

ui/gl/gl_fence_egl.h

Index: ui/gl/gl_fence_egl.h
diff --git a/ui/gl/gl_fence_egl.h b/ui/gl/gl_fence_egl.h
index 75a0444b01fc9b303bc65f5923a6591723cc84ae..5b6006c19721c556f6498329a9404c2671cc9661 100644
--- a/ui/gl/gl_fence_egl.h
+++ b/ui/gl/gl_fence_egl.h
@@ -7,14 +7,15 @@
 
 #include "base/macros.h"
 #include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
 
 namespace gfx {
 
 class GL_EXPORT GLFenceEGL : public GLFence {
  public:
-  GLFenceEGL(bool flush);
+  static void SetIgnoreFailures();
+
+  GLFenceEGL();
   ~GLFenceEGL() override;
 
   // GLFence implementation:
@@ -25,7 +26,6 @@ class GL_EXPORT GLFenceEGL : public GLFence {
  private:
   EGLSyncKHR sync_;
   EGLDisplay display_;
-  scoped_refptr<GLContext::FlushEvent> flush_event_;
 
   DISALLOW_COPY_AND_ASSIGN(GLFenceEGL);
 };