mojo VR interface simplified

device/vr/android/gvr/gvr_device.h

Index: device/vr/android/gvr/gvr_device.h
diff --git a/device/vr/android/gvr/gvr_device.h b/device/vr/android/gvr/gvr_device.h
index 2f7baaa1fead43b188a6b15f419e36aedfc90e0b..20e547fc8c1bf570ce12c5fdcf2004a61663c28d 100644
--- a/device/vr/android/gvr/gvr_device.h
+++ b/device/vr/android/gvr/gvr_device.h
@@ -23,19 +23,25 @@ class GvrDevice : public VRDevice {
   ~GvrDevice() override;
 
   // VRDevice
-  VRDisplayPtr GetVRDevice() override;
-  VRPosePtr GetPose() override;
-  void ResetPose() override;
+  mojom::VRDisplayPtr GetVRDevice() override;
+  mojom::VRPosePtr GetPose(VRServiceImpl* service) override;
+  void ResetPose(VRServiceImpl* service) override;
 
-  bool RequestPresent(bool secure_origin) override;
-  void ExitPresent() override;
+  bool RequestPresent(VRServiceImpl* service, bool secure_origin) override;
+  void ExitPresent(VRServiceImpl* service) override;
 
-  void SubmitFrame(VRPosePtr pose) override;
-  void UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
-                         VRLayerBoundsPtr rightBounds) override;
+  void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) override;
+  void UpdateLayerBounds(VRServiceImpl* service,
+                         mojom::VRLayerBoundsPtr leftBounds,
+                         mojom::VRLayerBoundsPtr rightBounds) override;
 
   void SetDelegate(GvrDelegate* delegate);
 
+  void OnDisplayChanged() override;
+  void OnExitPresent(VRServiceImpl* service) override;
+  void OnDisplayConnected() override;
+  void OnDisplayDisconnected() override;
+
  private:
   gvr::GvrApi* GetGvrApi();