WebRTC: Use Chromium's GTestTest for Android

scripts/slave/recipe_modules/webrtc/api.py

Index: scripts/slave/recipe_modules/webrtc/api.py
diff --git a/scripts/slave/recipe_modules/webrtc/api.py b/scripts/slave/recipe_modules/webrtc/api.py
index e8d738820ecb91dbfb14570adc779c574920e8e2..24ee8acaa4feb222dd62eea94a22c41bccd5bb2d 100644
--- a/scripts/slave/recipe_modules/webrtc/api.py
+++ b/scripts/slave/recipe_modules/webrtc/api.py
@@ -233,13 +233,13 @@ class WebRTCApi(recipe_api.RecipeApi):
             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()
@@ -248,11 +248,6 @@ class WebRTCApi(recipe_api.RecipeApi):
             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,