Revert of WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/steps.py

 # 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.
 
 
 def generate_tests(api, test_suite, revision, enable_swarming=False):
   tests = []
   if test_suite == 'webrtc':
     for test in api.NORMAL_TESTS:
-      tests.append(WebRTCTest(test, revision, enable_swarming=enable_swarming))
+      tests.append(WebRTCTest(test, revision,
+                              enable_swarming=enable_swarming))
     tests.append(WebRTCTest('webrtc_nonparallel_tests', revision,
-                            parallel=False, enable_swarming=False))
+                            parallel=False,
+                            enable_swarming=False))
   elif test_suite == 'webrtc_baremetal':
     if api.m.platform.is_linux:
       f = api.m.path['checkout'].join
       tests.extend([
           BaremetalTest('audioproc',
                         revision,
                         args=['-aecm', '-ns', '-agc', '--fixed_digital',
                               '--perf', '-pb',
                               f('resources', 'audioproc.aecdump')],
                         perf_test=True),
@@ skipping 10 matching lines @@
     # http://crbug.com/589101
     if api.m.platform.is_mac or api.m.platform.is_win:
       tests.append(BaremetalTest('audio_device_tests', revision))
 
     tests.extend([
         BaremetalTest('voe_auto_test', revision, args=['--automated']),
         BaremetalTest('video_capture_tests', revision),
     ])
     if not api.m.tryserver.is_tryserver:
       tests.append(BaremetalTest('webrtc_perf_tests', revision, perf_test=True))
-  if test_suite in ('android_device', 'android_swarming'):
-    for test in api.ANDROID_DEVICE_TESTS:
+
+  elif test_suite == 'android':
+    for test in api.ANDROID_APK_TESTS:
       tests.append(AndroidTest(test, enable_swarming))
     if (not api.m.tryserver.is_tryserver and api.c.PERF_ID and
         api.m.chromium.c.BUILD_CONFIG == 'Release'):
       tests.append(AndroidPerfTest('webrtc_perf_tests', revision,
                                    perf_id=api.c.PERF_ID))
     for test_name in api.ANDROID_INSTRUMENTATION_TESTS:
       tests.append(AndroidInstrumentationTest(test_name, enable_swarming))
-  if test_suite in ('android_linux', 'android_swarming'):
-    for test in api.ANDROID_LINUX_TESTS:
-      tests.append(AndroidTest(test, enable_swarming))
 
   return tests
 
 
 # TODO(kjellander): Continue refactoring an integrate the classes in the
 # chromium_tests recipe module instead (if possible).
 class Test(object):
   def __init__(self, name, enable_swarming=False):
     self._name = name
     self._enable_swarming = enable_swarming
@@ skipping 98 matching lines @@
                                                     'run_%s' % self._name)
     args = ['--verbose']
     api.add_test(name=self._name,
                  test=wrapper_script,
                  args=args,
                  revision=self._revision,
                  python_mode=True,
                  perf_test=True,
                  perf_dashboard_id=self._name)