Run network service gtests on Win10 waterfall and CQ bots.

These tests have been running on our FYI bot and are stable. Add them to the waterfalls in preparation for canary tests.

Bug: 839419
Change-Id: I4d14803f068f76aec693247994dfaf41b41a636c
Reviewed-on: https://chromium-review.googlesource.com/1076768
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563124}

testing/buildbot/chromium.win.json

@@ -702,6 +702,18 @@
         },
         "test": "browser_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
+        ],
+        "name": "network_service_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 10
+        },
+        "test": "browser_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -756,6 +768,16 @@
         },
         "test": "components_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_browsertests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -774,6 +796,17 @@
         },
         "test": "content_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
+        ],
+        "name": "network_service_content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_browsertests"
+      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor",
@@ -863,6 +896,16 @@
         },
         "test": "extensions_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_extensions_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -935,6 +978,16 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1245,6 +1298,18 @@
         },
         "test": "boringssl_ssl_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
+        ],
+        "name": "network_service_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 10
+        },
+        "test": "browser_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1293,6 +1358,16 @@
         },
         "test": "chromedriver_unittests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_browsertests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1311,6 +1386,17 @@
         },
         "test": "content_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
+        ],
+        "name": "network_service_content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_browsertests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1382,6 +1468,16 @@
         },
         "test": "events_unittests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_extensions_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1455,6 +1551,16 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suites.pyl

@@ -2052,7 +2052,7 @@
     'win_specific_chromium_gtests',
   ],
 
-  'chromium_win_gtests': [
+  'chromium_win7_gtests': [
     'aura_gtests',
     'chromium_gtests',
     'chromium_gtests_for_devices_with_graphical_output',
@@ -2070,6 +2070,25 @@
     'win_specific_chromium_gtests',
   ],
 
+  'chromium_win10_gtests': [
+    'aura_gtests',
+    'chromium_gtests',
+    'chromium_gtests_for_devices_with_graphical_output',
+    'network_service_gtests',
+    'non_android_chromium_gtests',
+    'non_android_and_cast_and_chromeos_chromium_gtests',
+    'non_android_and_cast_and_chromeos_and_clang_and_mac_fyi_chromium_gtests',
+    'non_android_and_clang_linux_mac_chromium_gtests',
+    'non_android_and_clang_linux_win_chromium_gtests',
+    'non_android_and_clang_mac_win_chromium_gtests',
+    'non_android_and_clang_win_chromium_gtests',
+    'non_linux_chromium_gtests',
+    'non_mac_non_clang_win_chromium_gtests',
+    'viz_gtests',
+    'vr_platform_specific_non_clang_win_chromium_gtests',
+    'win_specific_chromium_gtests',
+  ],
+
   'marshmallow_isolated_scripts': [
     'components_perftests_isolated_scripts',
     'monochrome_apk_checker_isolated_script',

testing/buildbot/waterfalls.pyl

@@ -2034,13 +2034,13 @@
       },
       'Win 7 Tests x64 (1)': {
         'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
+          'gtest_tests': 'chromium_win7_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
       'Win10 Tests x64': {
         'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
+          'gtest_tests': 'chromium_win10_gtests',
           'isolated_scripts': 'win_specific_isolated_scripts',
         },
       },
@@ -2051,20 +2051,20 @@
       },
       'Win7 Tests (1)': {
         'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
+          'gtest_tests': 'chromium_win7_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
           'scripts': 'chromium_scripts',
         },
       },
       'Win7 Tests (dbg)(1)': {
         'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
+          'gtest_tests': 'chromium_win7_gtests',
           'isolated_scripts': 'chromium_dbg_isolated_scripts',
         },
       },
       'Win10 Tests x64 (dbg)': {
         'test_suites': {
-          'gtest_tests': 'chromium_win_gtests',
+          'gtest_tests': 'chromium_win10_gtests',
           'isolated_scripts': 'chromium_dbg_isolated_scripts',
         },
       },