Ports VRService to be hosted in the device service.

third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js

 'use strict';
 
 let mockVRService = loadMojoModules(
     'mockVRService',
     ['mojo/public/js/bindings',
      'device/vr/vr_service.mojom',
+     'services/device/public/interfaces/constants.mojom',
     ]).then(mojo => {
-  let [bindings, vr_service] = mojo.modules;
+  let [bindings, vr_service, deviceConstants] = mojo.modules;
 
   class MockVRDisplay {
     constructor(interfaceProvider, displayInfo, service) {
       this.bindingSet_ = new bindings.BindingSet(vr_service.VRDisplay);
       this.displayClient_ = new vr_service.VRDisplayClientPtr();
       this.displayInfo_ = displayInfo;
       this.service_ = service;
       this.vsync_provider_ = new MockVRVSyncProvider();
 
       interfaceProvider.addInterfaceOverrideForTesting(
+          deviceConstants.kServiceName,
           vr_service.VRDisplay.name,
           handle => this.bindingSet_.addBinding(this, handle));
 
       if (service.client_) {
         this.notifyClientOfDisplay();
       }
     }
 
     requestPresent(secureOrigin) {
       return Promise.resolve({success: true});
@@ skipping 72 matching lines @@
       }
     }
   }
 
   class MockVRService {
     constructor(interfaceProvider) {
       this.bindingSet_ = new bindings.BindingSet(vr_service.VRService);
       this.mockVRDisplays_ = [];
 
       interfaceProvider.addInterfaceOverrideForTesting(
+          deviceConstants.kServiceName,
           vr_service.VRService.name,
           handle => this.bindingSet_.addBinding(this, handle));
     }
 
     setVRDisplays(displays) {
       this.mockVRDisplays_ = [];
       for (let i = 0; i < displays.length; i++) {
         displays[i].index = i;
-        this.mockVRDisplays_.push(new MockVRDisplay(mojo.frameInterfaces,
+        this.mockVRDisplays_.push(new MockVRDisplay(mojo.connector,
               displays[i], this));
       }
     }
 
     addVRDisplay(display) {
       if (this.mockVRDisplays_.length) {
         display.index =
             this.mockVRDisplays_[this.mockVRDisplays_.length - 1] + 1;
       } else {
         display.index = 0;
       }
-      this.mockVRDisplays_.push(new MockVRDisplay(mojo.frameInterfaces,
+      this.mockVRDisplays_.push(new MockVRDisplay(mojo.connector,
             display, this));
     }
 
     setClient(client) {
       this.client_ = client;
       for (let i = 0; i < this.mockVRDisplays_.length; i++) {
         this.mockVRDisplays_[i].notifyClientOfDisplay();
       }
 
       let device_number = this.mockVRDisplays_.length;
       return Promise.resolve({numberOfConnectedDevices: device_number});
     }
   }
 
-  return new MockVRService(mojo.frameInterfaces);
+  return new MockVRService(mojo.connector);
 });
 
 function vr_test(func, vrDisplays, name, properties) {
   mockVRService.then( (service) => {
     service.setVRDisplays(vrDisplays);
     let t = async_test(name, properties);
     func(t, service);
   });
 }