reland: single_process_mash_interactive_ui_tests in main waterfall

The previous one was reverted due to failures on ASAN/LSAN bot
(see crrev.com/600462). Those failures are fixed by crrev.com/600889
so this simply relands the same config.

BUG=883523
TEST=none
TBR=sky@chromium.org

Change-Id: I0d4ee97bf3a446bcae359e7c5bf9125e48a4405a
Reviewed-on: https://chromium-review.googlesource.com/c/1289680
Commit-Queue: Jun Mukai <mukai@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600955}

testing/buildbot/chromium.chromiumos.json

@@ -821,6 +821,18 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
+        ],
+        "name": "single_process_mash_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 3
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",
@@ -1527,6 +1539,18 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
+        ],
+        "name": "single_process_mash_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 3
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",

testing/buildbot/chromium.fyi.json

@@ -1627,17 +1627,6 @@
         },
         "test": "interactive_ui_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
-        ],
-        "name": "single_process_mash_interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"

testing/buildbot/chromium.memory.json

@@ -4640,6 +4640,19 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "name": "single_process_mash_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 3
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",
@@ -5959,6 +5972,25 @@
         },
         "test": "interactive_ui_tests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "name": "single_process_mash_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-14.04"
+            }
+          ],
+          "shards": 3
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",

testing/buildbot/test_suites.pyl

@@ -1757,6 +1757,16 @@
           '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter',
         ],
       },
+      'single_process_mash_interactive_ui_tests': {
+        'test': 'interactive_ui_tests',
+        'args': [
+          '--enable-features=SingleProcessMash',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter',
+        ],
+        'swarming': {
+          'shards': 3,
+        },
+      },
       'ui_chromeos_unittests': {},
       'views_mus_unittests': {},
       'views_mus_interactive_ui_tests': {},
@@ -1829,13 +1839,6 @@
           '--enable-features=Mash',
         ],
       },
-      'single_process_mash_interactive_ui_tests': {
-        'test': 'interactive_ui_tests',
-        'args': [
-          '--enable-features=SingleProcessMash',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter',
-        ],
-      },
     },
 
     'memory_infra_isolated_scripts': {