[vr] Deny permission requests in VR mode

chrome/browser/android/download/download_controller.cc

Index: chrome/browser/android/download/download_controller.cc
diff --git a/chrome/browser/android/download/download_controller.cc b/chrome/browser/android/download/download_controller.cc
index 2a27f7e749e5b8cb806a05796ff661bfab211378..51fe451bf7e4c3dd29d8e9cc1efb70580fa856e5 100644
--- a/chrome/browser/android/download/download_controller.cc
+++ b/chrome/browser/android/download/download_controller.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
+#include "chrome/browser/vr/vr_tab_helper.h"
 #include "chrome/grit/chromium_strings.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -30,7 +31,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/referrer.h"
-#include "device/vr/features/features.h"
 #include "jni/DownloadController_jni.h"
 #include "net/base/filename_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
@@ -38,10 +38,6 @@
 #include "ui/android/window_android.h"
 #include "ui/base/page_transition_types.h"
 
-#if BUILDFLAG(ENABLE_VR)
-#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
-#endif  // BUILDFLAG(ENABLE_VR)
-
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
@@ -223,11 +219,9 @@ void DownloadController::AcquireFileAccessPermission(
     const DownloadControllerBase::AcquireFileAccessPermissionCallback& cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-#if BUILDFLAG(ENABLE_VR)
   WebContents* web_contents = web_contents_getter.Run();
-  if (vr_shell::VrTabHelper::IsInVr(web_contents))
+  if (vr::VrTabHelper::IsInVr(web_contents))
     return;
-#endif
 
   if (HasFileAccessPermission()) {
     BrowserThread::PostTask(