Bug 1446275 [wpt PR 10068] - Revert "rename generic-sensor directory as sensors", a=testonly
authorWanming Lin <wanming.lin@intel.com>
Mon, 09 Apr 2018 17:27:36 +0000
changeset 467132 340f28fac78a794b23dade490620ce4abaceae8c
parent 467131 9cfa39c68846284152e6b171f1f5b68a6929b59d
child 467133 8480e65de658780eaab84835d33e2ebf9adab775
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1446275, 10068
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1446275 [wpt PR 10068] - Revert "rename generic-sensor directory as sensors", a=testonly Automatic update from web-platform-testsRevert "rename generic-sensor directory as sensors" (#10068) wpt-commits: 66e0742f88e4a6a10aaf4bd887a29b1062aad9c8 wpt-pr: 10068 wpt-commits: 66e0742f88e4a6a10aaf4bd887a29b1062aad9c8 wpt-pr: 10068
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
testing/web-platform/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/accelerometer/Accelerometer.https.html
testing/web-platform/tests/accelerometer/Accelerometer_insecure_context.html
testing/web-platform/tests/accelerometer/Accelerometer_onerror-manual.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor.https.html
testing/web-platform/tests/ambient-light/AmbientLightSensor_insecure_context.html
testing/web-platform/tests/ambient-light/AmbientLightSensor_onerror-manual.https.html
testing/web-platform/tests/generic-sensor/OWNERS
testing/web-platform/tests/generic-sensor/SensorErrorEvent-constructor.https.html
testing/web-platform/tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
testing/web-platform/tests/generic-sensor/generic-sensor-tests.js
testing/web-platform/tests/generic-sensor/idlharness.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor.https.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor_insecure_context.html
testing/web-platform/tests/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
testing/web-platform/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
testing/web-platform/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/gyroscope/Gyroscope.https.html
testing/web-platform/tests/gyroscope/Gyroscope_insecure_context.html
testing/web-platform/tests/gyroscope/Gyroscope_onerror-manual.https.html
testing/web-platform/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
testing/web-platform/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/magnetometer/Magnetometer.https.html
testing/web-platform/tests/magnetometer/Magnetometer_insecure_context.html
testing/web-platform/tests/magnetometer/Magnetometer_onerror-manual.https.html
testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/orientation-sensor/OrientationSensor.https.html
testing/web-platform/tests/orientation-sensor/OrientationSensor_insecure_context.html
testing/web-platform/tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
testing/web-platform/tests/proximity/ProximitySensor.https.html
testing/web-platform/tests/proximity/ProximitySensor_insecure_context.html
testing/web-platform/tests/proximity/ProximitySensor_onerror-manual.https.html
testing/web-platform/tests/sensors/OWNERS
testing/web-platform/tests/sensors/SensorErrorEvent-constructor.https.html
testing/web-platform/tests/sensors/generic-sensor-feature-policy-test.sub.js
testing/web-platform/tests/sensors/generic-sensor-tests.js
testing/web-platform/tests/sensors/idlharness.https.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -272977,16 +272977,31 @@
      {}
     ]
    ],
    "gamepad/OWNERS": [
     [
      {}
     ]
    ],
+   "generic-sensor/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "generic-sensor/generic-sensor-feature-policy-test.sub.js": [
+    [
+     {}
+    ]
+   ],
+   "generic-sensor/generic-sensor-tests.js": [
+    [
+     {}
+    ]
+   ],
    "geolocation-API/OWNERS": [
     [
      {}
     ]
    ],
    "geolocation-API/support.js": [
     [
      {}
@@ -290667,31 +290682,16 @@
      {}
     ]
    ],
    "selection/test-iframe.html": [
     [
      {}
     ]
    ],
-   "sensors/OWNERS": [
-    [
-     {}
-    ]
-   ],
-   "sensors/generic-sensor-feature-policy-test.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "sensors/generic-sensor-tests.js": [
-    [
-     {}
-    ]
-   ],
    "server-timing/resources/blue.png": [
     [
      {}
     ]
    ],
    "server-timing/resources/blue.png.sub.headers": [
     [
      {}
@@ -326034,16 +326034,28 @@
     ]
    ],
    "gamepad/idlharness.html": [
     [
      "/gamepad/idlharness.html",
      {}
     ]
    ],
