Move VR tests to separate APK

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 0ceda164b93e3df8bd690ab1290985fcb8086fde..690923434898c49a80a82bf5deaea92f31a2bbd4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -464,18 +464,41 @@ android_library("chrome_test_java") {
     "//content/test/data/media/session/",
     "//content/test/data/media/webrtc_test_utilities.js",
   ]
+}
+
+android_library("chrome_test_vr_java") {
+  testonly = true
+
+  java_files =
+      [ "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java" ]
 
   if (enable_vr_shell) {
     java_files += [
       "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",
-    ]
-    deps += [
-      "//third_party/android_protobuf:protobuf_nano_javalib",
-      "//third_party/gvr-android-sdk:gvr_common_java",
     ]
   }
+
+  # WebVR instrumentation files added conditionally here in future
+
+  deps = [
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//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/test/data/android",
+  ]
 }
 
 # Overrides icon / name defined in chrome_java_resources.
@@ -732,6 +755,8 @@ chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
 
 chrome_public_test_apk_manifest =
     "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
+chrome_public_test_vr_apk_manifest =
+    "$root_gen_dir/chrome_public_test_vr_apk_manifest/AndroidManifest.xml"
 chrome_sync_shell_test_apk_manifest =
     "$root_gen_dir/chrome_sync_shell_test_apk_manifest/AndroidManifest.xml"
 
@@ -741,6 +766,12 @@ jinja_template("chrome_public_test_apk_manifest") {
   variables = chrome_public_jinja_variables
 }
 
+jinja_template("chrome_public_test_vr_apk_manifest") {
+  input = "javatests/AndroidManifest.xml"
+  output = chrome_public_test_vr_apk_manifest
+  variables = chrome_public_jinja_variables
+}
+
 jinja_template("chrome_sync_shell_test_apk_manifest") {
   input = "sync_shell/javatests/AndroidManifest.xml"
   output = chrome_sync_shell_test_apk_manifest
@@ -768,6 +799,20 @@ instrumentation_test_apk("chrome_public_test_apk") {
   proguard_enabled = !is_java_debug
 }
 
+if (enable_webvr || enable_vr_shell) {
+  instrumentation_test_apk("chrome_public_test_vr_apk") {
+    apk_name = "ChromePublicTestVr"
+    apk_under_test = ":chrome_public_apk"
+    android_manifest = chrome_public_test_vr_apk_manifest
+    android_manifest_dep = ":chrome_public_test_vr_apk_manifest"
+
+    deps = [
+      ":chrome_test_vr_java",
+    ]
+    proguard_enabled = !is_java_debug
+  }
+}
+
 android_library("chrome_sync_shell_test_apk_java") {
   testonly = true