Revert of 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 02f77583ffe40b6b46863e8073ab45194a29c8a0..23f8cb0832ebf83444db07b1a4d77cf6beffd24d 100644
--- a/device/vr/android/gvr/gvr_device_provider.h
+++ b/device/vr/android/gvr/gvr_device_provider.h
@@ -9,6 +9,7 @@
 
 #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"
@@ -17,7 +18,6 @@
 
 class GvrDelegate;
 class GvrDevice;
-class VRServiceImpl;
 
 class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider {
  public:
@@ -35,10 +35,13 @@
   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_;