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

components/nacl/loader/BUILD.gn

 # Copyright 2015 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/features.gni")
 import("//build/config/nacl/config.gni")
 import("//testing/test.gni")
 
 assert(enable_nacl)
 
@@ skipping 53 matching lines @@
     "//ppapi/shared_impl",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   data_deps = [
     "//ppapi/native_client:irt",
     "//ppapi/native_client/src/untrusted/pnacl_support_extension",
   ]
 }
 
-# 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",
     "nacl_validation_query_unittest.cc",
     "run_all_unittests.cc",
   ]
 
   deps = [
     ":loader",
     "//base/test:test_support",
@@ skipping 56 matching lines @@
   }
 
   test("nacl_helper_nonsfi_unittests") {
     sources = [
       "nonsfi/nacl_helper_nonsfi_unittests.cc",
     ]
     deps = [
       "//base",
       "//base/test:test_launcher_nacl_nonsfi",
     ]
+    data_deps = [
+      ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_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
-    data_deps = [
-      ":helper_nonsfi_unittests",
-      ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
-    ]
-  }
 }
 
 if (is_win && target_cpu == "x86" && current_cpu == "x64") {
   source_set("nacl_helper_win_64") {
     sources = [
       "nacl_helper_win_64.cc",
       "nacl_helper_win_64.h",
     ]
 
     deps = [
@@ skipping 105 matching lines @@
       "${root_out_dir}/nacl_helper_nonsfi_unittests_main",
     ]
     outputs = [
       "${root_build_dir}/{{source_file_part}}",
     ]
     deps = [
       ":nacl_helper_nonsfi_unittests_main",
     ]
   }
 }