Inline filter file for WebRTC non swarmed tests.

Appears you can't have filter files for non swarmed tests.

Bug: 877018
Tbr: kbr@chromium.org
Change-Id: If294ff3679889978fe27e7eced642b00f7102508
Reviewed-on: https://chromium-review.googlesource.com/c/1283289Reviewed-by: Patrik Höglund <phoglund@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599965}

testing/buildbot/chromium.webrtc.json

@@ -38,7 +38,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
+          "--gtest_filter=WebRtcInternalsPerfBrowserTest.*:WebRtcStatsPerfBrowserTest.*:WebRtcVideoDisplayPerfBrowserTests*:WebRtcVideoQualityBrowserTests*:WebRtcWebcamBrowserTests*",
           "--run-manual",
           "--ui-test-action-max-timeout=350000",
           "--test-launcher-jobs=1",
@@ -161,7 +161,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
+          "--gtest_filter=WebRtcInternalsPerfBrowserTest.*:WebRtcStatsPerfBrowserTest.*:WebRtcVideoDisplayPerfBrowserTests*:WebRtcVideoQualityBrowserTests*:WebRtcWebcamBrowserTests*",
           "--run-manual",
           "--ui-test-action-max-timeout=350000",
           "--test-launcher-jobs=1",
@@ -285,7 +285,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
+          "--gtest_filter=WebRtcInternalsPerfBrowserTest.*:WebRtcStatsPerfBrowserTest.*:WebRtcVideoDisplayPerfBrowserTests*:WebRtcVideoQualityBrowserTests*:WebRtcWebcamBrowserTests*",
           "--run-manual",
           "--ui-test-action-max-timeout=350000",
           "--test-launcher-jobs=1",
@@ -401,7 +401,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
+          "--gtest_filter=WebRtcInternalsPerfBrowserTest.*:WebRtcStatsPerfBrowserTest.*:WebRtcVideoDisplayPerfBrowserTests*:WebRtcVideoQualityBrowserTests*:WebRtcWebcamBrowserTests*",
           "--run-manual",
           "--ui-test-action-max-timeout=350000",
           "--test-launcher-jobs=1",
@@ -518,7 +518,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
+          "--gtest_filter=WebRtcInternalsPerfBrowserTest.*:WebRtcStatsPerfBrowserTest.*:WebRtcVideoDisplayPerfBrowserTests*:WebRtcVideoQualityBrowserTests*:WebRtcWebcamBrowserTests*",
           "--run-manual",
           "--ui-test-action-max-timeout=350000",
           "--test-launcher-jobs=1",

testing/buildbot/filters/BUILD.gn

@@ -35,7 +35,6 @@ source_set("browser_tests_filters") {
     "//testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
     "//testing/buildbot/filters/webui_polymer2_browser_tests.filter",
     "//testing/buildbot/filters/webrtc_functional.browser_tests.filter",
-    "//testing/buildbot/filters/webrtc_perf.browser_tests.filter",
   ]
 }
 

testing/buildbot/filters/webrtc_perf.browser_tests.filter

-WebRtcInternalsPerfBrowserTest.*
-WebRtcStatsPerfBrowserTest.*
-WebRtcVideoDisplayPerfBrowserTests*
-WebRtcVideoQualityBrowserTests*
-
-# This one is actually not a perf test, but we group it in with the perf
-# since it's just one test.
-WebRtcWebcamBrowserTests*

testing/buildbot/test_suites.pyl

@@ -2269,6 +2269,7 @@
       },
     },
 
+    # TODO(crbug.com/888429): Port remaining WebRTC tests to swarming.
     'webrtc_chromium_baremetal_gtests': {
       # Run capture unittests as well since our bots have real webcams.
       'capture_unittests': {
@@ -2283,7 +2284,13 @@
       },
       'browser_tests': {
         'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter',
+          # TODO(crbug.com/888429): Move to filter file once these are swarmed.
+          ('--gtest_filter='
+           'WebRtcInternalsPerfBrowserTest.*:'
+           'WebRtcStatsPerfBrowserTest.*:'
+           'WebRtcVideoDisplayPerfBrowserTests*:'
+           'WebRtcVideoQualityBrowserTests*:'
+           'WebRtcWebcamBrowserTests*'),
           '--run-manual',
           '--ui-test-action-max-timeout=350000',
           '--test-launcher-jobs=1',