+   "generic-sensor/SensorErrorEvent-constructor.https.html": [
+    [
+     "/generic-sensor/SensorErrorEvent-constructor.https.html",
+     {}
+    ]
+   ],
+   "generic-sensor/idlharness.https.html": [
+    [
+     "/generic-sensor/idlharness.https.html",
+     {}
+    ]
+   ],
    "geolocation-API/PositionOptions.https.html": [
     [
      "/geolocation-API/PositionOptions.https.html",
      {}
     ]
    ],
    "geolocation-API/clearWatch_TypeError.html": [
     [
@@ -360054,28 +360066,16 @@
     ]
    ],
    "selection/type.html": [
     [
      "/selection/type.html",
      {}
     ]
    ],
-   "sensors/SensorErrorEvent-constructor.https.html": [
-    [
-     "/sensors/SensorErrorEvent-constructor.https.html",
-     {}
-    ]
-   ],
-   "sensors/idlharness.https.html": [
-    [
-     "/sensors/idlharness.https.html",
-     {}
-    ]
-   ],
    "server-timing/cross_origin.html": [
     [
      "/server-timing/cross_origin.html",
      {}
     ]
    ],
    "server-timing/server_timing_header-parsing.html": [
     [
@@ -398414,57 +398414,57 @@
    "df0462ed34e1cf026321f9174870b334af445e56",
    "support"
   ],
   "WebIDL/valid/xml/variadic-operations.widlprocxml": [
    "e31231c6db703a58c03160bc81e1c935019c1f17",
    "support"
   ],
   "accelerometer/Accelerometer-disabled-by-feature-policy.https.html": [
-   "5bce003a7ab3b5016011d35c715d7968c09a89a4",
+   "96e5a86bf78239f3aa4a79b32bb4308de0d5f60e",
    "testharness"
   ],
   "accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers": [
    "bde03e5f36844e0818f4d1092c4fe6788cb4e194",
    "support"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "df5fc463567201131aeee4f8f975e39135058aab",
+   "f20f89a31daf399a7946b928e8deca9651d38487",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html": [
-   "fbea6404a3a380b43b2f006cb1dddadcabeb666f",
+   "7ce8c39f0af6c932d1e6b6f75843c090f7274b80",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy.https.html": [
-   "67193bd17d281423d7f6e84b0166b5a4c0409be3",
+   "dbda7cfa838c1f2d4296b545034d42f0064f331a",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers": [
    "18a6f86070b21bff87cc9dc37194cdb6113af198",
    "support"
   ],
   "accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html": [
-   "69ced186024bf92e077eccac49a66e8f86d81c96",
+   "b8fb07cdd23dce9690de719387b9d505382772f5",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "c1723ad9944cf2393a5519a91e4e47a0255bcaf4",
    "support"
   ],
   "accelerometer/Accelerometer.https.html": [
-   "f70ee583dce5ed3019e900163d5d559d70d05fb2",
+   "3ff5f61b25c52142e9796f3903d7f2bcaa30314c",
    "testharness"
   ],
   "accelerometer/Accelerometer_insecure_context.html": [
-   "b9837873e39416c65e8ac05f2049bfa406ba4264",
+   "82be1b9a5c6e75291fdc1aabe230af28e22823a8",
    "testharness"
   ],
   "accelerometer/Accelerometer_onerror-manual.https.html": [
-   "c8b76601f465d0f5b26a9bc27dac503f02887448",
+   "c82f9595dc2582b2da40549a358da1c3fc2ff820",
    "manual"
   ],
   "accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html": [
    "30e8588ff49a1d526d65aac89bc80f4782715914",
    "manual"
   ],
   "accelerometer/OWNERS": [
    "b119dbb984792f33c6e7463f3105d37c3c3b7ad8",
@@ -399242,57 +399242,57 @@
    "a3ede89b3b94bc5c02c39bb0c26075a5a2bf6396",
    "support"
   ],
   "acid/acid3/xhtml.3.headers": [
    "889fd09853f091aba8fea3b45cfeb36437be1c2b",
    "support"
   ],
   "ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html": [
-   "dcd19f8b1428bfc147a62299489e1d10f3e31795",
+   "9dcb093c8a052b8563d65fa6f0885650422dbf4c",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html.headers": [
    "60c9a6457eebafad8ac6c139f80ababb6efd1ceb",
    "support"
   ],
   "ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "d1a42dfb235b17c9f7701c6b7ac9b32c1b1d385c",
+   "06862bb58d13bf4355cbe66cb7060c7a5ea4a750",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html": [
-   "7e13efd73ff674cb9870495df169a3ab10cf696c",
+   "acdf8d84bc3e8708af250d8825c93d130ade435f",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html": [
-   "752da9e721c28c8a174cca05133f9ff3acbe1139",
+   "da2cc1cc0de186731e38512219cdfaf8357b9301",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html.headers": [
    "00f610fe390dc2bd24b76170cf268a08483fe4aa",
    "support"
   ],
   "ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "664ab1dc2e3c4026e0d890bab8e17544d58f4210",
