Revert of Add more WebVR layout tests, adjust test format

third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html

Index: third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html
diff --git a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html
index 48db70b5c8c5ba27496bfa1aaf383f36150d8d2d..d45e05b8784337ff79af7d33d4eb8495063259d7 100644
--- a/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html
+++ b/third_party/WebKit/LayoutTests/vr/requestPresent_resolve_webgl2.html
@@ -9,36 +9,33 @@
 <script>
 let fakeDisplays = fakeVRDisplays();
 
-vr_test( (t) => {
+vr_test((service) => {
   if (!gl) {
     // WebGL 2 is not supported. This is legal.
-    t.done();
     return Promise.resolve();
+  } else {
+    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();
+          });
+        });
+      });
   }
-
-  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);
-        }, "Should never reach here");
-      }).then( () => {
-        t.done();
-      });
-    });
-  }, (err) => {
-    t.step( () => {
-      assert_unreached(err);
-    }, "getVRDisplays rejected");
-    t.done();
-  });
-}, [fakeDisplays["Pixel"]],
-"Test requestPresent resolves when provided a WebGL2 canvas");
+}, [fakeDisplays['Pixel']],
+'Test requestPresent resolves when provided a WebGL2 canvas');
 
 </script>