Rename enable_daydream to enable_gvr_services and fix enabling logic

By David Dorwin request.

Bug: None
Change-Id: Ie06397c5d14db8260983f71aec405c0c07f66923
Reviewed-on: https://chromium-review.googlesource.com/740687Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Viatcheslav Ostapenko <sl.ostapenko@samsung.com>
Cr-Commit-Position: refs/heads/master@{#512673}

chrome/browser/BUILD.gn

@@ -3937,7 +3937,7 @@ split_static_library("browser") {
   }
 
   if (enable_vr) {
-    if (enable_daydream) {
+    if (enable_gvr_services) {
       deps += [ "android/vr_shell:vr_android" ]
       configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
     }

device/vr/BUILD.gn

@@ -37,7 +37,7 @@ if (enable_vr) {
       "//ui/gfx",
     ]
 
-    if (enable_daydream) {
+    if (enable_gvr_services) {
       sources += [
         "android/gvr/cardboard_gamepad_data_fetcher.cc",
         "android/gvr/cardboard_gamepad_data_fetcher.h",
@@ -120,7 +120,7 @@ if (enable_vr) {
   }
 }
 
-if (enable_daydream) {
+if (enable_gvr_services) {
   java_sources_needing_jni =
       [ "android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java" ]
 

device/vr/features/features.gni

@@ -5,13 +5,17 @@
 import("//build/config/chromecast_build.gni")
 
 declare_args() {
-  # Enable VR device support by default on Android and Windows
   # TODO(733935): Enable for other Android architectures too. Currently we only
   # support arm and arm64.
-  enable_vr = (is_android && (current_cpu == "arm" || current_cpu == "arm64") &&
-               !is_chromecast) || is_win
+  enable_gvr_services = is_android && !is_chromecast &&
+                        (current_cpu == "arm" || current_cpu == "arm64")
   enable_openvr = false
-  enable_daydream = is_android && (current_cpu == "arm" || current_cpu == "arm64")
+}
+
+declare_args() {
+  # Enable VR device support whenever VR device SDK(s) are supported and
+  # on Windows for testing.
+  enable_vr = enable_gvr_services || enable_openvr || is_win
 
   # Whether to include VR extras like test APKs in non-VR-specific targets
   include_vr_data = false