Remove ENABLE_VR_SHELL compile-time define.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 101078b8f8d8ad5eef68bd2309e1cfee4d14d5d4..b7fac6f3935d6931d0cc67c042675f1854bcbdf3 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -255,7 +255,7 @@ android_library("chrome_java") {
   # From java_sources.gni.
   java_files = chrome_java_sources
 
-  if (enable_vr_shell || enable_webvr) {

[agrieve, 2017/02/08 01:31:27]

Why not remove the definition in src/chrome/common/features.gni?

Is it still useful to keep the compile-time define for non-arm architectures?

+  if (enable_webvr) {
     java_files += chrome_vr_java_sources
     deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
   }
@@ -458,17 +458,11 @@ android_library("chrome_test_java") {
 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",
@@ -788,7 +782,7 @@ instrumentation_test_apk("chrome_public_test_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"