Add yet more GN isolates ...

This should be almost everything left that is currently
running on the Linux GN bot.

- events_unittests
- extensions_browsertests
- extensions_unittests
- gcm_unit_tests
- gfx_unittests
- gpu_unittests
- jingle_unittests
- media_unittests
- mojo_common_unittests
- mojo_public_bindings_unittests
- mojo_public_environment_unittests
- nacl_loader_unittests
- net_unittests
- printing_unittests
- remoting_unittests
- sql_unittests (isolate existed, just swarmed)
- sync_integration_tests
- sync_unit_tests
- unit_tests

There are still more test steps that need isolates that are
not run on the GN bot, most notably browser_tests and interactive_ui_tests
(which is partially done in this CL but doesn't quite work right).

I'll get to those in upcoming CLs.

R=brettw@chromium.org
BUG=504079
CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel

Review URL: https://codereview.chromium.org/1258753002

Cr-Commit-Position: refs/heads/master@{#341392}

17 files changed, 403 insertions, 24 deletions

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 44c2c74..fe2eed8 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -224,6 +224,15 @@ if (!is_android) {
     ]
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("interactive_ui_tests_run") {
+    testonly = true
+    deps = [
+      ":interactive_ui_tests",
+    ]
+  }
+
   test("interactive_ui_tests") {
     sources =
         rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources,
@@ -231,6 +240,40 @@ if (!is_android) {
                     "//chrome")
 
     configs += [ "//build/config:precompiled_headers" ]
+
+    data = [
+      "//net/data/ssl/certificates/",
+      "//net/tools/testserver/",
+      "//ppapi/tests/test_case.html",
+      "//ppapi/tests/test_case.html.mock-http-headers",
+      "//ppapi/tests/test_page.css",
+      "//ppapi/tests/test_page.css.mock-http-headers",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/tlslite/",
+      "//third_party/zlib/google/test/data/",
+      "//tools/metrics/histograms/histograms.xml",
+      "$root_out_dir/pyproto/google/",
+      "$root_out_dir/resources.pak",
+      "$root_out_dir/ui_test.pak",
+    ]
+    if (is_android || is_linux || is_win) {
+      data += [
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/locales/en-US.pak",
+      ]
+    }
+    if (is_linux) {
+      data += [ "$root_out_dir/libppapi_tests.so" ]
+    }
+    if (is_linux || is_win) {
+      data += [
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/locales/en-US.pak",
+        "$root_out_dir/locales/fr.pak",
+      ]
+    }
+
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     ldflags = []
 
@@ -270,7 +313,7 @@ if (!is_android) {
     deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
 
     # Runtime dependencies
-    datadeps = [
+    data_deps = [
       "//ppapi:ppapi_tests",
       "//third_party/mesa:osmesa",
     ]
@@ -398,7 +441,7 @@ if (!is_android) {
     }
 
     if (is_mac) {
-      datadeps += [ "//chrome" ]
+      data_deps += [ "//chrome" ]
 
       # TODO(mark): We really want this for all non-static library targets, but
       # when we tried to pull it up to the common.gypi level, it broke other
@@ -414,7 +457,7 @@ if (!is_android) {
 
     if (use_x11) {
       configs += [ "//build/config/linux:xtst" ]
-      datadeps += [ "//tools/xdisplaycheck" ]
+      data_deps += [ "//tools/xdisplaycheck" ]
     }
 
     if (enable_app_list) {
@@ -977,12 +1020,39 @@ if (!is_android) {
     }
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("sync_integration_tests_run") {
+    testonly = true
+    deps = [
+      ":sync_integration_tests",
+    ]
+  }
+
   test("sync_integration_tests") {
     sources =
         rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources,
                     ".",
                     "//chrome")
 
+    data = [
+      "//chrome/test/data/sync/",
+      "//net/tools/testserver/",
+      "//sync/tools/testserver/",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/tlslite/",
+      "$root_out_dir/pyproto/",
+      "$root_out_dir/resources.pak",
+    ]
+
+    if (is_linux || is_win) {
+      data += [
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/locales/en-US.pak",
+      ]
+    }
+
     # TODO(phajdan.jr): Only temporary, to make transition easier.
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
@@ -1005,6 +1075,8 @@ if (!is_android) {
       "//third_party/WebKit/public:blink",
     ]
 
+    data_deps = [ "//third_party/mesa:osmesa" ]
+
     if (cld_version == 0 || cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any
       # implementation for CLD2. Dynamic is smaller, so go with dynamic.
@@ -1152,6 +1224,15 @@ if (!is_android) {
     }
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("unit_tests_run") {
+    testonly = true
+    deps = [
+      ":unit_tests",
+    ]
+  }
+
   test("unit_tests") {
     sources =
         rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_sources,
@@ -1159,6 +1240,37 @@ if (!is_android) {
                     "//chrome")
 
     configs += [ "//build/config:precompiled_headers" ]
+
+    data = [
+      "data/",
+      "//base/test/data/",
+      "//chrome/third_party/mock4js/",
+      "//components/test/data/",
+      "//extensions/test/data/",
+      "//google_apis/test/data/",
+      "//net/data/",
+      "//net/tools/testserver/",
+      "//third_party/accessibility-audit/axs_testing.js",
+      "//third_party/hunspell_dictionaries/",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/tlslite/",
+      "//third_party/zlib/google/test/data/",
+      "//tools/metrics/histograms/histograms.xml",
+      "$root_out_dir/pyproto/google/",
+      "$root_out_dir/test_data/chrome/browser/resources/google_now/",
+      "$root_out_dir/test_data/chrome/browser/resources/print_preview/",
+      "$root_out_dir/test_data/chrome/renderer/resources/extensions/",
+      "$root_out_dir/test_data/ui/webui/",
+      "$root_out_dir/resources.pak",
+    ]
+    if (is_android || is_linux || is_win) {
+      data += [
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/locales/en-US.pak",
+      ]
+    }
+
     defines = []
 
     deps = [
diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn
index 204676b..1078fdb 100644
--- a/components/nacl/BUILD.gn
+++ b/components/nacl/BUILD.gn
@@ -151,6 +151,15 @@ if (enable_nacl) {
     ]
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("nacl_loader_unittests_run") {
+    testonly = true
+    deps = [
+      ":nacl_loader_unittests",
+    ]
+  }
+
   test("nacl_loader_unittests") {
     sources = [
       "loader/nacl_ipc_adapter_unittest.cc",
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 810381b..666075a 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -137,6 +137,15 @@ repack("shell_and_test_pak") {
   ]
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("extensions_unittests_run") {
+  testonly = true
+  deps = [
+    ":extensions_unittests",
+  ]
+}
+
 test("extensions_unittests") {
   sources =
       rebase_path(extensions_tests_gypi_values.extensions_unittests_sources,
@@ -151,6 +160,12 @@ test("extensions_unittests") {
 
   configs += [ "//build/config:precompiled_headers" ]
 
+  data = [
+    "test/data/",
+    "//chrome/test/data/extensions/",
+    "$root_out_dir/extensions_shell_and_test.pak",
+  ]
+
   deps = [
     ":extensions_resources",
     ":shell_and_test_pak",
@@ -180,6 +195,8 @@ test("extensions_unittests") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
 
+  data_deps = [ "//third_party/mesa:osmesa" ]
+
   if (is_win) {
     deps += [ "//base/allocator" ]
   }
@@ -195,12 +212,31 @@ test("extensions_unittests") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("extensions_browsertests_run") {
+  testonly = true
+  deps = [
+    ":extensions_browsertests",
+  ]
+}
+
 test("extensions_browsertests") {
   sources =
       rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources,
                   ".",
                   "//extensions")
 
+  data = [
+    "test/data/",
+    "//net/data/",
+    "//net/tools/testserver/",
+    "//third_party/pyftpdlib/",
+    "//third_party/pywebsocket/",
+    "//third_party/tlslite/",
+    "$root_out_dir/extensions_shell_and_test.pak",
+  ]
+
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
@@ -223,8 +259,16 @@ test("extensions_browsertests") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
 
+  data_deps = [ "//third_party/mesa:osmesa" ]
+
   if (is_win) {
     deps += [ "//base/allocator" ]
+
+    if (target_cpu == "x86") {
+      data_deps += [
+        # "$root_out_dir/wow_helper.exe"  # TODO(GYP)
+      ]
+    }
   }
 
   if (is_mac) {
diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn
index 1d36bc7..f41c4a3 100644
--- a/google_apis/gcm/BUILD.gn
+++ b/google_apis/gcm/BUILD.gn
@@ -122,6 +122,15 @@ executable("mcs_probe") {
   ]
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gcm_unit_tests_run") {
+  testonly = true
+  deps = [
+    ":gcm_unit_tests",
+  ]
+}
+
 test("gcm_unit_tests") {
   sources = [
     "base/mcs_message_unittest.cc",
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 7748abab..865ae8b 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -130,6 +130,15 @@ test("gl_tests") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gpu_unittests_run") {
+  testonly = true
+  deps = [
+    ":gpu_unittests",
+  ]
+}
+
 test("gpu_unittests") {
   sources = [
     "command_buffer/client/buffer_tracker_unittest.cc",
diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn
index 9d8a56d..3b6e0a2 100644
--- a/jingle/BUILD.gn
+++ b/jingle/BUILD.gn
@@ -110,6 +110,15 @@ if (enable_webrtc || !is_android) {
     ]
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("jingle_unittests_run") {
+    testonly = true
+    deps = [
+      ":jingle_unittests",
+    ]
+  }
+
   # GYP version: jingle/jingle.gyp:jingle_unittests
   test("jingle_unittests") {
     sources = [
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 98250f2..744dab9 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -524,6 +524,15 @@ if (is_ios) {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("media_unittests_run") {
+  testonly = true
+  deps = [
+    ":media_unittests",
+  ]
+}
+
 test("media_unittests") {
   sources = [
     "blink/skcanvas_video_renderer_unittest.cc",
@@ -576,6 +585,10 @@ test("media_unittests") {
     "video/h264_poc_unittest.cc",
   ]
 
+  data = [
+    "test/data/",
+  ]
+
   # TODO(wolenetz): Fix size_t to int trunctaion in win64.
   # See http://crbug.com/171009
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 5181163..8e70627 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -23,6 +23,24 @@ group("mojo") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("mojo_public_bindings_unittests_run") {
+  testonly = true
+  deps = [
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
+  ]
+}
+
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("mojo_public_environment_unittests_run") {
+  testonly = true
+  deps = [
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
+  ]
+}
+
 group("tests") {
   testonly = true
   deps = [
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index 1548798..99f0ba5 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -61,6 +61,15 @@ source_set("url_type_converters") {
   ]
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("mojo_common_unittests_run") {
+  testonly = true
+  deps = [
+    ":mojo_common_unittests",
+  ]
+}
+
 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests
 test("mojo_common_unittests") {
   deps = [
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 7e2be2c..d6d160b 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1313,6 +1313,15 @@ executable("quic_server") {
 
 # TODO(GYP) bug 513775: Make this work on Mac.
 if (!is_mac) {
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("net_unittests_run") {
+    testonly = true
+    deps = [
+      ":net_unittests",
+    ]
+  }
+
   test("net_unittests") {
     sources = gypi_values.net_test_sources
 
@@ -1351,13 +1360,25 @@ if (!is_mac) {
     data = [
       "data/",
     ]
+
     if (is_linux || is_mac || is_win) {
       deps += [
         "//third_party/pyftpdlib/",
         "//third_party/pywebsocket/",
         "//third_party/tlslite/",
       ]
-      data += [ "tools/testserver/" ]
+      data_deps = [
+        "//third_party/pyftpdlib/",
+        "//third_party/pywebsocket/",
+        "//third_party/tlslite/",
+      ]
+      data += [
+        "tools/testserver/",
+        "//third_party/pyftpdlib/",
+        "//third_party/pywebsocket/",
+        "//third_party/tlslite/",
+        "$root_out_dir/pyproto/google/",
+      ]
     }
 
     if (is_desktop_linux) {
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index d035801..04d7902 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -187,6 +187,15 @@ component("printing") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("printing_unittests_run") {
+  testonly = true
+  deps = [
+    ":printing_unittests",
+  ]
+}
+
 test("printing_unittests") {
   sources = [
     "emf_win_unittest.cc",
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 9e5a0a7..4895f28 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -101,6 +101,15 @@ source_set("test_support") {
 
 # TODO(GYP) remoting_unittests on Mac. Needs to be tested.
 if (!is_mac) {
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("remoting_unittests_run") {
+    testonly = true
+    deps = [
+      ":remoting_unittests",
+    ]
+  }
+
   test("remoting_unittests") {
     configs += [
       ":version",
@@ -109,6 +118,12 @@ if (!is_mac) {
       "//build/config/compiler:no_size_t_to_int_warning",
     ]
 
+    data = [
+      "//net/data/ssl/certificates/ok_cert.pem",
+      "//net/data/ssl/certificates/unittest.key.bin",
+      "//net/data/ssl/certificates/unittest.selfsigned.der",
+    ]
+
     deps = [
       ":test_support",
       "//base/allocator",
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 237abd9..30e1fdd 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -569,6 +569,15 @@ static_library("test_support_sync_api") {
   ]
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("sync_unit_tests_run") {
+  testonly = true
+  deps = [
+    ":sync_unit_tests",
+  ]
+}
+
 # GYP version: sync/sync_tests.gypi:sync_unit_tests
 test("sync_unit_tests") {
   sources = [
@@ -655,6 +664,19 @@ test("sync_unit_tests") {
 
   configs += [ "//build/config:precompiled_headers" ]
 
+  data = [
+    "//chrome/test/data/sync/",
+    "//net/tools/testserver/",
+    "//third_party/pyftpdlib/",
+    "//third_party/pywebsocket/",
+    "//third_party/tlslite/",
+    "$root_out_dir/pyproto/google/",
+  ]
+
+  if (is_android) {
+    data += [ "$root_out_dir/locales/en-US.pak" ]
+  }
+
   deps = [
     ":test_support_sync_core",
     ":test_support_sync_internal_api",
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 641ad82..fa14d69 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -340,18 +340,33 @@
         "test": "display_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "events_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "extensions_browsertests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "extensions_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gcm_unit_tests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gfx_unittests"
       },
       {
@@ -370,6 +385,9 @@
         "test": "google_apis_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gpu_unittests"
       },
       {
@@ -388,12 +406,21 @@
         "test": "ipc_tests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "jingle_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "media_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "mojo_common_unittests"
       },
       {
@@ -424,18 +451,30 @@
         "test": "mojo_system_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "nacl_loader_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "net_unittests"
       },
       {
         "test": "ppapi_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "printing_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "remoting_unittests"
       },
       {
@@ -454,12 +493,21 @@
         "test": "skia_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "sql_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "sync_integration_tests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "sync_unit_tests"
       },
       {
@@ -475,6 +523,9 @@
         "test": "ui_touch_selection_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "unit_tests"
       },
       {
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index c1a39cf..f5baafd 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -153,23 +153,24 @@
   },
   "events_unittests": {
     "label": "//ui/events:events_unittests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "extensions_browsertests": {
     "label": "//extensions:extensions_browsertests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "extensions_unittests": {
     "label": "//extensions:extensions_unittests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "gcm_unit_tests": {
     "label": "//google_apis/gcm:gcm_unit_tests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "gfx_unittests": {
     "label": "//ui/gfx:gfx_unittests",
-    "type": "unknown",
+    "type": "raw",
+    "args": [],
   },
   "gl_unittests": {
     "label": "//ui/gl:gl_unittests",
@@ -187,7 +188,7 @@
   },
   "gpu_unittests": {
     "label": "//gpu:gpu_unittests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "html_viewer_unittests": {
     "label": "//components/html_viewer:html_viewer_unittests",
@@ -199,7 +200,7 @@
   },
   "interactive_ui_tests": {
     "label": "//chrome/test:interactive_ui_tests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "ipc_mojo_unittests": {
     "label": "//ipc/mojo:ipc_mojo_unittests",
@@ -211,7 +212,7 @@
   },
   "jingle_unittests": {
     "label": "//jingle:jingle_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "keyboard_unittests": {
     "label": "//ui/keyboard:keyboard_unittests",
@@ -219,7 +220,7 @@
   },
   "media_unittests": {
     "label": "//media:media_unittests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "midi_unittests": {
     "label": "//media:midi_unittests",
@@ -227,7 +228,7 @@
   },
   "mojo_common_unittests": {
     "label": "//mojo/common:mojo_common_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "mojo_public_application_unittests": {
     "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_applicaiton_unittests",
@@ -235,11 +236,11 @@
   },
   "mojo_public_bindings_unittests": {
     "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "mojo_public_environment_unittests": {
     "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "mojo_public_system_unittests": {
     "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
@@ -275,11 +276,12 @@
   },
   "nacl_loader_unittests": {
     "label": "//components/nacl:nacl_loader_unittests",
-    "type": "unknown",
+    "type": "raw",
+    "args": [],
   },
   "net_unittests": {
     "label": "//net:net_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "ozone_unittests": {
     "label": "//ui/ozone:ozone_unittests",
@@ -291,11 +293,11 @@
   },
   "printing_unittests": {
     "label": "//printing:printing_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "remoting_unittests": {
     "label": "//remoting:remoting_unittests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "resource_provider_unittests": {
     "label": "//components/resource_provider:resource_provider_unittests",
@@ -335,12 +337,12 @@
     "type": "console_test_launcher",
   },
   "sync_integration_tests": {
-    "label": "//sync:sync_integration_tests",
-    "type": "unknown",
+    "label": "//chrome/test:sync_integration_tests",
+    "type": "windowed_test_launcher",
   },
   "sync_unit_tests": {
     "label": "//sync:sync_unit_tests",
-    "type": "unknown",
+    "type": "console_test_launcher",
   },
   "ui_base_unittests": {
     "label": "//ui/base:ui_base_unittests",
@@ -356,7 +358,7 @@
   },
   "unit_tests": {
     "label": "//chrome/test:unit_tests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "url_unittests": {
     "label": "//url:url_unittests",
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 73a9bc3..58fdaea 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -296,6 +296,15 @@ source_set("test_support") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("events_unittests_run") {
+  testonly = true
+  deps = [
+    ":events_unittests",
+  ]
+}
+
 test("events_unittests") {
   sources = [
     "android/scroller_unittest.cc",
@@ -343,6 +352,8 @@ test("events_unittests") {
     ]
   }
 
+  data_deps = [ "//third_party/mesa:osmesa" ]
+
   include_dirs = [ "//testing/gmock/include" ]
 
   if (use_x11) {
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 40a2aab..f489385 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -463,6 +463,15 @@ source_set("test_support") {
   }
 }
 
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gfx_unittests_run") {
+  testonly = true
+  deps = [
+    ":gfx_unittests",
+  ]
+}
+
 test("gfx_unittests") {
   sources = [
     "font_render_params_linux_unittest.cc",
@@ -478,6 +487,11 @@ test("gfx_unittests") {
     "text_utils_unittest.cc",
   ]
 
+  data = [
+    "test/data/",
+    "$root_out_dir/ui_test.pak",
+  ]
+
   if (!is_ios) {
     sources += [
       "animation/animation_container_unittest.cc",
@@ -550,6 +564,8 @@ test("gfx_unittests") {
     "//ui/resources:ui_test_pak",
   ]
 
+  data_deps = [ "//ui/resources:ui_test_pak" ]
+
   if (!is_mac && !is_ios) {
     sources += [
       "interpolated_transform_unittest.cc",