Move VR e2e HTML/JS files

Moves the VR HTML/JS files used for end-to-end testing from
chrome/test/data/android/webvr_instrumentation to
chrome/test/data/vr/e2e_test_files. VR browser test support has been
added, so these files are not Android-specific now.

Also updates any files that use or reference the old path to use the
new one.

Bug: 795455
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I3d5905fb00e3f05ca18b445bb1443846df5afdf4
Reviewed-on: https://chromium-review.googlesource.com/831253Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524747}

chrome/android/BUILD.gn

@@ -658,7 +658,7 @@ if (enable_vr) {
 
     data = [
       "//chrome/android/shared_preference_files/test/",
-      "//chrome/test/data/android/",
+      "//chrome/test/data/vr/e2e_test_files/",
       "//third_party/gvr-android-sdk/test-apks/",
       "//third_party/WebKit/LayoutTests/resources/testharness.js",
     ]

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/README.md

@@ -30,7 +30,7 @@ those directories' README.md files.
 * `//chrome/android/shared_preference_files/test/` - Contains the VrCore settings
   files for running VR instrumentation tests (see the "Building and Running"
   section for more information).
-* `//chrome/test/data/android/webvr_instrumentation/` - Contains the JavaScript
+* `//chrome/test/data/vr/e2e_test_files/` - Contains the JavaScript
   and HTML files for VR instrumentation tests.
 * `//third_party/gvr-android-sdk/test-apks/` - Contains the VrCore and Daydream
   Home APKs for testing. You must have `DOWNLOAD_VR_TEST_APKS` set as an
@@ -145,7 +145,7 @@ for VR Browser testing. Examples include:
 * Waiting on JavaScript test steps and running arbitrary JavaScript code
 
 If you are writing a test that uses WebVR, you will likely also need to add an
-HTML file to `//chrome/test/data/android/webvr_instrumentation/html/` that
+HTML file to `//chrome/test/data/vr/e2e_test_files/html/` that
 handles the JavaScript portion of the test. In general, a WebVR test will have a
 number of steps as functions on the JavaScript side. The Java side of the test
 will load the file and start a JavaScript step, blocking until it finishes. The

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrTestFramework.java

@@ -51,7 +51,7 @@ public class VrTestFramework {
     public static final int POLL_TIMEOUT_LONG_MS = 10000;
 
     private static final String TAG = "VrTestFramework";
-    static final String TEST_DIR = "chrome/test/data/android/webvr_instrumentation";
+    static final String TEST_DIR = "chrome/test/data/vr/e2e_test_files";
 
     // Test status enum
     private static final int STATUS_RUNNING = 0;

chrome/browser/vr/test/vr_browser_test.cc

@@ -71,7 +71,7 @@ void VrBrowserTest::SetUp() {
 
 GURL VrBrowserTest::GetHtmlTestFile(const std::string& test_name) {
   return ui_test_utils::GetTestUrl(
-      base::FilePath(FILE_PATH_LITERAL("android/webvr_instrumentation/html")),
+      base::FilePath(FILE_PATH_LITERAL("vr/e2e_test_files/html")),
 #ifdef OS_WIN
       base::FilePath(base::UTF8ToWide(test_name + ".html")
 #else