Refactored VRService interaction and added VRServiceClient

third_party/WebKit/Source/modules/vr/VRDisplayCollection.cpp

Index: third_party/WebKit/Source/modules/vr/VRDisplayCollection.cpp
diff --git a/third_party/WebKit/Source/modules/vr/VRDisplayCollection.cpp b/third_party/WebKit/Source/modules/vr/VRDisplayCollection.cpp
deleted file mode 100644
index 5c717505213583bf503b2cfe8ec26acccff88588..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/modules/vr/VRDisplayCollection.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "modules/vr/VRDisplayCollection.h"
-
-#include "modules/vr/NavigatorVR.h"
-
-namespace blink {
-
-VRDisplayCollection::VRDisplayCollection(NavigatorVR* navigatorVR)
-    : m_navigatorVR(navigatorVR)
-{
-}
-
-VRDisplayVector VRDisplayCollection::updateDisplays(mojo::WTFArray<device::blink::VRDisplayPtr> displays)
-{
-    VRDisplayVector vrDisplays;
-
-    for (const auto& display : displays.PassStorage()) {
-        VRDisplay* vrDisplay = getDisplayForIndex(display->index);
-        if (!vrDisplay) {
-            vrDisplay = new VRDisplay(m_navigatorVR);
-            m_displays.append(vrDisplay);
-        }
-
-        vrDisplay->update(display);
-        vrDisplays.append(vrDisplay);
-    }
-
-    return vrDisplays;
-}
-
-VRDisplay* VRDisplayCollection::getDisplayForIndex(unsigned index)
-{
-    VRDisplay* display;
-    for (size_t i = 0; i < m_displays.size(); ++i) {
-        display = m_displays[i];
-        if (display->displayId() == index) {
-            return display;
-        }
-    }
-
-    return 0;
-}
-
-DEFINE_TRACE(VRDisplayCollection)
-{
-    visitor->trace(m_navigatorVR);
-    visitor->trace(m_displays);
-}
-
-} // namespace blink