Reland 2617183002 without offending tests

third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html

Index: third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html
diff --git a/third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html b/third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html
index 5e4bd6a98eb50a9befc9ef30f643a24ecc792698..a4fed9327e3febed535bbacc2a7f87acd35905f1 100644
--- a/third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html
+++ b/third_party/WebKit/LayoutTests/vr/requestPresent_reject_notsupported.html
@@ -9,27 +9,30 @@
 <script>
 let fakeDisplays = fakeVRDisplays();
 
-vr_test((service) => {
-  return navigator.getVRDisplays().then(displays => {
-      assert_true(displays != null);
-      assert_equals(1, displays.length);
-      var asyncTest = async_test(
-          "requestPresent rejects and does not present");
-      runWithUserGesture( () => {
-        displays[0].requestPresent([{ source : webglCanvas }]).then( () => {
-          asyncTest.step( () => {
-            assert_unreached();
-          }, "Display should not be presenting");
-        }, (err) => {
-          asyncTest.step( () => {
-            assert_false(displays[0].isPresenting);
-          }, "requestPresent rejected and not presenting");
-        }).then( () => {
-          asyncTest.done();
-        });
+vr_test( (t) => {
+  return navigator.getVRDisplays().then( (displays) => {
+    var display = displays[0];
+
+    runWithUserGesture( () => {
+      display.requestPresent([{ source : webglCanvas }]).then( () => {
+        t.step( () => {
+          assert_unreached();
+        }, "Display should not be presenting");
+      }, (err) => {
+        t.step( () => {
+          assert_false(display.isPresenting);
+        }, "requestPresent rejected and not presenting");
+      }).then( () => {
+        t.done();
       });
     });
-}, [fakeDisplays['FakeMagicWindowOnly']],
-'Test requestPresent rejects if display does not support it');
+  }, (err) => {
+    t.step( () => {
+      assert_unreached(err);
+    }, "getVRDisplays rejected");
+    t.done();
+  });
+}, [fakeDisplays["FakeMagicWindowOnly"]],
+"Test requestPresent rejects if display does not support it");
 
 </script>