Revert of Add more WebVR layout tests, adjust test format

third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html

Index: third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html
diff --git a/third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html b/third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html
index a15642ebb7f777b797d4b2eabf3ad90e120308cd..4ca4b9320b5650a47deccd4fb30a0c6885d8fc5d 100644
--- a/third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html
+++ b/third_party/WebKit/LayoutTests/vr/requestPresent_reject_toomanylayers.html
@@ -9,35 +9,32 @@
 <script>
 let fakeDisplays = fakeVRDisplays();
 
-vr_test( (t) => {
-  return navigator.getVRDisplays().then( (displays) => {
-    var display = displays[0];
-    var max_layers = display.capabilities.maxLayers;
-    var layers = [];
-    for (var i = 0; i <= max_layers; ++i) {
-      layers.push({ source : webglCanvas });
-    }
-
-    runWithUserGesture( () => {
-      display.requestPresent(layers).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();
+vr_test((service) => {
+  return navigator.getVRDisplays().then(displays => {
+      assert_true(displays != null);
+      assert_equals(1, displays.length);
+      var max_layers = displays[0].capabilities.maxLayers;
+      var layers = [];
+      for (var i = 0; i <= max_layers; ++i) {
+        layers.push({ source : webglCanvas });
+      }
+      var asyncTest = async_test(
+          "requestPresent rejects and does not present");
+      runWithUserGesture( () => {
+        displays[0].requestPresent(layers).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();
+        });
       });
     });
-  }, (err) => {
-    t.step( () => {
-      assert_unreached(err);
-    }, "getVRDisplays rejected");
-    t.done();
-  });
-}, [fakeDisplays["Pixel"]],
-"Test requestPresent rejects if provided too many layers");
+}, [fakeDisplays['Pixel']],
+'Test requestPresent rejects if provided too many layers');
 
 </script>