[DO NOT MERGE] try to debug flakiness on Windows

accelerometer/Accelerometer-iframe-access.https.html

@@ -6,12 +6,15 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>
 <script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="resources/sensor-data.js"></script>
 <div id="log"></div>
 <script>
-run_generic_sensor_iframe_tests('Accelerometer');
-run_generic_sensor_iframe_tests('LinearAccelerationSensor');
-run_generic_sensor_iframe_tests('GravitySensor');
+run_generic_sensor_iframe_tests(kAccelerometerSensorData, kAccelerometerReadings);
+run_generic_sensor_iframe_tests(kLinearAccelerationSensorData, kAccelerometerReadings);
+run_generic_sensor_iframe_tests(kGravitySensorData, kAccelerometerReadings);
 </script>

accelerometer/Accelerometer.https.html

@@ -6,28 +6,12 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="resources/sensor-data.js"></script>
 <script>
-
-'use strict';
-
-const kReadings = {
-    readings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedReadings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedRemappedReadings: [
-        [-2.12345, 1.12345, 3.12345]
-    ]
-};
-
-runGenericSensorTests(
-    'Accelerometer',
-    kReadings,
-    verifyXyzSensorReading,
-    ['accelerometer']);
-
+runGenericSensorTests(kAccelerometerSensorData, kAccelerometerReadings);
 </script>

accelerometer/GravitySensor.https.html

@@ -6,28 +6,16 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="resources/sensor-data.js"></script>
 <script>
 
 'use strict';
 
-const kReadings = {
-    readings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedReadings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedRemappedReadings: [
-        [-2.12345, 1.12345, 3.12345]
-    ]
-};
-
-runGenericSensorTests(
-    'GravitySensor',
-    kReadings,
-    verifyXyzSensorReading,
-    ['accelerometer']);
+runGenericSensorTests(kGravitySensorData, kAccelerometerReadings);
 
 </script>

accelerometer/LinearAccelerationSensor.https.html

@@ -6,28 +6,16 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="resources/sensor-data.js"></script>
 <script>
 
 'use strict';
 
-const kReadings = {
-    readings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedReadings: [
-        [1.12345, 2.12345, 3.12345]
-    ],
-    expectedRemappedReadings: [
-        [-2.12345, 1.12345, 3.12345]
-    ]
-};
-
-runGenericSensorTests(
-    'LinearAccelerationSensor',
-    kReadings,
-    verifyXyzSensorReading,
-    ['accelerometer']);
+runGenericSensorTests(kLinearAccelerationSensorData, kAccelerometerReadings);
 
 </script>

accelerometer/resources/sensor-data.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const kAccelerometerSensorData = {
+  sensorName: 'Accelerometer',
+  permissionName: 'accelerometer',
+  testDriverName: 'accelerometer',
+  featurePolicyNames: ['accelerometer']
+};
+
+const kGravitySensorData = {
+  sensorName: 'GravitySensor',
+  permissionName: 'accelerometer',
+  testDriverName: 'gravity',
+  featurePolicyNames: ['accelerometer']
+};
+
+const kLinearAccelerationSensorData = {
+  sensorName: 'LinearAccelerationSensor',
+  permissionName: 'accelerometer',
+  testDriverName: 'linear-acceleration',
+  featurePolicyNames: ['accelerometer']
+};
+
+const kAccelerometerReadings = {
+  readings: [
+    { x: 1.12345, y: 2.12345, z: 3.12345 }
+  ],
+  expectedReadings: [
+    { x: 1.1, y: 2.1, z: 3.1 }
+  ],
+  expectedRemappedReadings: [
+    { x: -2.1, y: 1.1, z: 3.1 }
+  ]
+};

ambient-light/AmbientLightSensor-iframe-access.https.html

@@ -5,10 +5,13 @@
 <link rel="help" href="https://w3c.github.io/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>
 <script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="resources/sensor-data.js"></script>
 <div id="log"></div>
 <script>
