mojo VR interface simplified

device/vr/android/gvr/gvr_device_provider.h

Index: device/vr/android/gvr/gvr_device_provider.h
diff --git a/device/vr/android/gvr/gvr_device_provider.h b/device/vr/android/gvr/gvr_device_provider.h
index bb64966750e0d058b90ce98ad88f891bf0d5a7f2..aaab7800eb2a257b0f9b2fc70f850e04c6c2905b 100644
--- a/device/vr/android/gvr/gvr_device_provider.h
+++ b/device/vr/android/gvr/gvr_device_provider.h
@@ -9,7 +9,6 @@
 
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
-#include "device/vr/vr_client_dispatcher.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_device_provider.h"
 #include "device/vr/vr_export.h"
@@ -19,14 +18,16 @@ namespace device {
 class GvrDelegate;
 class GvrDevice;
 class GvrNonPresentingDelegate;
+class VRServiceImpl;
 
 class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider {
  public:
   GvrDeviceProvider();
   ~GvrDeviceProvider() override;
 
-  void GetDevices(std::vector<VRDevice*>* devices) override;
-  void Initialize() override;
+  void GetDevices(std::vector<VRServiceImpl*>* clients,
+                  std::vector<VRDevice*>* devices) override;
+  void Initialize(std::vector<VRServiceImpl*>* clients) override;
 
   // Called from GvrDevice
   bool RequestPresent();
@@ -36,13 +37,10 @@ class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider {
   void OnGvrDelegateReady(GvrDelegate* delegate);
   void OnGvrDelegateRemoved();
 
-  void SetClient(VRClientDispatcher* client) override;
-
  private:
   void GvrDelegateReady(GvrDelegate* delegate);
   void GvrDelegateRemoved();
 
-  std::unique_ptr<VRClientDispatcher> client_;
   std::unique_ptr<GvrDevice> vr_device_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;