Revert of mojo VR interface simplified

device/vr/test/fake_vr_device.cc

Index: device/vr/test/fake_vr_device.cc
diff --git a/device/vr/test/fake_vr_device.cc b/device/vr/test/fake_vr_device.cc
index a011c7735b1abca6ee698342cfa78a30cd291758..48e7138dd074fb2199c9a7f0b1748ff9feea5757 100644
--- a/device/vr/test/fake_vr_device.cc
+++ b/device/vr/test/fake_vr_device.cc
@@ -7,8 +7,8 @@
 namespace device {
 
 FakeVRDevice::FakeVRDevice(VRDeviceProvider* provider) : VRDevice(provider) {
-  device_ = mojom::VRDisplayInfo::New();
-  pose_ = mojom::VRPose::New();
+  device_ = VRDisplay::New();
+  pose_ = VRPose::New();
 
   InitBasicDevice();
 }
@@ -18,7 +18,7 @@
 void FakeVRDevice::InitBasicDevice() {
   device_->displayName = "FakeVRDevice";
 
-  device_->capabilities = mojom::VRDisplayCapabilities::New();
+  device_->capabilities = VRDisplayCapabilities::New();
   device_->capabilities->hasOrientation = true;
   device_->capabilities->hasPosition = false;
   device_->capabilities->hasExternalDisplay = false;
@@ -28,12 +28,12 @@
   device_->rightEye = InitEye(45, 0.03f, 1024);
 }
 
-mojom::VREyeParametersPtr FakeVRDevice::InitEye(float fov,
-                                                float offset,
-                                                uint32_t size) {
-  mojom::VREyeParametersPtr eye = mojom::VREyeParameters::New();
+VREyeParametersPtr FakeVRDevice::InitEye(float fov,
+                                         float offset,
+                                         uint32_t size) {
+  VREyeParametersPtr eye = VREyeParameters::New();
 
-  eye->fieldOfView = mojom::VRFieldOfView::New();
+  eye->fieldOfView = VRFieldOfView::New();
   eye->fieldOfView->upDegrees = fov;
   eye->fieldOfView->downDegrees = fov;
   eye->fieldOfView->leftDegrees = fov;
@@ -50,36 +50,24 @@
   return eye;
 }
 
-void FakeVRDevice::SetVRDevice(const mojom::VRDisplayInfoPtr& device) {
+void FakeVRDevice::SetVRDevice(const VRDisplayPtr& device) {
   device_ = device.Clone();
 }
 
-void FakeVRDevice::SetPose(const mojom::VRPosePtr& pose) {
+void FakeVRDevice::SetPose(const VRPosePtr& pose) {
   pose_ = pose.Clone();
 }
 
-mojom::VRDisplayInfoPtr FakeVRDevice::GetVRDevice() {
-  mojom::VRDisplayInfoPtr display = device_.Clone();
+VRDisplayPtr FakeVRDevice::GetVRDevice() {
+  VRDisplayPtr display = device_.Clone();
+  display->index = id();
   return display.Clone();
 }
 
-mojom::VRPosePtr FakeVRDevice::GetPose(VRServiceImpl* service) {
+VRPosePtr FakeVRDevice::GetPose() {
   return pose_.Clone();
 }
 
-void FakeVRDevice::ResetPose(VRServiceImpl* service) {}
-
-// TODO(shaobo.yan@intel.com): Will implemenate for VRDeviceServiceImpl tests.
-bool FakeVRDevice::RequestPresent(VRServiceImpl* service, bool secure_origin) {
-  return true;
-}
-
-void FakeVRDevice::ExitPresent(VRServiceImpl* service) {}
-
-void FakeVRDevice::SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) {}
-
-void FakeVRDevice::UpdateLayerBounds(VRServiceImpl* service,
-                                     mojom::VRLayerBoundsPtr leftBounds,
-                                     mojom::VRLayerBoundsPtr rightBounds) {}
+void FakeVRDevice::ResetPose() {}
 
 }  // namespace device