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

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 2028 matching lines @@
             '../base/base.gyp:base_java_test_support',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
           'variables': {
             'main_class': 'org.chromium.testing.local.JunitTestMain',
             'src_paths': [
               'public/android/junit/',
             ],
           },
           'includes': [
-            '../build/host_jar.gypi',
+            '../build/java_binary.gypi',
           ],
         },
       ],
     }],
     ['OS!="android" and OS!="ios" and OS!="linux"', {
       # npapi test plugin doesn't build on android or ios
       'targets': [
         {
           'target_name': 'npapi_test_plugin',
           'type': 'loadable_module',
@@ skipping 130 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }