Revert of Add more WebVR layout tests, adjust test format

third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js

Index: third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js
diff --git a/third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js b/third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js
index 73dccc7c0191e88769d4888487f3197e7276ea27..ce8fb489fdec0a75500a2f005d5b9a88d6ab255a 100644
--- a/third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js
+++ b/third_party/WebKit/LayoutTests/vr/resources/fake-vr-displays.js
@@ -8,55 +8,29 @@
     rightDegrees : 45,
   };
 
-  let generic_left_eye = {
-    fieldOfView : generic_fov,
-    offset : [-0.03, 0, 0],
-    renderWidth : 1024,
-    renderHeight : 1024
-  };
-
-  let generic_right_eye = {
-    fieldOfView :generic_fov,
-    offset : [0.03, 0, 0],
-    renderWidth : 1024,
-    renderHeight : 1024
-  };
-
   return {
     FakeMagicWindowOnly: {
       displayName : "FakeVRDisplay",
       capabilities : {
         hasOrientation : true,
         hasPosition : false,
-        hasExternalDisplay : false,
+        hasExternalDisplay : true,
         canPresent : false
       },
       stageParameters : null,
-      leftEye : generic_left_eye,
-      rightEye : generic_right_eye,
+      leftEye : {
+        fieldOfView: generic_fov,
+        offset : [-0.03, 0, 0],
+        renderWidth: 1024,
+        renderHeight: 1024
+      },
+      rightEye : {
+        fieldOfView : generic_fov,
+        offset : [0.03, 0, 0],
+        renderWidth: 1024,
+        renderHeight: 1024
+      }
     },
-
-    FakeRoomScale: {
-      displayName : "FakeVRDisplayRoom",
-      capabilities : {
-        hasOrientation : true,
-        hasPosition : true,
-        hasExternalDisplay : true,
-        canPresent : true,
-        maxLayers : 1
-      },
-      stageParameters : {
-        standingTransform : [0.0, 0.1, 0.2, 0.3,
-                             0.4, 0.5, 0.6, 0.7,
-                             0.8, 0.9, 1.0, 0.1,
-                             0.2, 0.3, 0.4, 0.5],
-        sizeX : 5.0,
-        sizeZ : 3.0,
-      },
-      leftEye : generic_left_eye,
-      rightEye : generic_right_eye,
-    },
-
     Pixel: { // Pixel info as of Dec. 22 2016
       displayName : "Google, Inc. Daydream View",
       capabilities : {
@@ -64,7 +38,7 @@
         hasPosition : false,
         hasExternalDisplay : false,
         canPresent : true,
-        maxLayers : 1
+        maxLayers: 1
       },
       stageParameters : null,
       leftEye : {