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..febaf0ac2f49434e182d06dded147a24322ca77b 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) {
+  if (enable_webvr) {

[bshe, 2017/02/07 22:07:09]

should we rename enable_webvr to enable_vr then? we shouldn't let enable_webvr
represent both WebVR and ChromeVR.

[cjgrant, 2017/02/07 22:16:54]

That seems reasonable to me, but some buy-in from others would be good.  This
also implies changing the #define ENABLE_WEBVR, so doing this in a separate
change may also be good.

[amp, 2017/02/07 22:50:07]

+1 to renaming to a more general vr single flag (and also doing it in a separate
change).

     java_files += chrome_vr_java_sources
     deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
   }
@@ -461,7 +461,7 @@ android_library("chrome_test_vr_java") {
   java_files =
       [ "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java" ]
 
-  if (enable_vr_shell) {
+  if (enable_webvr) {

[bsheedy, 2017/02/07 20:53:09]

If we're throwing all the VR related things under enable_webvr now, you can get
rid of this conditional and include the java_files append in the line above.

[cjgrant, 2017/02/07 22:16:54]

Done.

     java_files += [
       "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
       "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
@@ -788,7 +788,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"