Run instrumentation tests with PlzNavigate on the Android waterfall.

testing/buildbot/chromium.android.json

 {
   "Android Cronet Builder": {
     "additional_compile_targets": [
       "cronet_package"
     ]
   },
   "Android N5X Swarm Builder": {
     "gtest_tests": [
       {
         "override_compile_targets": [
@@ skipping 2523 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "android_webview_test_apk"
       },
       {
+        "args": [
+          "--enable-browser-side-navigation"
+        ],
+        "name": "browser_side_navigation_android_webview_test_apk",
+        "override_compile_targets": [
+          "android_webview_test_apk"
+        ],
+        "override_isolate_target": "android_webview_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "android_webview_test_apk"
+      },
+      {
         "override_isolate_target": "base_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
             }
           ],
@@ skipping 207 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "chrome_sync_shell_test_apk"
       },
       {
+        "args": [
+          "--enable-browser-side-navigation"
+        ],
+        "name": "browser_side_navigation_chrome_sync_shell_test_apk",
+        "override_compile_targets": [
+          "chrome_sync_shell_test_apk"
+        ],
+        "override_isolate_target": "chrome_sync_shell_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 600,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "chrome_sync_shell_test_apk"
+      },
+      {
         "override_isolate_target": "components_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
             }
           ],
@@ skipping 12 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "components_browsertests"
       },
       {
         "args": [
-          "--test-arguments=--enable-browser-side-navigation"
+          "--enable-browser-side-navigation"
         ],
         "name": "browser_side_navigation_components_browsertests",
         "override_isolate_target": "components_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
@@ skipping 45 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "components_unittests"
       },
       {
         "args": [
-          "--test-arguments=--enable-browser-side-navigation"
+          "--enable-browser-side-navigation"
         ],
         "name": "browser_side_navigation_components_unittests",
         "override_isolate_target": "components_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
@@ skipping 45 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "content_browsertests"
       },
       {
         "args": [
-          "--test-arguments=--enable-browser-side-navigation"
+          "--enable-browser-side-navigation"
         ],
         "name": "browser_side_navigation_content_browsertests",
         "override_isolate_target": "content_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
@@ skipping 47 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "content_shell_test_apk"
       },
       {
+        "args": [
+          "--enable-browser-side-navigation"
+        ],
+        "name": "browser_side_navigation_content_shell_test_apk",
+        "override_compile_targets": [
+          "content_shell_test_apk"
+        ],
+        "override_isolate_target": "content_shell_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 1920,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "content_shell_test_apk"
+      },
+      {
         "override_isolate_target": "content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
             }
           ],
@@ skipping 12 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "content_unittests"
       },
       {
         "args": [
-          "--test-arguments=--enable-browser-side-navigation"
+          "--enable-browser-side-navigation"
         ],
         "name": "browser_side_navigation_content_unittests",
         "override_isolate_target": "content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
@@ skipping 544 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "unit_tests"
       },
       {
         "args": [
-          "--test-arguments=--enable-browser-side-navigation"
+          "--enable-browser-side-navigation"
         ],
         "name": "browser_side_navigation_unit_tests",
         "override_isolate_target": "unit_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
@@ skipping 151 matching lines @@
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   }
 }