Ports VRService to be hosted in the device service.

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

 // 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/VRController.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/vr/NavigatorVR.h"
 #include "modules/vr/VRGetDevicesCallback.h"
-#include "public/platform/InterfaceProvider.h"
+#include "platform/ServiceConnector.h"
+#include "services/device/public/interfaces/constants.mojom-blink.h"
 
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 VRController::VRController(NavigatorVR* navigatorVR)
     : ContextLifecycleObserver(navigatorVR->document()),
       m_navigatorVR(navigatorVR),
       m_displaySynced(false),
       m_binding(this) {
-  navigatorVR->document()->frame()->interfaceProvider()->getInterface(
-      mojo::MakeRequest(&m_service));
-  m_service.set_connection_error_handler(convertToBaseCallback(

[ke.he, 2017/04/17 05:38:44]

del this by mistake.

-      WTF::bind(&VRController::dispose, wrapWeakPersistent(this))));
+  ServiceConnector::instance().connectToInterface(
+      device::mojom::blink::kServiceName, mojo::MakeRequest(&m_service));
   m_service->SetClient(
       m_binding.CreateInterfacePtrAndBind(),
       convertToBaseCallback(
           WTF::bind(&VRController::onDisplaysSynced, wrapPersistent(this))));
 }
 
 VRController::~VRController() {}
 
 void VRController::getDisplays(ScriptPromiseResolver* resolver) {
   // If we've previously synced the VRDisplays or no longer have a valid service
@@ skipping 73 matching lines @@
 }
 
 DEFINE_TRACE(VRController) {
   visitor->trace(m_navigatorVR);
   visitor->trace(m_displays);
 
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink