Revert of 🐎 Remove --shard-timeout from webrtc recipes now that they are in wrapper scripts

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))
@@ skipping 102 matching lines @@
                                         perf_test=perf_test, **runtest_kwargs)
 
 
 def get_android_tool(api):
     if api.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       return 'asan'
     return None
 
 
 class AndroidTest(Test):
+  # WebRTC tests need a longer timeout to avoid getting killed by the Chromium
+  # Android test framework.
+  _SHARD_TIMEOUT = 15 * 60
+
+  def __init__(self, name):
+    super(AndroidTest, self).__init__(name)
+
   def run(self, api, suffix):
     api.m.chromium_android.run_test_suite(self._name,
-                                          tool=get_android_tool(api))
+                                          tool=get_android_tool(api),
+                                          shard_timeout=self._SHARD_TIMEOUT)
 
 
 class AndroidInstrumentationTest(Test):
   """Installs the APK on the device and runs the test."""
 
   def run(self, api, suffix):
     api.m.chromium_android.run_instrumentation_suite(
         name=self._name,
         wrapper_script_suite_name=self._name,
         tool=get_android_tool(api),
         verbose=True)
 
 
 class AndroidPerfTest(Test):
   """A performance test to run on Android devices.
 
     Basically just wrap what happens in chromium_android.run_test_suite to run
     inside runtest.py so we can scrape perf data. This way we can get perf data
     from the gtest binaries since the way of running perf tests with telemetry
     is entirely different.
   """
+  # WebRTC tests need a longer timeout to avoid getting killed by the Chromium
+  # Android test framework.
+  _SHARD_TIMEOUT = 45 * 60
 
   def __init__(self, name, revision, perf_id=None):
     super(AndroidPerfTest, self).__init__(name)
     self._revision = revision
     self._perf_id = perf_id
 
   def run(self, api, suffix):
     if not self._perf_id or api.m.chromium.c.BUILD_CONFIG == 'Debug':
       # Run as a normal test for trybots and Debug, without perf data scraping.
       api.m.chromium_android.run_test_suite(
           self._name,
-          tool=get_android_tool(api))
+          tool=get_android_tool(api),
+          shard_timeout=self._SHARD_TIMEOUT)
     else:
-      wrapper_script = api.m.chromium.output_dir.join('bin',
-                                                      'run_%s' % self._name)
-      args = ['--verbose']
+      args = ['gtest', '-s', self._name, '--verbose', '--release',
+              '-t', str(self._SHARD_TIMEOUT)]
+      tool = get_android_tool(api)
       api.add_test(name=self._name,
-                   test=wrapper_script,
+                   test=api.m.chromium_android.c.test_runner,
                    args=args,
                    revision=self._revision,
                    perf_test=True,
-                   perf_dashboard_id=self._name)
+                   perf_dashboard_id=self._name,
+                   env={'CHROMIUM_OUT_DIR': api.m.chromium.output_dir})