Remove ENABLE_VR_SHELL compile-time define.

chrome/android/BUILD.gn

 # Copyright 2014 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("//android_webview/webview_repack_locales_list.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
@@ skipping 237 matching lines @@
     "//components/security_state/core:security_state_enums_java",
     "//components/signin/core/browser:investigated_scenario_java",
   ]
 
   # Manifest used for linting (determining unused resources).
   android_manifest = chrome_public_android_manifest
 
   # From java_sources.gni.
   java_files = chrome_java_sources
 
-  if (enable_vr_shell || enable_webvr) {
+  if (enable_webvr) {
     java_files += chrome_vr_java_sources
     deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
   }
 }
 
 action("chrome_android_java_google_api_keys_srcjar") {
   script = "//build/android/gyp/java_google_api_keys.py"
   _output_path = "$target_gen_dir/$target_name.srcjar"
   outputs = [
     _output_path,
@@ skipping 183 matching lines @@
     "//content/test/data/android/webshare.html",
     "//content/test/data/media/getusermedia.html",
     "//content/test/data/media/session/",
     "//content/test/data/media/webrtc_test_utilities.js",
   ]
 }
 
 android_library("chrome_test_vr_java") {
   testonly = true
 
-  java_files =
-      [ "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java" ]
-
-  if (enable_vr_shell) {
-    java_files += [
-      "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
-      "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
-    ]
-  }
-
-  # WebVR instrumentation files added conditionally here in future
+  java_files = [
+    "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java",
+    "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
+    "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
+  ]
 
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_protobuf:protobuf_nano_javalib",
@@ skipping 299 matching lines @@
   ]
   additional_apks = [
     "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
     "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
     "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
     "//net/android:net_test_support_apk",
   ]
   proguard_enabled = !is_java_debug
 }
 
-if (enable_webvr || enable_vr_shell) {
+if (enable_webvr) {
   instrumentation_test_apk("chrome_public_test_vr_apk") {
     apk_name = "ChromePublicTestVr"
     apk_under_test = ":chrome_public_apk"
     android_manifest = chrome_public_test_vr_apk_manifest
     android_manifest_dep = ":chrome_public_test_vr_apk_manifest"
 
     deps = [
       ":chrome_test_vr_java",
     ]
     proguard_enabled = !is_java_debug
@@ skipping 30 matching lines @@
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
   proguard_enabled = !is_java_debug
 }