Bug 1504923 [wpt PR 13939] - Revert "Make XR FrameData and Environment mojo associated", a=testonly

Automatic update from web-platform-testsRevert "Make XR FrameData and Environment mojo associated"

This reverts commit 126a1168e3bcffb43c706822b3aa28695840310f.

Reason for revert: Broke compile: https://logs.chromium.org/logs/chromium/bb/chromium.chrome/Google_Chrome_Win/39908/+/recipes/steps/compile/0/stdout

Original change's description:
> Make XR FrameData and Environment mojo associated
>
> The XRFrameDataProvider now returns an associated
> XREnvironmentDataProvider interface so that the
> two share callback queues and thus allow strict
> ordering of the two interfaces. This is critical
> for frame synchronization between frames and the
> associated environment data.
>
> Note: We can't just mark the interfaceptrs for
> XRFrameDataProvider and
> XREnvironmentIntegrationProvider as associated
> in the XRSession struct. XRDevice implementations
> mostly live on separate threads from the
> XRFrameDataProviders, so we'd have extra thread
> hopping. For the VR headsets we explicitly live
> off the main thread to avoid latency, and because
> we do some work that may block the thread the
> XRFrameDataProvider lives on (for example waiting
> for vsync, or submitting frames to headset APIs).
>
> Bug: 867057, 876135, 843376
> Change-Id: If2fb62fcd185825209dec08e421df05f34d41c30
> Reviewed-on: https://chromium-review.googlesource.com/c/1171794
> Commit-Queue: Max Rebuschatis <lincolnfrog@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Bill Orr <billorr@chromium.org>
> Reviewed-by: Klaus Weidner <klausw@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#605545}

TBR=dcheng@chromium.org,klausw@chromium.org,billorr@chromium.org,lincolnfrog@chromium.org

Change-Id: I7a2408629460f456bf1189acdb0837f7d22a7919
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 867057, 876135, 843376
Reviewed-on: https://chromium-review.googlesource.com/c/1318805
Reviewed-by: Dmitry Titov <dimich@chromium.org>
Commit-Queue: Dmitry Titov <dimich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605551}

--
Merge pull request #13939 from web-platform-tests/chromium-export-0ef86cd598

Revert "Make XR FrameData and Environment mojo associated"
--

wpt-commits: 97ef8fa350d0b1cf5c4692a71b1040d66266e7b7, b306f085d1a008b7636b60efa67a5b89d1fc2f52
wpt-pr: 13939

testing/web-platform/tests/resources/chromium/webxr-test.js

@@ -146,10 +146,6 @@ class MockRuntime {
     } else {
       this.displayInfo_ = this.getNonImmersiveDisplayInfo();
     }
-
-    if (fakeDeviceInit.supportsEnvironmentIntegration) {
-      this.displayInfo_.capabilities.canProvideEnvironmentIntegration = true;
-    }
   }
 
   // Test methods.
@@ -327,12 +323,6 @@ class MockRuntime {
     });
   }
 
-  getEnvironmentIntegrationProvider(environmentProviderRequest) {
-    let environmentProviderBinding = new mojo.AssociatedBinding(
-        device.mojom.XREnvironmentIntegrationProvider, this,
-        environmentProviderRequest);
-  }
-
   updateSessionGeometry(frame_size, display_rotation) {
     // This function must exist to ensure that calls to it do not crash, but we
     // do not have any use for this data at present.
@@ -362,12 +352,21 @@ class MockRuntime {
         let dataProviderBinding = new mojo.Binding(
             device.mojom.XRFrameDataProvider, this, dataProviderRequest);
 
+        let environmentProviderPtr =
+            new device.mojom.XREnvironmentIntegrationProviderPtr();
+        let environmentProviderRequest =
+            mojo.makeRequest(environmentProviderPtr);
+        let environmentProviderBinding = new mojo.Binding(
+            device.mojom.XREnvironmentIntegrationProvider, this,
+            environmentProviderRequest);
+
         let clientRequest = mojo.makeRequest(this.sessionClient_);
 
         return Promise.resolve({
           session: {
             submitFrameSink: submit_frame_sink,
             dataProvider: dataProviderPtr,
+            environmentProvider: environmentProviderPtr,
             clientRequest: clientRequest,
             displayInfo: this.displayInfo_
           }