Revert of mojo VR interface simplified

device/vr/vr_device.h

Index: device/vr/vr_device.h
diff --git a/device/vr/vr_device.h b/device/vr/vr_device.h
index 81bbf5e564a8ae7731e9abcfed6fec49f79c64fd..4121cfcba2268b2b4bd6b17d4bafc9d6e6a1dc0b 100644
--- a/device/vr/vr_device.h
+++ b/device/vr/vr_device.h
@@ -20,8 +20,6 @@
 namespace device {
 
 class VRDeviceProvider;
-class VRDisplayImpl;
-class VRServiceImpl;
 
 const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF;
 
@@ -33,38 +31,15 @@
   VRDeviceProvider* provider() const { return provider_; }
   unsigned int id() const { return id_; }
 
-  virtual mojom::VRDisplayInfoPtr GetVRDevice() = 0;
-  virtual mojom::VRPosePtr GetPose(VRServiceImpl* service) = 0;
-  virtual void ResetPose(VRServiceImpl* service) = 0;
+  virtual VRDisplayPtr GetVRDevice() = 0;
+  virtual VRPosePtr GetPose() = 0;
+  virtual void ResetPose() = 0;
 
-  virtual bool RequestPresent(VRServiceImpl* service, bool secure_origin) = 0;
-  virtual void ExitPresent(VRServiceImpl* service) = 0;
-  virtual void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) = 0;
-  virtual void UpdateLayerBounds(VRServiceImpl* service,
-                                 mojom::VRLayerBoundsPtr leftBounds,
-                                 mojom::VRLayerBoundsPtr rightBounds) = 0;
-
-  virtual void AddService(VRServiceImpl* service);
-  virtual void RemoveService(VRServiceImpl* service);
-
-  // TODO(shaobo.yan@intel.com): Checks should be done against VRDisplayImpl and
-  // the name should be considered.
-  virtual bool IsAccessAllowed(VRServiceImpl* service);
-  virtual bool IsPresentingService(VRServiceImpl* service);
-
-  virtual void OnDisplayChanged();
-  virtual void OnExitPresent(VRServiceImpl* service);
-
- protected:
-  // Each Service have one VRDisplay with one VRDevice.
-  // TODO(shaobo.yan@intel.com): Since the VRDisplayImpl knows its VRServiceImpl
-  // we should
-  // only need to store the VRDisplayImpl.
-  using DisplayClientMap = std::map<VRServiceImpl*, VRDisplayImpl*>;
-  DisplayClientMap displays_;
-
-  // TODO(shaobo.yan@intel.com): Should track presenting VRDisplayImpl instead.
-  VRServiceImpl* presenting_service_;
+  virtual bool RequestPresent(bool secure_origin);
+  virtual void ExitPresent(){};
+  virtual void SubmitFrame(VRPosePtr pose){};
+  virtual void UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
+                                 VRLayerBoundsPtr rightBounds){};
 
  private:
   VRDeviceProvider* provider_;