Add network service tests to Mojo Windows FYI bot.

Bug: 598073
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I370ee1b06eb256072f502ee946e02b5032ec22fa
Reviewed-on: https://chromium-review.googlesource.com/1035202Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Jonathan Ross <jonross@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556456}

chrome/browser/extensions/api/streams_private/streams_private_apitest.cc

@@ -336,6 +336,9 @@ IN_PROC_BROWSER_TEST_F(StreamsPrivateApiTest, NavigateCrossSite) {
 // extension with a file browser handler that can handle the attachment's MIME
 // type.
 IN_PROC_BROWSER_TEST_F(StreamsPrivateApiTest, MAYBE_NavigateToAnAttachment) {
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService))
+    return;  // Streams not used with network service.
+
   InitializeDownloadSettings();
 
   ASSERT_TRUE(LoadTestExtension()) << message_;
@@ -381,6 +384,9 @@ IN_PROC_BROWSER_TEST_F(StreamsPrivateApiTest, MAYBE_NavigateToAnAttachment) {
 // StreamsResourceThrottle, even if there is an extension with a file
 // browser handler that can handle the download's MIME type.
 IN_PROC_BROWSER_TEST_F(StreamsPrivateApiTest, MAYBE_DirectDownload) {
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService))
+    return;  // Streams not used with network service.
+
   InitializeDownloadSettings();
 
   ASSERT_TRUE(LoadTestExtension()) << message_;

testing/buildbot/chromium.fyi.json

@@ -5207,11 +5207,6 @@
         "results_handler": "layout tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-14.04"
-            }
-          ],
           "shards": 12
         }
       }
@@ -5222,6 +5217,18 @@
       "mash:all"
     ],
     "gtest_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"
+      },
       {
         "args": [
           "--enable-surface-synchronization"
@@ -5245,6 +5252,27 @@
         },
         "test": "browser_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_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-surface-synchronization"
@@ -5279,12 +5307,54 @@
         },
         "test": "content_unittests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService"
+        ],
+        "name": "network_service_extensions_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
+      {
+        "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
         },
         "test": "services_unittests"
       }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "--additional-driver-flag=--enable-features=NetworkService",
+          "--zero-tests-executed-ok"
+        ],
+        "isolate_name": "webkit_layout_tests_exparchive",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "webkit_layout_tests",
+        "only_retry_failed_tests": true,
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 12
+        }
+      }
     ]
   },
   "Out of Process Profiling Android": {

testing/buildbot/filters/mojo.fyi.network_browser_tests.filter

@@ -148,6 +148,8 @@
 -ExtensionWebRequestApiTest.WebRequestTypes
 -ExtensionWebRequestApiTest.WebRequestTestOSDD
 -ExtensionWebRequestApiTest.WebRequestURLFetcherInterception
+# Note WebRequestUnloadImmediately is disabled on Linux
+-ExtensionWebRequestApiTest.WebRequestUnloadImmediately
 
 # https://crbug.com/721400
 # WebSocket with the network service
@@ -258,6 +260,9 @@
 -CertificateTransparencyBrowserTest.ProfileRequest
 -CertificateTransparencyBrowserTest.SystemRequest
 
+# Fail on Windows only
+-ConditionalCacheCountingHelperBrowserTest.Count
+
 # NOTE: if adding an exclusion for an existing failure (e.g. additional test for
 # feature X that is already not working), please add it beside the existing
 # failures. Otherwise please reach out to network-service-dev@.

testing/buildbot/test_suites.pyl

@@ -1096,7 +1096,7 @@
     },
   },
 
-  'mojo_linux_isolated_scripts': {
+  'mojo_network_isolated_scripts': {
     'webkit_layout_tests': {
       'args': [
         '--additional-driver-flag=--enable-features=NetworkService',
@@ -1112,11 +1112,6 @@
       'only_retry_failed_tests': True,
       'results_handler': 'layout tests',
       'swarming': {
-        'dimension_sets': [
-          {
-            'os': 'Ubuntu-14.04',
-          }
-        ],
         'shards': 12,
       },
     },
@@ -2252,6 +2247,7 @@
 
   'mojo_windows_gtests': [
     'mojo_windows_specific_gtests',
+    'network_service_gtests',
     'viz_fyi_gtests',
   ],
 

testing/buildbot/waterfalls.pyl

@@ -1182,7 +1182,7 @@
       'Mojo Linux': {
         'test_suites': {
           'gtest_tests': 'network_service_gtests',
-          'isolated_scripts': 'mojo_linux_isolated_scripts',
+          'isolated_scripts': 'mojo_network_isolated_scripts',
         },
       },
       'Mojo Windows': {
@@ -1191,6 +1191,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'mojo_windows_gtests',
+          'isolated_scripts': 'mojo_network_isolated_scripts',
         },
       },
       'Out of Process Profiling Android': {