Enabled VR Shell unittests on main waterfall

chrome/browser/android/vr_shell/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
 import("//chrome/common/features.gni")
 import("//testing/test.gni")
 
 assert(enable_vr_shell || enable_webvr)
 
@@ skipping 64 matching lines @@
 
   generate_jni("vr_shell_jni_headers") {
     sources = [
       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java",
       "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java",
     ]
     jni_package = "vr_shell"
   }
 }
 
-if (enable_vr_shell) {
+if (enable_webvr) {
   test("vr_shell_unittests") {
     sources = [
       "ui_elements_unittest.cc",
       "ui_scene_unittest.cc",
     ]
 
     deps = [
       ":vr_common",
       "//base/test:run_all_unittests",
       "//base/test:test_support",
       "//testing/gtest",
       "//ui/gfx/geometry",
     ]
   }
 }