+   "2a7a1dadbf5d9d05116128633598da781f5f0003",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "9c9b554e33d34e1513dd315ecd6299f756d68b43",
    "support"
   ],
   "ambient-light/AmbientLightSensor.https.html": [
-   "49d9d753bee1b390803ba293458dccfb5b7613e1",
+   "86a1f84e2e034d58b2a7f6fc01880028b444c7cd",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor_insecure_context.html": [
-   "279a073382db5c79ddbee30ffe4478299a773dd3",
+   "f6d9e5bd6d1ce6705835f15498ddbb5a5b82fb88",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor_onerror-manual.https.html": [
-   "834b4f46f111a128c1c16c1c93d459b52dd4828d",
+   "fa52072d6da7987db8f67c2a6fd9b2e281f03042",
    "manual"
   ],
   "ambient-light/OWNERS": [
    "267fa5a34646c535ff4e4772543bc2c5d8aecc30",
    "support"
   ],
   "ambient-light/idlharness.https.html": [
    "0b3417b7e88f77777d124793e2179eac0e5e5b4d",
@@ -552593,16 +552593,36 @@
   "gamepad/idlharness.html": [
    "302f0796746f252a1a851d306d7e96cf86d7d402",
    "testharness"
   ],
   "gamepad/timestamp-manual.html": [
    "b2432e7ea263fb80be42e7eecf93a9d885c0205d",
    "manual"
   ],
+  "generic-sensor/OWNERS": [
+   "b1349055762c7d44414c0c11fb8500d5eee9a75f",
+   "support"
+  ],
+  "generic-sensor/SensorErrorEvent-constructor.https.html": [
+   "99bcfb42c91e084a3b847ab4bab2bad80e548540",
+   "testharness"
+  ],
+  "generic-sensor/generic-sensor-feature-policy-test.sub.js": [
+   "c7c9c4d1c578f267cbb4241d7ea7a981be6f49ee",
+   "support"
+  ],
+  "generic-sensor/generic-sensor-tests.js": [
+   "6364f1838215eaafd91b86690039da41d4c19cd1",
+   "support"
+  ],
+  "generic-sensor/idlharness.https.html": [
+   "02c734b907075c8abb7504fc7e2b93730ac80a0c",
+   "testharness"
+  ],
   "geolocation-API/OWNERS": [
    "84c4182ceed0f75ada11e63c3dfc2acc2939cbb6",
    "support"
   ],
   "geolocation-API/PositionOptions.https.html": [
    "772c305b5b9e6a8ae61a44b395771b8d60bd7187",
    "testharness"
   ],
@@ -552654,57 +552674,57 @@
    "39f9b8442320f67323f55f26a417deb2ae12eacf",
    "manual"
   ],
   "geolocation-API/watchPosition_permission_deny.https.html": [
    "ca3036737a662e8673477b1a09b6fce89f0f98f4",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html": [
-   "b85d614841994226c2cab7fdf88e03620e453457",
+   "91047842ea56344c005c46de7cdd27e2373ea0a1",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers": [
    "0c75673594dd70e5f27fdc7f56a7ca1bb2d3f7ec",
    "support"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "2d21ee198d079dde55f02fda3eb7f8e8fb6dfac4",
+   "fb033fd0f0d891e9b6ed2b54b835f8f06364643e",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html": [
-   "2eac643f35086d5051333674f6a01a9ee524786d",
+   "06e4487981f8e6e062d9e9fea14d52e64b6b5035",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html": [
-   "49e7799a36358602efabfb219a93422078456111",
+   "e8287121361749246b874207dcffb92e459dfbec",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html.headers": [
    "6e06db043adf50307b8fa209a7008fdb7d290921",
    "support"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "4ad92dcbcc737cbc14ba3bc2c19dc8f78e75d0a1",
+   "4222f48c8c2a932c5b65b6426bb9a0ad476ddd0c",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "1c523e7cd5741e4a515119b129b041b11cbc92cc",
    "support"
   ],
   "geolocation-sensor/GeolocationSensor.https.html": [
-   "502b4dbd03312a2e1e0c18fb3983a077335efde6",
+   "c9d32faca641ec784acf9096a079d73781330216",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor_insecure_context.html": [
-   "f2e8f58fd7e09cfaa311c83adc4456f9463a3456",
+   "58fd65d3a72e6734392381fe225e3fbd7007fc06",
    "testharness"
   ],
   "geolocation-sensor/GeolocationSensor_onerror-manual.https.html": [
-   "8c5a4e48439ff0620d6267b127a5d49f85657896",
+   "2b7aac7d60271e12ce71f6293405ffafb471c8c8",
    "manual"
   ],
   "geolocation-sensor/GeolocationSensor_read.https.html": [
    "5a61a677b26c1c25cb46da2baa16e3a6783febee",
    "testharness"
   ],
   "geolocation-sensor/OWNERS": [
    "fabf35173a8bd10c7e5ffe348dd92532199ab51a",
@@ -552738,57 +552758,57 @@
    "be301a3a71514708c547fa033eab0271367a3fb9",
    "manual"
   ],
   "graphics-aam/graphics-symbol_on_svg_element-manual.html": [
    "52b2e48333492373708b86cf558e578b04ac5977",
    "manual"
   ],
   "gyroscope/Gyroscope-disabled-by-feature-policy.https.html": [
-   "b7fb169e2a3de0df84a44b9775677d1a005e2446",
+   "bc6f85cb3506d3e3e062eef43dca88bf3a4ebe89",
    "testharness"
   ],
   "gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers": [
    "b4767ccc5e319ec08705af56990c8d8093640ff0",
    "support"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "0887871a9f337da76cdbf8fc0ea7a6aafa6eec37",
+   "cc1f4082fa420a9076f929d88268f5a1d921a44a",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html": [
-   "b5d7fe16df3356e7e8ea202088e63734291810f0",
+   "75429c87bbebd19df7b4edaddc5869c6202b3fab",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy.https.html": [
-   "92bd0aee5d2d54b50e907155fe3a6dd5b2634021",
+   "5129c05f9b226650a9b7fed4841871045525bf15",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers": [
    "b0ce79c08e8b5908485a8bb4c6d86e8d20b2a44c",
    "support"
   ],
   "gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html": [
-   "b1af2b9e1787c1ace4619509d95e4085ac0f0fc7",
+   "2603bd858929ae6f84ebbe0cce34c5417ccdae06",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "59acbd3ef447d2197c4a9af2837dbacdf1e31885",
    "support"
   ],
   "gyroscope/Gyroscope.https.html": [
-   "7d30725e44905d774a0b4554b55842cba78e1462",
+   "504abfa42529e08576e49c3296464bcea5fe0b8a",
    "testharness"
   ],
   "gyroscope/Gyroscope_insecure_context.html": [
-   "79688da94e1ea93646c288bdbfdb17487e846560",
+   "74e51a1efc06bf8180db430b418d484fc50c07f9",
    "testharness"
   ],
   "gyroscope/Gyroscope_onerror-manual.https.html": [
-   "c89ff6361146a5d3065c2d44088b313e5560ba8d",
+   "1e15b883bd317ca83783864fc563794cb0f6df8e",
    "manual"
   ],
   "gyroscope/OWNERS": [
    "b119dbb984792f33c6e7463f3105d37c3c3b7ad8",
    "support"
   ],
   "gyroscope/idlharness.https.html": [
    "c6c627cc2e250664e174edf90aa9b402ea5c0500",
@@ -572862,57 +572882,57 @@
    "903bb60746deebd8f39ee8ea1a84b40e17884c3c",
    "testharness"
   ],
   "longtask-timing/shared-renderer/resources/frame-with-longtask.html": [
    "2901b02184fb36d620782fb7fd4a565124580e81",
    "support"
   ],
   "magnetometer/Magnetometer-disabled-by-feature-policy.https.html": [
-   "a050a0aff6039883d521735bff4b96e0628de20d",
+   "9af542095f2fcd57691c0432ef3248b04a0207a0",
    "testharness"
   ],
   "magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers": [
    "9a930b1268bf30ce845ba6671dbb2f44faa92bb2",
    "support"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "0bdab54bc63a9b28b89c7be70409a9c6c7d943c5",
+   "47829ff5747eed99ba22e79b12ddfff288fd031e",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html": [
-   "22a4580c08716b0395d6a0e49679b29619e2ce35",
+   "3b6314e9176a24976d9d882644c30f00554eed6d",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy.https.html": [
-   "8cc0dfc032b1f063e88ca43a0516b89ab05e057f",
+   "05128cdb7171ba230143e7b68b09968a484b602a",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers": [
    "2be01ba1805ae8fd8038a70763b29e2070a96f78",
    "support"
   ],
   "magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html": [
-   "ac9154aca0c01825a78aad12b9ed242ec8780937",
+   "3240dafd2bc810dea0dc1ebc31728c86a29f2ec5",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "2099d254fa4bb019404df56ec1a99e84459c77e2",
    "support"
   ],
   "magnetometer/Magnetometer.https.html": [
-   "bb74316d74c488daf753ee8576761ec78db457df",
+   "240e7d0af55b8681f2f45ca22283634acc406325",
    "testharness"
   ],
   "magnetometer/Magnetometer_insecure_context.html": [
-   "aef2810b55ac8672dff86b85f5d93d152b81dfe4",
+   "0eeb95340d7c74a0243eac8d3f004b6e06b87a92",
    "testharness"
   ],
   "magnetometer/Magnetometer_onerror-manual.https.html": [
-   "f073df598684ce24f429d968da343812d68cb142",
+   "da4e6b8975beecdcae24da26920a56a652f781e4",
    "manual"
   ],
   "magnetometer/OWNERS": [
    "b119dbb984792f33c6e7463f3105d37c3c3b7ad8",
    "support"
   ],
   "magnetometer/idlharness.https.html": [
    "2a08a46bc2fa6e5b75c3c05c0396b48280075892",
@@ -581966,89 +581986,89 @@
    "c75b1abe106111ace7f213ee84087daf17f0f48d",
    "manual"
   ],
   "orientation-event/t028-manual.html": [
    "6948dbbdc88ffd9aa84ad5a6c822b354809561b2",
    "manual"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html": [
-   "9db710ef183a7bc65e6649526defe869c5fb66e9",
+   "0c7657e32b46c64e5f050f04e40ccfc0dce32e47",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers": [
    "86af2e7ee455898629df466e7084ab6e909ec313",
    "support"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "05c28d8975c13aea8e248d2a1a5341fb146c82a5",
+   "71a6966fb91f8ddfe15ee690c843e4621a3b4720",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html": [
-   "e3679a5c3a5f1783d3311556788af9e5a18b9287",
+   "9bbe39e1be4a669f31f0fb3960aca22d7d159c5e",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html": [
-   "923b5167c76b8f8405c94043dae6d4312383d00e",
+   "9f110b8ceca3dd3ce3d2a9e2567d92a3fc6462bf",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers": [
    "f96008f4d28eec8c158a31c8e5c2bbc9ff55ef05",
    "support"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "873f248fa5c359322f6d8b143758122450c2279c",
+   "c4404cf0b16c4d9ad15308392ecf52caee445b86",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "cb27e0f09caa38fc80b29580be4b0c06c1024a18",
    "support"
   ],
   "orientation-sensor/OWNERS": [
    "b119dbb984792f33c6e7463f3105d37c3c3b7ad8",
    "support"
   ],
   "orientation-sensor/OrientationSensor.https.html": [
-   "6b53127c74c55a8cf5697bc5527f36b7276e2681",
+   "ea9a61f9d526183071a0336e11ca844f59c284a9",
    "testharness"
   ],
   "orientation-sensor/OrientationSensor_insecure_context.html": [
-   "4161a365bd3a72226c29049cbe46c123b8b07a04",
+   "eb64da888f1bedf9d5ed8b11edc1626da88b322b",
    "testharness"
   ],
   "orientation-sensor/OrientationSensor_onerror-manual.https.html": [
-   "7d28e6caf629f82b058a33b018de34940f34916f",
+   "6f0eb976affc21e49f48c42c1bd9d9eb0083ee40",
    "manual"
   ],
   "orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html": [
-   "a8178651dd87ac80268a7c9de06858a6c5ee2125",
+   "8c6c5f8f3bc4421f5143a3e4fab287564cf4907d",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers": [
    "8795ff5458374246ec69928cf9545cb17be3c641",
    "support"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "895e2cb7837bd9cb4a8ba7b3c90f414b4d3677ea",
+   "34a79c9033a41c0aceab3fa6a470dd5a76f2ac81",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html": [
-   "745fc51713614d6082dec199e3491e001cf3396e",
+   "0e6260ccdaa8163b8db96516960be226a4d85ba7",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html": [
-   "bccd08cf93fddcf3c8e2dc18fe394454580f2c88",
+   "243b2d60d4c528a77e9cfb68fa256b35234e7346",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers": [
    "644b0398e76ea06dd5cd012338555b608da02122",
    "support"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "3ea7f029d22c4f05f99fc0cc5c4016670265cea7",
+   "c9f234f6508fb778fdf91277bb8950c99479979d",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "e6e93a77c618e8477d79f6cf1ff05d0f5865821c",
    "support"
   ],
   "orientation-sensor/idlharness.https.html": [
    "05a95e835ce72800601fcd18007eaec0c05dc79a",
@@ -583434,25 +583454,25 @@
    "f64f2ab5d0afa93e5adfa327e478936c0e295823",
    "support"
   ],
   "proximity/OWNERS": [
    "8de2a4a7f850b2d52ab3102b585fe38828b6d08d",
    "support"
   ],
   "proximity/ProximitySensor.https.html": [
-   "6c4a9d4ed542136534229a20b2c15463c7170a35",
+   "6920751273c1220f40b5046be7ce7254a01ce72e",
    "testharness"
   ],
   "proximity/ProximitySensor_insecure_context.html": [
-   "426dc80f29f9eff09b266d357482d1532066a27a",
+   "00b6ec75ae65d4ee7144e9362ccc89a3b3adb856",
    "testharness"
   ],
   "proximity/ProximitySensor_onerror-manual.https.html": [
-   "ff682dfeb9f9dbea598455190d2c90e14d07b769",
+   "522cdac324519313d77aa2dd417d486f15b2511f",
    "manual"
   ],
   "proximity/idlharness.https.html": [
    "7265649abefcaec47f159b4980b0c43ca7e47528",
    "testharness"
   ],
   "quirks/OWNERS": [
    "3a52efa37cb05c353bb8ce78146c42db6a238b74",
@@ -591645,36 +591665,16 @@
   "selection/test-iframe.html": [
    "3803c785b4a2fe2bbf9ecb895e6d3e1ae9e40164",
    "support"
   ],
   "selection/type.html": [
    "01ae6e757d428800555012783e290ebba575bcab",
    "testharness"
   ],
-  "sensors/OWNERS": [
-   "b1349055762c7d44414c0c11fb8500d5eee9a75f",
-   "support"
-  ],
-  "sensors/SensorErrorEvent-constructor.https.html": [
-   "99bcfb42c91e084a3b847ab4bab2bad80e548540",
-   "testharness"
-  ],
-  "sensors/generic-sensor-feature-policy-test.sub.js": [
-   "c7c9c4d1c578f267cbb4241d7ea7a981be6f49ee",
-   "support"
-  ],
-  "sensors/generic-sensor-tests.js": [
-   "6364f1838215eaafd91b86690039da41d4c19cd1",
-   "support"
-  ],
-  "sensors/idlharness.https.html": [
-   "02c734b907075c8abb7504fc7e2b93730ac80a0c",
-   "testharness"
-  ],
   "server-timing/cross_origin.html": [
    "74333db517babacbb84bb20c91ccfc8b2627b934",
    "testharness"
   ],
   "server-timing/resources/blue.png": [
    "7de5cdb5ad04ac365430b3b5f5ba01d2ba57ea23",
    "support"
   ],
--- a/testing/web-platform/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>Accelerometer Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(Accelerometer);
 run_fp_tests_disabled(LinearAccelerationSensor);
 run_fp_tests_disabled(GravitySensor);
 </script>
 </body>
--- a/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>Accelerometer Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(Accelerometer);
 run_fp_tests_enabled_by_attribute_redirect_on_load(LinearAccelerationSensor);
 run_fp_tests_enabled_by_attribute_redirect_on_load(GravitySensor);
 </script>
 </body>
--- a/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>Accelerometer Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(Accelerometer);
 run_fp_tests_enabled_by_attribute(LinearAccelerationSensor);
 run_fp_tests_enabled_by_attribute(GravitySensor);
 </script>
 </body>
--- a/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>Accelerometer Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(Accelerometer);
 run_fp_tests_enabled(LinearAccelerationSensor);
 run_fp_tests_enabled(GravitySensor);
 </script>
 </body>
--- a/testing/web-platform/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>Accelerometer Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(Accelerometer);
 run_fp_tests_enabled_on_self_origin(LinearAccelerationSensor);
 run_fp_tests_enabled_on_self_origin(GravitySensor);
 </script>
 </body>
--- a/testing/web-platform/tests/accelerometer/Accelerometer.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Accelerometer Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
 runGenericSensorTests(Accelerometer);
 runGenericSensorTests(GravitySensor);
 runGenericSensorTests(LinearAccelerationSensor);
 
 </script>
--- a/testing/web-platform/tests/accelerometer/Accelerometer_insecure_context.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer_insecure_context.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Accelerometer Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Note:</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/accelerometer/Accelerometer_onerror-manual.https.html
+++ b/testing/web-platform/tests/accelerometer/Accelerometer_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Accelerometer Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Accelerometer Sensor or run test on a device without Accelerometer Sensor.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AmbientLightSensor Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(AmbientLightSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AmbientLightSensor Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(AmbientLightSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AmbientLightSensor Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(AmbientLightSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AmbientLightSensor Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(AmbientLightSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AmbientLightSensor Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(AmbientLightSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>AmbientLightSensor Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
 runGenericSensorTests(AmbientLightSensor);
 
 </script>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor_insecure_context.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor_insecure_context.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>AmbientLightSensor Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/ambient-light/AmbientLightSensor_onerror-manual.https.html
+++ b/testing/web-platform/tests/ambient-light/AmbientLightSensor_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>AmbientLightSensor Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Ambient Light Sensor or run test on a device without Amibent Light Sensor.
   </li>
 </ol>
 <script>
rename from testing/web-platform/tests/sensors/OWNERS
rename to testing/web-platform/tests/generic-sensor/OWNERS
rename from testing/web-platform/tests/sensors/SensorErrorEvent-constructor.https.html
rename to testing/web-platform/tests/generic-sensor/SensorErrorEvent-constructor.https.html
rename from testing/web-platform/tests/sensors/generic-sensor-feature-policy-test.sub.js
rename to testing/web-platform/tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
rename from testing/web-platform/tests/sensors/generic-sensor-tests.js
rename to testing/web-platform/tests/generic-sensor/generic-sensor-tests.js
rename from testing/web-platform/tests/sensors/idlharness.https.html
rename to testing/web-platform/tests/generic-sensor/idlharness.https.html
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <body>
 <title>GeolocationSensor Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(GeolocationSensor);
 
 promise_test(async t => {
   await promise_rejects(t, 'SecurityError', GeolocationSensor.read());
 }, "GeolocationSensor.read(): 'SecurityError' is thrown when disabled by Feature Policy");
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>GeolocationSensor Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(GeolocationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>GeolocationSensor Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(GeolocationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>GeolocationSensor Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(GeolocationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>GeolocationSensor Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(GeolocationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>GeolocationSensor Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <script>
 
 runGenericSensorTests(GeolocationSensor);
 
 </script>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor_insecure_context.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor_insecure_context.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>GeolocationSensor Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <script>
 
 runGenericSensorInsecureContext("GeolocationSensor");
 
 </script>
--- a/testing/web-platform/tests/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
+++ b/testing/web-platform/tests/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>GeolocationSensor Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Geolocation sensor or run test on a device without Geolocation sensor.
   </li>
 </ol>
 <script>
 
--- a/testing/web-platform/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>Gyroscope Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(Gyroscope);
 </script>
 </body>
--- a/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>Gyroscope Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(Gyroscope);
 </script>
 </body>
--- a/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>Gyroscope Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(Gyroscope);
 </script>
 </body>
--- a/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>Gyroscope Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(Gyroscope);
 </script>
 </body>
--- a/testing/web-platform/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>Gyroscope Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(Gyroscope);
 </script>
 </body>
--- a/testing/web-platform/tests/gyroscope/Gyroscope.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Gyroscope Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
 runGenericSensorTests(Gyroscope);
 
 </script>
--- a/testing/web-platform/tests/gyroscope/Gyroscope_insecure_context.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope_insecure_context.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Gyroscope Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/gyroscope/Gyroscope_onerror-manual.https.html
+++ b/testing/web-platform/tests/gyroscope/Gyroscope_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Gyroscope Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Gyroscope Sensor or run test on a device without Gyroscope Sensor.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <body>
 <title>Magnetometer Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(Magnetometer);
 run_fp_tests_disabled(UncalibratedMagnetometer);
 </script>
 </body>
--- a/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <body>
 <title>Magnetometer Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(Magnetometer);
 run_fp_tests_enabled_by_attribute_redirect_on_load(UncalibratedMagnetometer);
 </script>
 </body>
--- a/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <body>
 <title>Magnetometer Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(Magnetometer);
 run_fp_tests_enabled_by_attribute(UncalibratedMagnetometer);
 </script>
 </body>
--- a/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <body>
 <title>Magnetometer Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(Magnetometer);
 run_fp_tests_enabled(UncalibratedMagnetometer);
 </script>
 </body>
--- a/testing/web-platform/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <body>
 <title>Magnetometer Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(Magnetometer);
 run_fp_tests_enabled_on_self_origin(UncalibratedMagnetometer);
 </script>
 </body>
--- a/testing/web-platform/tests/magnetometer/Magnetometer.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer.https.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Magnetometer Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
 runGenericSensorTests(Magnetometer);
 runGenericSensorTests(UncalibratedMagnetometer);
 
 </script>
--- a/testing/web-platform/tests/magnetometer/Magnetometer_insecure_context.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer_insecure_context.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Magnetometer Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/magnetometer/Magnetometer_onerror-manual.https.html
+++ b/testing/web-platform/tests/magnetometer/Magnetometer_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>Magnetometer Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Magnetometer Sensor or run test on a device without Magnetometer Sensor.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AbsoluteOrientationSensor Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(AbsoluteOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AbsoluteOrientationSensor Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(AbsoluteOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AbsoluteOrientationSensor Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(AbsoluteOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AbsoluteOrientationSensor Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(AbsoluteOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>AbsoluteOrientationSensor Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(AbsoluteOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/OrientationSensor.https.html
+++ b/testing/web-platform/tests/orientation-sensor/OrientationSensor.https.html
@@ -1,17 +1,17 @@
  <!DOCTYPE html>
 <meta charset="utf-8">
 <title>OrientationSensor Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/orientation-sensor/">
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 
 <script>
 
 //IEEE 754: single precision retricts to 7 decimal digits
 const float_precision = 1e-7;
 
 function create_matrix(quat) {
--- a/testing/web-platform/tests/orientation-sensor/OrientationSensor_insecure_context.html
+++ b/testing/web-platform/tests/orientation-sensor/OrientationSensor_insecure_context.html
@@ -1,16 +1,16 @@
 <meta charset="utf-8">
 <title>AbsoluteOrientationSensor Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/orientation-sensor/">
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Note:</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
+++ b/testing/web-platform/tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>AbsoluteOrientationSensor Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/orientation-sensor/">
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the motion sensors which the underlying physical sensors include Accelerometer, Magnetometer, and (when present) Gyroscope or run test on a device without the motion sensors.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>RelativeOrientationSensor Feature Policy Test: Disabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_disabled(RelativeOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>RelativeOrientationSensor Feature Policy Test: Enabled by attribute redirect on load</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute_redirect_on_load(RelativeOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>RelativeOrientationSensor Feature Policy Test: Enabled by attribute</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_by_attribute(RelativeOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>RelativeOrientationSensor Feature Policy Test: Enabled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled(RelativeOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/testing/web-platform/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <body>
 <title>RelativeOrientationSensor Feature Policy Test: Enabled on self origin</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
 run_fp_tests_enabled_on_self_origin(RelativeOrientationSensor);
 </script>
 </body>
--- a/testing/web-platform/tests/proximity/ProximitySensor.https.html
+++ b/testing/web-platform/tests/proximity/ProximitySensor.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>ProximitySensor Test</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
 runGenericSensorTests(ProximitySensor);
 
 </script>
--- a/testing/web-platform/tests/proximity/ProximitySensor_insecure_context.html
+++ b/testing/web-platform/tests/proximity/ProximitySensor_insecure_context.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>ProximitySensor Test: insecure context</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Run test in an insecure context, e.g. http://example.com/.
   </li>
 </ol>
 <script>
--- a/testing/web-platform/tests/proximity/ProximitySensor_onerror-manual.https.html
+++ b/testing/web-platform/tests/proximity/ProximitySensor_onerror-manual.https.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>ProximitySensor Test: onerror</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
   <li>
     Disable the Proximity Sensor or run test on a device without Proximity Sensor.
   </li>
 </ol>
 <script>