roll up of misc. gn work

ui/compositor/BUILD.gn

Index: ui/compositor/BUILD.gn
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index 7990b9c911a8ab788cc20f0be4ec4850e40ebdec..213d9e6e490a33a8794ad3fb7e9d0c0b4e8e3f04 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -140,36 +140,36 @@ source_set("test_support") {
     sources += [ "test/test_compositor_host_x11.cc" ]
   }
 }
-# TODO(GYP) enable this when all dependencies are complete and it links.
-#test("compositor_unittests") {
-#  sources = [
-#    "layer_animation_element_unittest.cc",
-#    "layer_animation_sequence_unittest.cc",
-#    "layer_animator_unittest.cc",
-#    "layer_owner_unittest.cc",
-#    "layer_unittest.cc",
-#    "run_all_unittests.cc",
-#    "transform_animation_curve_adapter_unittest.cc",
-#  ]
-#
-#  deps = [
-#    ":compositor",
-#    ":test_support",
-#    "//base",
-#    "//base/allocator",
-#    "//base/test:test_support",
-#    "//cc",
-#    "//cc:test_support",
-#    "//skia",
-#    "//testing/gtest",
-#    "//ui/base",
-#    "//ui/gfx",
-#    "//ui/gfx/geometry",
-#    "//ui/gl",
-#    "//ui/resources",
-#  ]
-#
-#  if (is_linux) {
-#    deps += [ "//third_party/mesa:osmesa" ]
-#  }
-#}
+
+test("compositor_unittests") {
+  sources = [
+    "layer_animation_element_unittest.cc",
+    "layer_animation_sequence_unittest.cc",
+    "layer_animator_unittest.cc",
+    "layer_owner_unittest.cc",
+    "layer_unittest.cc",
+    "run_all_unittests.cc",
+    "transform_animation_curve_adapter_unittest.cc",
+  ]
+
+  deps = [
+    ":compositor",
+    ":test_support",
+    "//base",
+    "//base/allocator",
+    "//base/test:test_support",
+    "//cc",
+    "//cc:test_support",
+    "//skia",
+    "//testing/gtest",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/gl",
+    "//ui/resources",
+  ]
+
+  if (is_linux) {
+    deps += [ "//third_party/mesa:osmesa" ]
+  }
+}