Upstream JavaBridge tests.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9136d5759330d200ae3911e97f40ce5c17567349..4210e979796486db794ce5bcdb44883f19af5d61 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -863,21 +863,6 @@
     ['OS == "android"', {
       'targets': [
         {
-          'target_name': 'content_javatests',
-          'type': 'none',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_java_test_support',
-            'content_common',
-            'content_java',
-          ],
-          'variables': {
-            'package_name': 'content_javatests',
-            'java_in_dir': '../content/public/android/javatests',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
@@ -897,7 +882,7 @@
           'type': 'none',
           'dependencies': [
             'content_java',
-            'content_javatests',
+            'content_java_test_support',
             'content_shell_apk',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
@@ -910,8 +895,9 @@
           'variables': {
             'package_name': 'content_shell_test',
             'apk_name': 'ContentShellTest',
-            'java_in_dir': 'shell/android/javatests',
+            'java_in_dir': '../content/shell/android/javatests',
             'resource_dir': '../res',
+            'additional_input_paths': ['<!@(find ../content/public/android/javatests/src -name "*.java")',],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },