mojo VR interface simplified

third_party/WebKit/Source/modules/vr/VRController.h

Index: third_party/WebKit/Source/modules/vr/VRController.h
diff --git a/third_party/WebKit/Source/modules/vr/VRController.h b/third_party/WebKit/Source/modules/vr/VRController.h
index 9c8b5b85f09bbc8588cff718159b02d1ab312247..e2a31f5e582bce9824c8c34738bcdfa9bf8e5083 100644
--- a/third_party/WebKit/Source/modules/vr/VRController.h
+++ b/third_party/WebKit/Source/modules/vr/VRController.h
@@ -21,7 +21,6 @@ class NavigatorVR;
 class VRGetDevicesCallback;
 
 class VRController final : public GarbageCollectedFinalized<VRController>,
-                           public device::blink::VRServiceClient,
                            public ContextLifecycleObserver {
   USING_GARBAGE_COLLECTED_MIXIN(VRController);
   WTF_MAKE_NONCOPYABLE(VRController);
@@ -32,33 +31,17 @@ class VRController final : public GarbageCollectedFinalized<VRController>,
 
   // VRService.
   void getDisplays(ScriptPromiseResolver*);
-  device::blink::VRPosePtr getPose(unsigned index);
-  void resetPose(unsigned index);
-  void requestPresent(ScriptPromiseResolver*,
-                      unsigned index,
-                      bool secureOrigin);
-  void exitPresent(unsigned index);
-  void submitFrame(unsigned index, device::blink::VRPosePtr);
-  void updateLayerBounds(unsigned index,
-                         device::blink::VRLayerBoundsPtr leftBounds,
-                         device::blink::VRLayerBoundsPtr rightBounds);
 
   VRDisplay* createOrUpdateDisplay(const device::blink::VRDisplayPtr&);
-  VRDisplayVector updateDisplays(mojo::WTFArray<device::blink::VRDisplayPtr>);
+  VRDisplayVector updateDisplays(
+      mojo::WTFArray<device::blink::VRDisplayWithServicePtr>);
   VRDisplay* getDisplayForIndex(unsigned index);
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   // Binding callbacks.
-  void onGetDisplays(mojo::WTFArray<device::blink::VRDisplayPtr>);
-  void onPresentComplete(ScriptPromiseResolver*, unsigned index, bool success);
-
-  // VRServiceClient.
-  void OnDisplayChanged(device::blink::VRDisplayPtr) override;
-  void OnExitPresent(unsigned index) override;
-  void OnDisplayConnected(device::blink::VRDisplayPtr) override;
-  void OnDisplayDisconnected(unsigned) override;
+  void onGetDisplays(mojo::WTFArray<device::blink::VRDisplayWithServicePtr>);
 
   // ContextLifecycleObserver.
   void contextDestroyed() override;
@@ -68,7 +51,6 @@ class VRController final : public GarbageCollectedFinalized<VRController>,
 
   Deque<std::unique_ptr<VRGetDevicesCallback>> m_pendingGetDevicesCallbacks;
   device::blink::VRServicePtr m_service;
-  mojo::Binding<device::blink::VRServiceClient> m_binding;
 };
 
 }  // namespace blink