Reland "Remove --shard-timeout from webrtc recipes now that they are in wrapper scripts"

scripts/slave/recipe_modules/webrtc/api.py

 # Copyright 2013 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.
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 from . import builders
 from . import steps
 
 
@@ skipping 161 matching lines @@
         if self.m.chromium.c.TARGET_PLATFORM == 'android':
           self.m.chromium_android.common_tests_final_steps()
 
     with self.m.step.defer_results():
       for test in tests:
         if test.enable_swarming:
           self.m.swarming.collect_task(test.swarming_task)
 
 
   def add_test(self, test, name=None, args=None, revision=None, env=None,
-               perf_test=False, perf_dashboard_id=None, parallel=True):
+               python_mode=False, perf_test=False, perf_dashboard_id=None,
+               parallel=True):
     """Helper function to invoke chromium.runtest().
 
     Notice that the name parameter should be the same as the test executable in
     order to get the stdio links in the perf dashboard to become correct.
     """
     name = name or test
     args = args or []
     env = env or {}
     if perf_test and self.c.PERF_ID:
       perf_dashboard_id = perf_dashboard_id or test
       assert self.revision_number, (
           'A revision number must be specified for perf tests as they upload '
           'data to the perf dashboard.')
       self.m.chromium.runtest(
           test=test, args=args, name=name,
           results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing',
           xvfb=True, perf_dashboard_id=perf_dashboard_id,
-          test_type=perf_dashboard_id, env=env, revision=self.revision_number,
-          perf_id=self.c.PERF_ID, perf_config=self.c.PERF_CONFIG)
+          test_type=perf_dashboard_id, env=env, python_mode=python_mode,
+          revision=self.revision_number, perf_id=self.c.PERF_ID,
+          perf_config=self.c.PERF_CONFIG)
     else:
       annotate = 'gtest'
-      python_mode = False
       test_type = test
       flakiness_dash = (not self.m.tryserver.is_tryserver and
                         not self.m.chromium.c.runtests.memory_tool)
 
       # Dr Memory and Memcheck memory tools uses special scripts that doesn't
       # play well with the gtest-parallel script.
       if parallel and not self.m.chromium.c.runtests.memory_tool:
         test_executable = self.m.chromium.c.build_dir.join(
           self.m.chromium.c.build_config_fs, test)
         args = [test_executable, '--'] + args
@@ skipping 64 matching lines @@
   def clean_test_output(self):
     """Remove all test output in out/, since we have tests leaking files."""
     out_dir = self.m.path['checkout'].join('out')
     self.m.python('clean test output files',
                   script=self.resource('cleanup_files.py'),
                   args=[out_dir],
                   infra_step=True)
 
   def virtual_webcam_check(self):
     self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py'))