-run_generic_sensor_iframe_tests('AmbientLightSensor');
+run_generic_sensor_iframe_tests(kSensorData, kReadings);
 </script>

ambient-light/AmbientLightSensor.https.html

@@ -6,58 +6,12 @@
 <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="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
 <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="resources/sensor-data.js"></script>
 <script>
-
-'use strict';
-
-const kReadings = {
-    readings: [
-        // Readings are selected so that illuminance significance check causes
-        // the following to happen:
-        // 1. First two values test situation when two values would be rounded
-        //    to same value. As the second value would be rounded to same value
-        //    as first it won't trigger reading event.
-        // 2. New value is set to 24. And test checks it is correctly rounded to
-        //    0.
-        // 3. New reading is attempted to set to 35.
-        // 4. Value is read from sensor and compared new reading. But as new
-        //    reading was not significantly different compared to initial, for
-        //    privacy reasons, service returns the initial value.
-        // 5. New value is set to 49. And test checks it is correctly rounded to
-        //    50. New value is allowed as it is significantly different compared
-        //    to old value (24).
-        // 6. New reading is attempted to set to 35.
-        // 7. Value is read from sensor and compared new reading. But as new
-        //    reading was not significantly different compared to initial, for
-        //    privacy reasons, service returns the initial value.
-        // 8. New value is set to 23. And test checks it is correctly rounded to
-        //    0. New value is allowed as it is significantly different compared
-        //    to old value (49).
-        //
-        // Note: Readings and expectedReadings wraps around correctly as next
-        // value would be 150 (output from 127).
-        [127],
-        [165],
-        [24],
-        [35],
-        [49],
-        [35],
-        [23]
-    ],
-    expectedReadings: [
-        [150],  // output from 127
-        [0],    // output from 24
-        [50],   // output from 49
-        [0]     // output from 23
-    ]
-};
-
-runGenericSensorTests(
-    'AmbientLightSensor',
-    kReadings,
-    verifyAlsSensorReading,
-    ['ambient-light-sensor']);
-
+runGenericSensorTests(kSensorData, kReadings);
 </script>

ambient-light/resources/sensor-data.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const kSensorData = {
+  sensorName: 'AmbientLightSensor',
+  permissionName: 'ambient-light-sensor',
+  testDriverName: 'ambient-light',
+  featurePolicyNames: ['ambient-light-sensor']
+};
+
+const kReadings = {
+  readings: [
+    // Readings are selected so that illuminance significance check causes
+    // the following to happen:
+    // 1. First two values test situation when two values would be rounded
+    //    to same value. As the second value would be rounded to same value
+    //    as first it won't trigger reading event.
+    // 2. New value is set to 24. And test checks it is correctly rounded to
+    //    0.
+    // 3. New reading is attempted to set to 35.
+    // 4. Value is read from sensor and compared new reading. But as new
+    //    reading was not significantly different compared to initial, for
+    //    privacy reasons, service returns the initial value.
+    // 5. New value is set to 49. And test checks it is correctly rounded to
+    //    50. New value is allowed as it is significantly different compared
+    //    to old value (24).
+    // 6. New reading is attempted to set to 35.
+    // 7. Value is read from sensor and compared new reading. But as new
+    //    reading was not significantly different compared to initial, for
+    //    privacy reasons, service returns the initial value.
+    // 8. New value is set to 23. And test checks it is correctly rounded to
+    //    0. New value is allowed as it is significantly different compared
+    //    to old value (49).
+    //
+    // Note: Readings and expectedReadings wraps around correctly as next
+    // value would be 150 (output from 127).
+    { illuminance: 127 }, { illuminance: 165 }, { illuminance: 24 }, {
+      illuminance:
+        35
+    }, { illuminance: 49 }, { illuminance: 35 }, { illuminance: 23 }
+  ],
+  expectedReadings: [
+    { illuminance: 150 }, // output from 127
+    { illuminance: 0 },   // output from 24
+    { illuminance: 50 },  // output from 49
+    { illuminance: 0 }    // output from 23
+  ]
+};