Pull in vr_shell code for webvr

chrome/browser/BUILD.gn

Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 58c06b799b004126e4f6d3e0fbf022853d172467..d3c774c213159984b26b4534968e6262602dbc7c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3349,8 +3349,11 @@ split_static_library("browser") {
     }
   }
 
-  if (enable_vr_shell && android_java_ui) {
-    defines += [ "ENABLE_VR_SHELL" ]
+  if ((enable_vr_shell || enable_webvr) && android_java_ui) {
+    if (enable_vr_shell) {
+      defines += [ "ENABLE_VR_SHELL" ]
+    }
+
     deps += [ "android/vr_shell:vr_shell" ]

[agrieve, 2016/10/05 19:04:58]

It seems this is actually the point of the change to pull in "shell" things for
just "enable_webvr", but it's quite confusing to read. 

Should we make enable_webvr force enable_vr_shell to be true?
Can we rename all of these "vr_shell" things that are required by webvr to
"vr_common"?

[bshe, 2016/10/05 19:53:06]

make sense. renamed to vr_common. We can't force enable_vr_shell to be true
when enable_webvr is true. Overtime, we will have code and resources that are
only for vr shell. And it is possible that we enable webvr by default but not vr
shell.

     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
   }