Enabled VR Shell unittests on main waterfall

testing/buildbot/chromium.android.json

Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 88b99eef19f2e3800320134b4716cb6067810c67..01ffdbc7cb796964050050aa94d5b5d94f0973d2 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -2481,6 +2481,36 @@
           ]
         },
         "test": "unit_tests"
+      },
+      {
+        "override_isolate_target": "vr_shell_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",

[ghost stip (do not use), 2016/11/28 21:56:28]

we have a bit of a capacity crunch on the N5s right now. can you estimate how
many minutes of device time this test will take?

+              "device_type": "hammerhead"
+            }
+          ],
+          "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": "vr_shell_unittests"
       }
     ],
     "isolated_scripts": [
@@ -2597,6 +2627,9 @@
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
@@ -3522,6 +3555,39 @@
         "test": "unit_tests"
       },
       {
+        "override_isolate_target": "vr_shell_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "LMY48I",
+              "device_type": "hammerhead"
+            }
+          ],
+          "expiration": 10800,
+          "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": "vr_shell_unittests"
+      },
+      {
         "override_compile_targets": [
           "android_webview_test_apk"
         ],
@@ -3791,6 +3857,9 @@
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
@@ -4892,6 +4961,37 @@
           ]
         },
         "test": "unit_tests"
+      },
+      {
+        "override_isolate_target": "vr_shell_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a"
+            }
+          ],
+          "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": "vr_shell_unittests"
       }
     ]
   },
@@ -4983,6 +5083,9 @@
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [