Make VR screen tap tests more stable

chrome/android/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("//android_webview/webview_repack_locales_list.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
@@ skipping 483 matching lines @@
     "//content/test/data/android/media_permissions.html",
     "//content/test/data/android/webshare.html",
     "//content/test/data/media/bear.webm",
     "//content/test/data/media/getusermedia.html",
     "//content/test/data/media/session/",
     "//content/test/data/media/video-player.html",
     "//content/test/data/media/webrtc_test_utilities.js",
   ]
 }
 
-android_library("chrome_test_vr_java") {
-  testonly = true
+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",
-  ]
+    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.
 android_resources("chrome_public_apk_resources") {
   resource_dirs = [ "java/res_chromium" ]
 
   # Dep needed to ensure override works properly.
   deps = [
     ":chrome_java_resources",
   ]
@@ skipping 353 matching lines @@
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
   proguard_enabled = !is_java_debug
 }