WebXR: Rename requestSession parameter variables to match use

https://crrev.com/c/1570217 changed navigator.xr.requestSession()
to take a XRSessionMode as an argument instead of XRSessionCreationOptions.
While it changed the argument type in WPT tests, the parameter/argument
names weren't changed. This CL fixes the names by renaming them from
'option' to 'mode'.

Bug: 953450
Change-Id: If50536b8580bf87ecfc72c874a226124097d28cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1593734
Commit-Queue: Suman Kancherla <sumankancherla@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#656974}

third_party/blink/web_tests/external/wpt/webxr/resources/webxr_util.js

@@ -25,7 +25,7 @@ function xr_promise_test(name, func, properties) {
 // device, and the test object.
 // Requires a webglCanvas on the page.
 function xr_session_promise_test(
-    name, func, fakeDeviceInit, sessionOptions, properties) {
+    name, func, fakeDeviceInit, sessionMode, properties) {
   let testDeviceController;
   let testSession;
 
@@ -48,7 +48,7 @@ function xr_session_promise_test(
               .then(() => new Promise((resolve, reject) => {
                       // Perform the session request in a user gesture.
                       XRTest.simulateUserActivation(() => {
-                        navigator.xr.requestSession(sessionOptions)
+                        navigator.xr.requestSession(sessionMode)
                             .then((session) => {
                               testSession = session;
                               // Session must have a baseLayer or frame requests
@@ -62,7 +62,7 @@ function xr_session_promise_test(
                             .catch((err) => {
                               reject(
                                   'Session with params ' +
-                                  JSON.stringify(sessionOptions) +
+                                  JSON.stringify(sessionMode) +
                                   ' was rejected on device ' +
                                   JSON.stringify(fakeDeviceInit) +
                                   ' with error: ' + err);

third_party/blink/web_tests/xr/ar_hittest.html

@@ -16,7 +16,7 @@ let testName = "Ensures hit-test returns expected mock results";
 let fakeDeviceInitParams = { supportsImmersive: true,
                              supportsEnvironmentIntegration: true };
 
-let requestSessionOptions = [ 'immersive-ar' ];
+let requestSessionModes = [ 'immersive-ar' ];
 
 let expectedHitMatrix = [1, 0, 0, 1,
                          0, 1, 0, 2,
@@ -51,6 +51,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/events_referenceSpace_reset.html

@@ -17,7 +17,7 @@ let watcherDone = new Event("watcherdone");
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'inline',
   'immersive-vr',
 ];
@@ -62,6 +62,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/events_session_select.html

@@ -17,7 +17,7 @@ let watcherDone = new Event("watcherdone");
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   let eventWatcher = new EventWatcher(
@@ -109,6 +109,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/events_session_select_subframe.html

@@ -18,7 +18,7 @@ let watcherDone = new Event("watcherdone");
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   let eventWatcher = new EventWatcher(
@@ -84,6 +84,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/exclusive_requestFrame_nolayer.html

@@ -13,7 +13,7 @@ let testName = "XRSession requestAnimationFrame must fail if the session has "
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'immersive-vr',
   'inline'
 ];
@@ -45,6 +45,6 @@ let testFunction = (session) => new Promise((resolve, reject) => {
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/getInputPose_hand.html

@@ -16,7 +16,7 @@ let testName = "XRInputSources with a target ray mode of 'tracked-pointer' "
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve) => {
@@ -111,6 +111,6 @@ let testFunction =
   });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/getInputPose_handedness.html

@@ -15,7 +15,7 @@ let testName = "XRInputSources properly communicate their handedness";
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve) => {
@@ -97,6 +97,6 @@ let testFunction =
   });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/getInputPose_ray.html

@@ -15,7 +15,7 @@ let testName = "XRInputSources produce valid target rays";
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve) => {
@@ -110,6 +110,6 @@ let testFunction =
   });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrBoundedReferenceSpace_updates.html

@@ -15,7 +15,7 @@ let testName =
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'immersive-vr',
 ];
 
@@ -95,6 +95,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrFrame_getPose.html

@@ -17,7 +17,7 @@ let testName = "XRFrame.getPose works between eye-level and floor-level spaces";
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   // Session must have a baseLayer or frame requests will be ignored.
@@ -58,6 +58,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrInputSource_add_remove.html

@@ -16,7 +16,7 @@ let testName = "XRInputSources can be properly added and removed from the "
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) => {
     // Session must have a baseLayer or frame requests will be ignored.
@@ -86,6 +86,6 @@ let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) =
   });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrReferenceSpace_originOffset.html

@@ -17,7 +17,7 @@ let testName = "Updating XRReferenceSpace origin offset updates view and input m
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve) => {
@@ -119,6 +119,6 @@ let testFunction =
   });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrSession_environmentBlendMode.html

@@ -13,7 +13,7 @@ let testName = "environmentBlendMode is correct for a VR device";
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'inline',
   'immersive-vr',
 ];
@@ -25,7 +25,7 @@ let testFunction = function(session, t) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 // TODO(https://crbug.com/828321): Enable once session options for AR are in place.
 /*xr_session_promise_test( (session, t) => {

third_party/blink/web_tests/xr/xrSession_environmentProviderDisconnect.html

@@ -16,7 +16,7 @@ let testName = "Outstanding promises get rejected if environmentProvider discone
 let fakeDeviceInitParams = { supportsImmersive: true,
                              supportsEnvironmentIntegration: true };
 
-let requestSessionOptions = ['immersive-ar'];
+let requestSessionModes = ['immersive-ar'];
 let refSpace = undefined;
 
 let ray = new XRRay({x : 0.0, y : 0.0, z : 0.0}, {x : 1.0, y : 0.0, z: 0.0});
@@ -61,6 +61,6 @@ let testFunction = function(session, t, controller) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrSession_requestAnimationFrame_timestamp.html

@@ -16,7 +16,7 @@ let testName = "XRFrame getViewerPose updates on the next frame";
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'inline',
   'immersive-vr',
 ];
@@ -110,6 +110,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrStationaryReferenceSpace_floorlevel_updates.html

@@ -15,7 +15,7 @@ let testName =
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'inline',
   'immersive-vr',
 ];
@@ -80,6 +80,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrView_match.html

@@ -14,7 +14,7 @@ let testName = "XRFrame contains the expected views";
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   // Session must have a baseLayer or frame requests will be ignored.
@@ -81,6 +81,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrView_oneframeupdate.html

@@ -15,7 +15,7 @@ let testName = "XRView projection matrices update near and far depths on the "
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   // Session must have a baseLayer or frame requests will be ignored.
@@ -74,6 +74,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrViewport_valid.html

@@ -13,7 +13,7 @@ let testName = "XRViewport attributes are valid";
 
 let fakeDeviceInitParams = { supportsImmersive:true };
 
-let requestSessionOptions = ['immersive-vr'];
+let requestSessionModes = ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   // Session must have a baseLayer or frame requests will be ignored.
@@ -90,6 +90,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_constructor.html

@@ -13,7 +13,7 @@ let testName =
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve, reject) => {
@@ -53,6 +53,6 @@ let testFunction =
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_dirty_framebuffer.html

@@ -15,7 +15,7 @@ let testName = "A frame should be submitted if the base layer was written to "
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve, reject) => {
@@ -62,6 +62,6 @@ let testFunction =
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_draw.html

@@ -14,7 +14,7 @@ let testName =
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 // Very simple program setup with no error checking.
 function setupProgram(gl, vertexSrc, fragmentSrc) {
@@ -94,6 +94,6 @@ let testFunction =
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_scale.html

@@ -14,7 +14,7 @@ let testName = "Ensure framebuffer scaling works as expected.";
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction =
   (session, t, fakeDeviceController) => new Promise((resolve, reject) => {
@@ -59,6 +59,6 @@ let testFunction =
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_non_exclusive_adjust_size.html

@@ -22,7 +22,7 @@ let outputCanvasRatio = outputCanvas.width / outputCanvas.height;
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions = ['inline'];
+let requestSessionModes = ['inline'];
 
 let testFunction = (session, t) => new Promise((resolve, reject) => {
   console.log("Test start");
@@ -66,6 +66,6 @@ let testFunction = (session, t) => new Promise((resolve, reject) => {
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_opaque_framebuffer.html

@@ -12,7 +12,7 @@ let testName = "Ensure that the framebuffer given by the WebGL layer is opaque";
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions = [
+let requestSessionModes = [
   'immersive-vr',
   'inline'
 ];
@@ -110,6 +110,6 @@ let testFunction =
 });
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>

third_party/blink/web_tests/xr/xrWebGLLayer_viewport_scale.html

@@ -15,7 +15,7 @@ let testName = "Ensure viewport scale changes only take effect on the next "
 
 let fakeDeviceInitParams = { supportsImmersive: true };
 
-let requestSessionOptions =  ['immersive-vr'];
+let requestSessionModes =  ['immersive-vr'];
 
 let testFunction = function(session, t, fakeDeviceController) {
   // Session must have a baseLayer or else frame requests will be ignored.
@@ -103,6 +103,6 @@ let testFunction = function(session, t, fakeDeviceController) {
 };
 
 xr_session_promise_test(
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  testFunction, fakeDeviceInitParams, requestSessionModes, testName);
 
 </script>