Address some TODO(GYP)s in the GN build.

cc/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")
 
 component("cc") {
   sources = [
     "animation/animation.cc",
@@ skipping 733 matching lines @@
     "//cc/surfaces:surface_id",
     "//gpu/command_buffer/client:gl_in_process_context",
     "//gpu/command_buffer/client:gles2_c_lib",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/common:gles2_utils",
     "//gpu/skia_bindings",
     "//media",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
+    "//third_party/mesa:osmesa",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",
   ]
-
-  if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
-    deps += [ "//third_party/mesa:osmesa" ]
-  }
 }
 
 test("cc_unittests") {
   sources = [
     "animation/animation_host_unittest.cc",
     "animation/animation_player_unittest.cc",
     "animation/animation_timeline_unittest.cc",
     "animation/animation_unittest.cc",
     "animation/element_animations_unittest.cc",
     "animation/keyframed_animation_curve_unittest.cc",
@@ skipping 225 matching lines @@
     "//testing/gtest",
     "//testing/perf",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",
   ]
 }
 # When adding support for isolates, please have a look at run-time dependencies
 # in the cc_unittests_run target in cc_tests.gyp.