Reland 2617183002 without offending tests

third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html

Index: third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html
diff --git a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html
index 1f2e6d5e3557a8ae9194ab845513522ef64dcf2a..7e381b3a3c5bc0a456501d34f655b58bb6a3784d 100644
--- a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html
+++ b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_repeatwithoutgesture.html
@@ -9,43 +9,46 @@
 <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 resolves and actually presents");
-      runWithUserGesture( () => {
-        displays[0].requestPresent([{ source : webglCanvas }]).then( () => {
-          asyncTest.step( () => {
-            assert_true(displays[0].isPresenting);
-          }, "Display should be presenting");
+vr_test( (t) => {
+  return navigator.getVRDisplays().then( (displays) => {
+    var display = displays[0];
 
-          // Call requestPresent again after a short delay, but without a user
-          // gesture. Should resolve because it's already presenting.
-          setTimeout(() => {
-            displays[0].requestPresent([{ source : webglCanvas }]).then( () => {
-              asyncTest.step( () => {
-                assert_true(displays[0].isPresenting);
-              }, "Display should still be presenting");
-            }, (err) => {
-              asyncTest.step( () => {
-                assert_unreached(err);
-              }, "Should never reach here");
-            }).then( () => {
-              asyncTest.done();
-            });
-          }, 100);
+    runWithUserGesture( () => {
+      display.requestPresent([{ source : webglCanvas }]).then( () => {
+        t.step( () => {
+          assert_true(display.isPresenting);
+        }, "Display should be presenting");
 
-        }, (err) => {
-          asyncTest.step( () => {
-            assert_unreached(err);
-          }, "Should never reach here");
-          asyncTest.done();
-        });
+        // Call requestPresent again after a short delay, but without a user
+        // gesture. Should resolve because it's already presenting.
+        setTimeout( () => {
+          display.requestPresent([{ source : webglCanvas }]).then( () => {
+            t.step( () => {
+              assert_true(display.isPresenting);
+            }, "Display should still be presenting");
+          }, (err) => {
+            t.step( () => {
+              assert_unreached(err);
+            }, "Should never reach here");
+          }).then( () => {
+            t.done();
+          });
+        }, 100);
+
+      }, (err) => {
+        t.step( () => {
+          assert_unreached(err);
+        }, "Should never reach here");
+        t.done();
       });
     });
-}, [fakeDisplays['Pixel']],
-'Test requestPresent resolves without a user gesture when already presenting');
+  }, (err) => {
+    t.step( () => {
+      assert_unreached(err);
+    }, "getVRDisplays rejected");
+    t.done();
+  });
+}, [fakeDisplays["Pixel"]],
+"Test requestPresent resolves without a user gesture when already presenting");
 
 </script>