Refactored VRService interaction and added VRServiceClient

third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h

Index: third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h
diff --git a/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h b/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h
index 158e665d2a60d50808869174cdb3d1b0d95d793d..37f3338e9261d5a2d35db911298efb796be965ef 100644
--- a/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h
+++ b/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h
@@ -6,29 +6,27 @@
 #define VRGetDevicesCallback_h
 
 #include "device/vr/vr_service.mojom-blink.h"
+#include "modules/vr/VRDisplay.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebCallbacks.h"
-#include "public/platform/WebVector.h"
 
 namespace blink {
 
-class VRDisplayCollection;
 class ScriptPromiseResolver;
 
 // Success and failure callbacks for getDisplays.
-using WebVRGetDisplaysCallback = WebCallbacks<mojo::WTFArray<device::blink::VRDisplayPtr>, void>;
+using WebVRGetDisplaysCallback = WebCallbacks<VRDisplayVector, void>;
 class VRGetDevicesCallback final : public WebVRGetDisplaysCallback {
     USING_FAST_MALLOC(VRGetDevicesCallback);
 public:
-    VRGetDevicesCallback(ScriptPromiseResolver*, VRDisplayCollection*);
+    VRGetDevicesCallback(ScriptPromiseResolver*);
     ~VRGetDevicesCallback() override;
 
-    void onSuccess(mojo::WTFArray<device::blink::VRDisplayPtr>) override;
+    void onSuccess(VRDisplayVector) override;
     void onError() override;
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
-    Persistent<VRDisplayCollection> m_displays;
 };
 
 } // namespace blink