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 50a4471292a3ef56ea96dc61445dcef7959d95d6..373ad72783d1b248e296d141387274a7e7ead995 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_device_client_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 VRService {
+class VRServiceImpl : public mojom::VRService {
  public:
   DEVICE_VR_EXPORT ~VRServiceImpl() override;
 
   DEVICE_VR_EXPORT static void BindRequest(
-      mojo::InterfaceRequest<VRService> request);
+      mojo::InterfaceRequest<mojom::VRService> request);
 
-  VRServiceClientPtr& client() { return client_; }
+  mojom::VRDevicePtr GetDevicePtr(VRDevice* device);
+  mojom::VRDisplayClientPtr GetDisplayClient();
 
  private:
   friend class VRServiceTestBinding;
+  friend class VRDeviceManagerTest;
+  friend class VRDeviceClientImpl;
 
   DEVICE_VR_EXPORT VRServiceImpl();
 
   // Mojo connection handling.
-  DEVICE_VR_EXPORT void Bind(mojo::InterfaceRequest<VRService> request);
+  DEVICE_VR_EXPORT void Bind(mojo::InterfaceRequest<mojom::VRService> request);
   void RemoveFromDeviceManager();
+  void RemoveDeviceClientImpl(VRDevice* device);
 
   // mojom::VRService implementation
-  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;
-
-  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;
-
-  std::unique_ptr<mojo::Binding<VRService>> binding_;
-  VRServiceClientPtr client_;
+  void SetClient(mojom::VRServiceClientPtr client) override;
+
+  using DeviceClientMap =
+      std::map<VRDevice*, std::unique_ptr<VRDeviceClientImpl>>;
+  DeviceClientMap device_client_impl_;
+
+  mojom::VRServiceClientPtr client_;
+
+  std::unique_ptr<mojo::Binding<mojom::VRService>> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(VRServiceImpl);
 };