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

scripts/slave/recipe_modules/webrtc/steps.py

Index: scripts/slave/recipe_modules/webrtc/steps.py
diff --git a/scripts/slave/recipe_modules/webrtc/steps.py b/scripts/slave/recipe_modules/webrtc/steps.py
index 18284dab4a3fd847d9fdc3b369469517ca328d70..d71c134555bebbefcf89f6d891d898e239649476 100644
--- a/scripts/slave/recipe_modules/webrtc/steps.py
+++ b/scripts/slave/recipe_modules/webrtc/steps.py
@@ -120,9 +120,17 @@
 
 
 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):
@@ -144,6 +152,9 @@
     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)
@@ -155,15 +166,17 @@
       # 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})