[Android] Fix generated scripts for junit tests.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 929a3e42d52114297ce7715f90c31913b3fd720c..2ff4f7b760e758ac39ee075d38195fd0434c50ba 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1506,13 +1506,15 @@
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
           'variables': {
-             'main_class': 'org.chromium.testing.local.JunitTestMain',
-             'src_paths': [
-               '../base/android/junit/',
-               '../base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java',
-             ],
-           },
-          'includes': [ '../build/host_jar.gypi' ],
+            'main_class': 'org.chromium.testing.local.JunitTestMain',
+            'src_paths': [
+              '../base/android/junit/',
+              '../base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java',
+            ],
+            'test_type': 'junit',
+          },
+          'includes': [ '../build/host_jar.gypi',
+                        '../build/android/test_runner.gypi' ],

[Lei Zhang, 2016/02/12 21:33:16]

alphabetical order please.

[mikecase (-- gone --), 2016/02/13 02:24:51]

Done. And in all the other places too.

         },
         {
           # GN: //base:base_javatests