Pull in vr_shell code for webvr

chrome/browser/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("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 3337 matching lines @@
     if (enable_supervised_users) {
       sources += [
         "supervised_user/child_accounts/child_account_feedback_reporter_android.cc",
         "supervised_user/child_accounts/child_account_feedback_reporter_android.h",
         "supervised_user/child_accounts/child_account_service_android.cc",
         "supervised_user/child_accounts/child_account_service_android.h",
       ]
     }
   }
 
-  if (enable_vr_shell && android_java_ui) {
-    defines += [ "ENABLE_VR_SHELL" ]
-    deps += [ "android/vr_shell:vr_shell" ]
+  if (enable_vr_shell || enable_webvr) {
+    if (enable_vr_shell) {
+      defines += [ "ENABLE_VR_SHELL" ]
+    }
+
+    deps += [ "android/vr_shell:vr_common" ]
     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
   }
 
   if (is_mac) {
     deps += [
       "//chrome/app_shim",
       "//chrome/browser/apps/app_shim",
       "//third_party/google_toolbox_for_mac",
       "//third_party/mozilla",
     ]
@@ skipping 915 matching lines @@
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }