Reland 2617183002 without offending tests

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',
     ]).then(mojo => {
   let [bindings, vr_service] = mojo.modules;
 
   class MockVRDisplay {
@@ skipping 49 matching lines @@
 
       var device_number = (this.vrDisplays_== null ? 0 : this.vrDisplays_.length);
       return Promise.resolve({numberOfConnectedDevices: device_number});
     }
   }
 
   return new MockVRService(mojo.frameInterfaces);
 });
 
 function vr_test(func, vrDisplays, name, properties) {
-  promise_test(t => mockVRService.then((service) => {
+  mockVRService.then( (service) => {
     service.setVRDisplays(vrDisplays);
-    return func();
-  }), name, properties);
+    let t = async_test(name, properties);
+    func(t);
+  });
 }