Add new GN junit binary template and new GYP java binary template.

chrome/android/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/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 435 matching lines @@
     ":chrome_javatests",
     ":chrome_shell_test_java",
     "//sync/android:sync_javatests",
     "//ui/android:ui_javatests",
   ]
   apk_name = "ChromeShellTest"
   android_manifest = "shell/javatests/AndroidManifest.xml"
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
-java_binary("chrome_junit_tests") {
-  testonly = true
-  java_files = [ "android/junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ]
-  main_class = "org.chromium.testing.local.JunitTestMain"
+junit_binary("chrome_junit_tests") {
+  java_files =
+      [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ]
   deps = [
     ":chrome_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//testing/android/junit:junit_test_support",
   ]
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
 android_apk("chrome_sync_shell_test_apk") {
   testonly = true
   deps = [
     ":chrome_java",
     ":chrome_shell_java",
     ":chrome_shell_test_java",
@@ skipping 44 matching lines @@
   ]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }