Run interactive_ui_tests with network service along with the other network_service gtests.

Bug: 819249
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I44a479a9d91df43f12b85ccc702d9f77e56ce399
Reviewed-on: https://chromium-review.googlesource.com/952063Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Conley Owens <cco3@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541254}

testing/buildbot/chromium.fyi.json

@@ -5102,6 +5102,22 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--site-per-process"
@@ -6244,6 +6260,17 @@
           "can_use_on_swarming_builders": true
         },
         "test": "extensions_browsertests"
+      },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
       }
     ],
     "isolated_scripts": [

testing/buildbot/chromium.linux.json

@@ -995,6 +995,17 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--site-per-process"
@@ -1774,6 +1785,17 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter"
+        ],
+        "name": "network_service_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--site-per-process"
@@ -2342,6 +2364,17 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=NetworkService",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter"
+        ],
+        "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/filters/BUILD.gn

@@ -68,6 +68,7 @@ source_set("interactive_ui_tests_filters") {
   testonly = true
 
   data = [
+    "//testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter",
     "//testing/buildbot/filters/site-per-process.interactive_ui_tests.filter",
   ]
 }

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

+# These tests currently fail when run with enablefeatures=NetworkService
+# See https://crbug.com/819249
+
+-LocalNTPUITest.FakeboxRedirectsToOmnibox
+-PasswordGenerationInteractiveTest.GenerationTriggeredInIFrame
+-PasswordGenerationInteractiveTest.PopupShownAndDismissed
+-PasswordGenerationInteractiveTest.PopupShownAndDismissedByScrolling
+-PasswordGenerationInteractiveTest.PopupShownAndPasswordSelected
+-WebViewInteractiveTests/WebViewNewWindowInteractiveTest.NewWindow_WebRequestRemoveElement/0
+-WebViewInteractiveTests/WebViewNewWindowInteractiveTest.NewWindow_WebRequestRemoveElement/1

testing/buildbot/test_suites.pyl

@@ -1162,6 +1162,13 @@
       ],
       'test': 'extensions_browsertests',
     },
+    'network_service_interactive_ui_tests': {
+      'args': [
+        '--enable-features=NetworkService',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_interactive_ui_tests.filter',
+      ],
+      'test': 'interactive_ui_tests',
+    },
   },
 
   'linux_chromeos_rel_specific_gtests': {