Make VR screen tap tests more stable

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 540f4b1edf49a6341578f5e6aa6d9dcf0f12ac72..fe9297d2b7bd40d4fcaf5e26baddead2cadb2cb4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -501,39 +501,41 @@ android_library("chrome_test_java") {
   ]
 }
 
-android_library("chrome_test_vr_java") {
-  testonly = true
-
-  java_files = [
-    "javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java",
-    "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
-    "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
-    "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java",
-    "javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java",
-  ]
+if (enable_vr) {
+  android_library("chrome_test_vr_java") {
+    testonly = true
+
+    java_files = [
+      "javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java",
+      "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
+      "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
+      "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java",
+      "javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java",
+    ]
 
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//chrome/android:app_hooks_java",
-    "//chrome/android:chrome_java",
-    "//chrome/test/android:chrome_java_test_support",
-    "//components/policy/android:policy_java",
-    "//content/public/android:content_java",
-    "//content/public/test/android:content_java_test_support",
-    "//third_party/android_protobuf:protobuf_nano_javalib",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/gvr-android-sdk:gvr_common_java",
-    "//ui/android:ui_java",
-  ]
+    deps = [
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//chrome/android:app_hooks_java",
+      "//chrome/android:chrome_java",
+      "//chrome/test/android:chrome_java_test_support",
+      "//components/policy/android:policy_java",
+      "//content/public/android:content_java",
+      "//content/public/test/android:content_java_test_support",
+      "//third_party/android_protobuf:protobuf_nano_javalib",
+      "//third_party/android_support_test_runner:runner_java",
+      "//third_party/android_tools:android_support_v7_appcompat_java",
+      "//third_party/gvr-android-sdk:gvr_common_java",
+      "//ui/android:ui_java",
+    ]
 
-  data = [
-    "//chrome/android/shared_preference_files/test/",
-    "//chrome/test/data/android/",
-    "//third_party/gvr-android-sdk/test-apks/",
-    "//third_party/WebKit/LayoutTests/resources/testharness.js",
-  ]
+    data = [
+      "//chrome/android/shared_preference_files/test/",
+      "//chrome/test/data/android/",
+      "//third_party/gvr-android-sdk/test-apks/",
+      "//third_party/WebKit/LayoutTests/resources/testharness.js",
+    ]
+  }
 }
 
 # Overrides icon / name defined in chrome_java_resources.