Reland 2617183002 without offending tests

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

Index: third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js
diff --git a/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js b/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js
index a4864eebb77f1c7c4f74e8ef00d550487e666831..aafb971d91c4451bc6e4ae20b4c48ae08a15f986 100644
--- a/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js
+++ b/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js
@@ -67,8 +67,9 @@ let mockVRService = loadMojoModules(
 });
 
 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);
+  });
 }