Fix some TODO(GYP) in the GN build.

ui/gl/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 use_egl = is_win || is_android || is_linux
 use_glx = use_x11
 
@@ skipping 151 matching lines @@
       "gl_surface_egl.cc",
       "gl_surface_egl.h",
     ]
   }
   if (is_android || is_linux) {
     sources += [
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
   }
-  if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
-    deps += [ "//third_party/mesa:osmesa" ]

[brettw, 2016/05/23 22:06:26]

This doesn't seem to be present in GYP at all and looks suspicious to me.

-  }
   if (use_x11) {
     sources += [
       "gl_context_x11.cc",
       "gl_implementation_x11.cc",
       "gl_surface_egl_x11.cc",
       "gl_surface_egl_x11.h",
       "gl_surface_x11.cc",
     ]
 
     data_deps = [
@@ skipping 216 matching lines @@
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }