Revert of mojo VR interface simplified

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

Index: third_party/WebKit/Source/modules/vr/VRDisplay.h
diff --git a/third_party/WebKit/Source/modules/vr/VRDisplay.h b/third_party/WebKit/Source/modules/vr/VRDisplay.h
index 8c69834f4b27338442a2ac49a8d3a95244ef00de..9b12cfecda8be5b9be99b98cad360617536d2b87 100644
--- a/third_party/WebKit/Source/modules/vr/VRDisplay.h
+++ b/third_party/WebKit/Source/modules/vr/VRDisplay.h
@@ -11,7 +11,6 @@
 #include "device/vr/vr_service.mojom-blink.h"
 #include "modules/vr/VRDisplayCapabilities.h"
 #include "modules/vr/VRLayer.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebGraphicsContext3DProvider.h"
@@ -39,10 +38,8 @@
 enum VREye { VREyeNone, VREyeLeft, VREyeRight };
 
 class VRDisplay final : public GarbageCollectedFinalized<VRDisplay>,
-                        public device::mojom::blink::VRDisplayClient,
                         public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
-  USING_PRE_FINALIZER(VRDisplay, dispose);
 
  public:
   ~VRDisplay();
@@ -84,11 +81,9 @@
  protected:
   friend class VRController;
 
-  VRDisplay(NavigatorVR*,
-            device::mojom::blink::VRDisplayPtr,
-            device::mojom::blink::VRDisplayClientRequest);
+  VRDisplay(NavigatorVR*);
 
-  void update(const device::mojom::blink::VRDisplayInfoPtr&);
+  void update(const device::blink::VRDisplayPtr&);
 
   void updatePose();
 
@@ -102,14 +97,6 @@
 
  private:
   void onFullscreenCheck(TimerBase*);
-  void onPresentComplete(ScriptPromiseResolver*, bool);
-
-  void onDisplayConnected();
-  void onDisplayDisconnected();
-
-  // VRDisplayClient
-  void OnDisplayChanged(device::mojom::blink::VRDisplayInfoPtr) override;
-  void OnExitPresent() override;
 
   ScriptedAnimationController& ensureScriptedAnimationController(Document*);
 
@@ -124,12 +111,10 @@
   Member<VRStageParameters> m_stageParameters;
   Member<VREyeParameters> m_eyeParametersLeft;
   Member<VREyeParameters> m_eyeParametersRight;
-  device::mojom::blink::VRPosePtr m_framePose;
+  device::blink::VRPosePtr m_framePose;
   VRLayer m_layer;
   double m_depthNear;
   double m_depthFar;
-
-  void dispose();
 
   Timer<VRDisplay> m_fullscreenCheckTimer;
   gpu::gles2::GLES2Interface* m_contextGL;
@@ -138,10 +123,6 @@
   Member<ScriptedAnimationController> m_scriptedAnimationController;
   bool m_animationCallbackRequested;
   bool m_inAnimationFrame;
-
-  device::mojom::blink::VRDisplayPtr m_display;
-
-  mojo::Binding<device::mojom::blink::VRDisplayClient> m_binding;
 };
 
 using VRDisplayVector = HeapVector<Member<VRDisplay>>;