WebRTC: Use Chromium's GTestTest for Android

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 215 matching lines @@
       with self.m.step.defer_results():
         if tests:
           run_android_device_steps = (not self.c.enable_swarming and
               self.m.chromium.c.TARGET_PLATFORM == 'android' and
               self.c.TEST_SUITE != 'android_swarming')
 
           if run_android_device_steps:
             self.m.chromium_android.common_tests_setup_steps()
 
           for test in tests:
-            test.pre_run(self, suffix='')
+            test.pre_run(self.m, suffix='')
 
           for test in tests:
             test.run(self, suffix='')
 
           for test in tests:
-            test.post_run(self, suffix='')
+            test.post_run(self.m, suffix='')
 
           if run_android_device_steps:
             self.m.chromium_android.shutdown_device_monitor()
             self.m.chromium_android.logcat_dump(
                 gs_bucket=self.master_config.get('build_gs_bucket'))
             self.m.chromium_android.stack_tool_steps(force_latest_version=True)
             self.m.chromium_android.test_report()
 
-      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,
                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
@@ skipping 105 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'))