Revert of Add more WebVR layout tests, adjust test format

third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html

Index: third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html
diff --git a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html
index 5f23410b2bedc918992f12df7f491bb91b46d665..47a5a5548b9d78f96e50933d83951b577c429185 100644
--- a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html
+++ b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve.html
@@ -9,30 +9,27 @@
 <script>
 let fakeDisplays = fakeVRDisplays();
 
-vr_test( (t) => {
-  return navigator.getVRDisplays().then( (displays) => {
-    var display = displays[0];
-
-    runWithUserGesture( () => {
-      display.requestPresent([{ source : webglCanvas }]).then( () => {
-        t.step( () => {
-          assert_true(display.isPresenting);
-        }, "Display should be presenting");
-      }, (err) => {
-        t.step( () => {
-          assert_unreached(err);
-        }, "requestPresent rejected");
-      }).then( () => {
-        t.done();
+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");
+        }, (err) => {
+          asyncTest.step( () => {
+            assert_unreached(err);
+          }, "Should never reach here");
+        }).then( () => {
+          asyncTest.done();
+        });
       });
     });
-  }, (err) => {
-    t.step( () => {
-      assert_unreached();
-    }, "getVRDisplays rejected");
-    t.done();
-  });
-}, [fakeDisplays["Pixel"]],
-"Test requestPresent resolves");
+}, [fakeDisplays['Pixel']],
+'Test requestPresent resolves');
 
 </script>