Update from https://crrev.com/309717

mojo/tools/roll/ui_gl_init.patch

Index: mojo/tools/roll/ui_gl_init.patch
diff --git a/mojo/tools/roll/ui_gl_init.patch b/mojo/tools/roll/ui_gl_init.patch
index 2b16af8c5f0f78a7dda5d4d6d95e0dde5b3b3ccd..f44b61d31ad239ccb7648f98f1d2c3f4d6a358c6 100644
--- a/mojo/tools/roll/ui_gl_init.patch
+++ b/mojo/tools/roll/ui_gl_init.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/gl/gl_surface.cc b/ui/gl/gl_surface.cc
-index 620cee7..4459d48 100644
+index e1369e5..f4cb61c 100644
 --- a/ui/gl/gl_surface.cc
 +++ b/ui/gl/gl_surface.cc
 @@ -28,7 +28,7 @@ base::LazyInstance<base::ThreadLocalPointer<GLSurface> >::Leaky
@@ -12,7 +12,7 @@ index 620cee7..4459d48 100644
  
    TRACE_EVENT0("gpu", "GLSurface::InitializeOneOff");
 @@ -40,7 +40,8 @@ bool GLSurface::InitializeOneOff() {
-   CommandLine* cmd = CommandLine::ForCurrentProcess();
+   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
  
    // The default implementation is always the first one in list.
 -  GLImplementation impl = allowed_impls[0];
@@ -22,11 +22,11 @@ index 620cee7..4459d48 100644
    if (cmd->HasSwitch(switches::kOverrideUseGLWithOSMesaForTests)) {
      impl = kGLImplementationOSMesaGL;
 diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
-index 54bcc37..d458063 100644
+index 8993845..220bda6 100644
 --- a/ui/gl/gl_surface.h
 +++ b/ui/gl/gl_surface.h
-@@ -72,7 +72,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
-   virtual bool PostSubBuffer(int x, int y, int width, int height);
+@@ -96,7 +96,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
+                                   const SwapCompletionCallback& callback);
  
    // Initialize GL bindings.
 -  static bool InitializeOneOff();