Revert of mojo VR interface simplified

device/vr/vr_service_impl.h

Index: device/vr/vr_service_impl.h
diff --git a/device/vr/vr_service_impl.h b/device/vr/vr_service_impl.h
index 778dc518ae6a2842f8fa48b789c40ac87fdeae3d..50a4471292a3ef56ea96dc61445dcef7959d95d6 100644
--- a/device/vr/vr_service_impl.h
+++ b/device/vr/vr_service_impl.h
@@ -9,47 +9,47 @@
 
 #include "base/macros.h"
 
-#include "device/vr/vr_device.h"
-#include "device/vr/vr_display_impl.h"
 #include "device/vr/vr_export.h"
 #include "device/vr/vr_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace device {
 
-class VRServiceImpl : public mojom::VRService {
+class VRServiceImpl : public VRService {
  public:
   DEVICE_VR_EXPORT ~VRServiceImpl() override;
 
   DEVICE_VR_EXPORT static void BindRequest(
-      mojo::InterfaceRequest<mojom::VRService> request);
+      mojo::InterfaceRequest<VRService> request);
 
-  mojom::VRServiceClient* client() { return client_.get(); }
-
-  VRDisplayImpl* GetVRDisplayImpl(VRDevice* device);
+  VRServiceClientPtr& client() { return client_; }
 
  private:
   friend class VRServiceTestBinding;
-  friend class VRDeviceManagerTest;
-  friend class VRDisplayImpl;
 
   DEVICE_VR_EXPORT VRServiceImpl();
 
   // Mojo connection handling.
-  DEVICE_VR_EXPORT void Bind(mojo::InterfaceRequest<mojom::VRService> request);
+  DEVICE_VR_EXPORT void Bind(mojo::InterfaceRequest<VRService> request);
   void RemoveFromDeviceManager();
-  void RemoveDevice(VRDevice* device);
 
   // mojom::VRService implementation
-  void SetClient(mojom::VRServiceClientPtr service_client,
-                 const SetClientCallback& callback) override;
+  void SetClient(VRServiceClientPtr client) override;
+  void GetDisplays(const GetDisplaysCallback& callback) override;
+  void GetPose(uint32_t index, const GetPoseCallback& callback) override;
+  void ResetPose(uint32_t index) override;
 
-  using DisplayImplMap = std::map<VRDevice*, std::unique_ptr<VRDisplayImpl>>;
-  DisplayImplMap displays_;
+  void RequestPresent(uint32_t index,
+                      bool secureOrigin,
+                      const RequestPresentCallback& callback) override;
+  void ExitPresent(uint32_t index) override;
+  void SubmitFrame(uint32_t index, VRPosePtr pose) override;
+  void UpdateLayerBounds(uint32_t index,
+                         VRLayerBoundsPtr leftBounds,
+                         VRLayerBoundsPtr rightBounds) override;
 
-  mojom::VRServiceClientPtr client_;
-
-  std::unique_ptr<mojo::Binding<mojom::VRService>> binding_;
+  std::unique_ptr<mojo::Binding<VRService>> binding_;
+  VRServiceClientPtr client_;
 
   DISALLOW_COPY_AND_ASSIGN(VRServiceImpl);
 };