Enabled VR Shell unittests on main waterfall

testing/buildbot/chromium.android.json

 {
   "Android Cronet Builder": {
     "additional_compile_targets": [
       "cronet_package"
     ]
   },
   "Android N5X Swarm Builder": {
     "gtest_tests": [
       {
         "override_compile_targets": [
@@ skipping 2463 matching lines @@
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "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": [
       {
         "args": [
           "--browser=android-chromium",
           "--device=android",
           "--skip=benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.*"
         ],
         "isolate_name": "telemetry_perf_unittests",
@@ skipping 96 matching lines @@
         "test": "ui_android_unittests"
       },
       {
         "test": "ui_base_unittests"
       },
       {
         "test": "ui_touch_selection_unittests"
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
         "apk_under_test": "Blimp.apk",
         "override_compile_targets": [
           "blimp_test_apk"
@@ skipping 905 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "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"
         ],
         "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",
@@ skipping 249 matching lines @@
         "test": "ui_android_unittests"
       },
       {
         "test": "ui_base_unittests"
       },
       {
         "test": "ui_touch_selection_unittests"
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
         "apk_under_test": "Blimp.apk",
         "override_compile_targets": [
           "blimp_test_apk"
@@ skipping 1081 matching lines @@
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "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"
       }
     ]
   },
   "Marshmallow Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
@@ skipping 71 matching lines @@
         "test": "ui_android_unittests"
       },
       {
         "test": "ui_base_unittests"
       },
       {
         "test": "ui_touch_selection_unittests"
       },
       {
         "test": "unit_tests"
+      },
+      {
+        "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
         "apk_under_test": "Blimp.apk",
         "override_compile_targets": [
           "blimp_test_apk"
         ],
         "test": "blimp_test_apk",
         "test_apk": "BlimpTest.apk"
       },
       {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   }
 }