Move gn _run target generation into test(). (RELAND)

components/nacl/loader/BUILD.gn

Index: components/nacl/loader/BUILD.gn
diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn
index 038fc37f9ff0976271500e3971f099b6771aa6f0..6a8c161c9caf3d8415fad0179c6ef62768f207d4 100644
--- a/components/nacl/loader/BUILD.gn
+++ b/components/nacl/loader/BUILD.gn
@@ -71,15 +71,6 @@ source_set("loader") {
   ]
 }
 
-# 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 = [
     "nacl_ipc_adapter_unittest.cc",
@@ -156,29 +147,14 @@ if (is_linux) {
       "//base",
       "//base/test:test_launcher_nacl_nonsfi",
     ]
-  }
-
-  group("helper_nonsfi") {
     data_deps = [
-      ":nacl_helper_nonsfi_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
-    ]
-  }
-
-  group("helper_nonsfi_unittests") {
-    testonly = true
-    data_deps = [
-      ":nacl_helper_nonsfi_unittests",
       ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
     ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("nacl_helper_nonsfi_unittests_run") {
-    testonly = true
+  group("helper_nonsfi") {
     data_deps = [
-      ":helper_nonsfi_unittests",
-      ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
+      ":nacl_helper_nonsfi_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
     ]
   }
 }