Update WebXR origin trial token name.
This is required due to WebXR breaking API changes made in M73.
The associated test now checks that the WebXRDeviceM73 token works and that the WebXRDeviceM69 token no longer works.

Bug: 925983
Change-Id: Ibca4bf9476a3f5958a34ed8a162a75748ce313a0
Reviewed-on: https://chromium-review.googlesource.com/c/1448976
Reviewed-by: Bill Orr <billorr@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Bill Orr <billorr@chromium.org>
Commit-Queue: Jacob DeWitt <jacde@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#628178}(cherry picked from commit f6f3c60432b0d99dc80f176570ec54c7e2ca7eb3)
Reviewed-on: https://chromium-review.googlesource.com/c/1452657
Cr-Commit-Position: refs/branch-heads/3683@{#173}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index a44757a0..73a2e158 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1458,7 +1458,7 @@
     },
     {
       name: "WebXR",
-      origin_trial_feature_name: "WebXRDeviceM69",
+      origin_trial_feature_name: "WebXRDeviceM73",
       status: "experimental",
     },
     // Subset of the Gamepad extensions used for early WebXR implementations
diff --git a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-origin-trial-interfaces.html b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-origin-trial-interfaces.html
index 141273c..a1e86b7 100644
--- a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-origin-trial-interfaces.html
+++ b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-origin-trial-interfaces.html
@@ -1,30 +1,38 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<!-- Generate token with the command:
-tools/origin_trials/generate_token.py http://127.0.0.1:8000 WebXRDeviceM69 --expire-timestamp=2000000000
-
-To test whether the token is working, run virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/xr tests.
--->
-<title>WebXRDeviceM69 - interfaces exposed by origin trial</title>
+<title>WebXR - interfaces exposed by origin trial</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/origin-trials-helper.js"></script>
 <script>
-
-let token = "AkvrKmuIjbDoP4zBBuZLWVMJLzFCV+2l8Iv2RPYCSbeSjFRRidSbIgW41p+jnCcOukYZ3tE4ZvQsR6qNhiIW5QoAAABWeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViWFJEZXZpY2VNNjkiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0=";
-
 let properties_to_check = {'Navigator': ['xr']};
 
-// Skip this test if flags are not set properly.
-if(!self.internals.runtimeFlags.webXREnabled) {
+// Can only run these two tests if webXR is not enabled via a Chrome flag.
+// That is only the case when running this in a virtual test suite (by default,
+// runtime enabled features are on for layout tests).
+// To run in virtual test suite:
+// tools/run_web_tests.py virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed
+if (!self.internals.runtimeFlags.webXREnabled) {
   test(t => {
     OriginTrialsHelper.check_properties_missing(this, properties_to_check);
   }, "WebXR's entrypoint properties are not available without a token.");
+
+  // The WebXRDeviceM69 token has been disabled due to breaking webxr API
+  // changes made in M73.
+  // generated with command
+  // tools/origin_trials/generate_token.py http://127.0.0.1:8000 WebXRDeviceM69 --expire-timestamp=2000000000
+  let token_m69 = "AkvrKmuIjbDoP4zBBuZLWVMJLzFCV+2l8Iv2RPYCSbeSjFRRidSbIgW41p+jnCcOukYZ3tE4ZvQsR6qNhiIW5QoAAABWeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViWFJEZXZpY2VNNjkiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0=";
+  OriginTrialsHelper.add_token(token_m69);
+  test(t => {
+    OriginTrialsHelper.check_properties_missing(this, properties_to_check);
+  }, "WebXR's entrypoint properties are not available with WebXRDeviceM69 token.");
 }
 
-OriginTrialsHelper.add_token(token);
-
+// generated with command
+// tools/origin_trials/generate_token.py http://127.0.0.1:8000 WebXRDeviceM73 --expire-timestamp=2000000000
+let token_m73 = "AkdUKG/76uPyi1gvtP+q4o8XF9C6DWpF45h6xzMHwBFS+cfXrgo0zMHkA1T9ovuz+VVtxacaS/dc8F8JeWpcqAoAAABWeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViWFJEZXZpY2VNNzMiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0=";
+OriginTrialsHelper.add_token(token_m73);
 test(t => {
   OriginTrialsHelper.check_properties(this, properties_to_check);
-}, "WebXR's entrypoint properties are available.");
+}, "WebXR's entrypoint properties are available with WebXRDeviceM73 token.");
 </script>