[Sensors] Implement Sensor.onactivate

third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html

Index: third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html
diff --git a/third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html b/third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html
index 94458f1d6a492ed8eb516af27c04e47e6fa60e77..600c77d7698da1a12b28c2031b6be38ad22c5c8f 100644
--- a/third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html
+++ b/third_party/WebKit/LayoutTests/sensor/ambient-light-sensor.html
@@ -27,19 +27,6 @@ sensor_test(sensor => {
   let ambientLightSensor = new AmbientLightSensor();
   ambientLightSensor.start();
   return new Promise((resolve, reject) => {
-    ambientLightSensor.onstatechange = event => {
-      if(ambientLightSensor.state == 'errored') {
-        resolve();
-      }
-    };
-  });
-}, 'Test that sensor state changes to "errored" when sensor is not supported.');
-
-sensor_test(sensor => {
-  sensor.mockSensorProvider.setGetSensorShouldFail(true);
-  let ambientLightSensor = new AmbientLightSensor();
-  ambientLightSensor.start();
-  return new Promise((resolve, reject) => {
     ambientLightSensor.onerror = event => {
       assert_equals(ambientLightSensor.state, 'errored');
       console.log(event.error.message);
@@ -81,16 +68,14 @@ sensor_test(sensor => {
       .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
       .then(mockSensor => {
          return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
+          ambientLightSensor.onactivate = () => {
+            assert_equals(ambientLightSensor.state, 'active');
+            let configuration = mockSensor.active_sensor_configurations_[0];
+            assert_equals(configuration.frequency, 60);
 
-            if (ambientLightSensor.state === 'active') {
-              let configuration = mockSensor.active_sensor_configurations_[0];
-              assert_equals(configuration.frequency, 60);
-              ambientLightSensor.stop();
-            }
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
           };
         });
       })
@@ -105,14 +90,11 @@ sensor_test(sensor => {
   let testPromise = sensor.mockSensorProvider.getCreatedSensor()
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
-
-            if (ambientLightSensor.state === 'active') {
-              ambientLightSensor.stop();
-            }
+          ambientLightSensor.onactivate = () => {
+            assert_equals(ambientLightSensor.state, 'active');
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
           };
           ambientLightSensor.onerror = reject;
         });
@@ -128,14 +110,11 @@ sensor_test(sensor => {
   let testPromise = sensor.mockSensorProvider.getCreatedSensor()
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
-
-            if (ambientLightSensor.state === 'active') {
-              ambientLightSensor.stop();
-            }
+          ambientLightSensor.onactivate = () => {
+            assert_equals(ambientLightSensor.state, 'active');
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
           };
 
           ambientLightSensor.onerror = reject;
@@ -154,15 +133,12 @@ sensor_test(sensor => {
       .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
       .then(mockSensor => {
          return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
-
-            if (ambientLightSensor.state === 'active') {
-              ambientLightSensor.stop();
-            }
-          };
+           ambientLightSensor.onactivate = () => {
+             assert_equals(ambientLightSensor.state, 'active');
+             ambientLightSensor.stop();
+             assert_equals(ambientLightSensor.state, 'idle');
+             resolve(mockSensor);
+         };
          });
       })
       .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
@@ -178,16 +154,13 @@ sensor_test(sensor => {
         return mockSensor.setUpdateSensorReadingFunction(update_sensor_reading);
       })
       .then((mockSensor) => {
-        return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
-          };
-
+        return new Promise((resolve, reject) => {          
           ambientLightSensor.onchange = () => {
             assert_equals(ambientLightSensor.reading.illuminance, kDefaultReadingValue);
             ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            assert_equals(ambientLightSensor.reading, null);
+            resolve(mockSensor);
           };
 
           ambientLightSensor.onerror = reject;
@@ -199,34 +172,6 @@ sensor_test(sensor => {
 }, 'Test that onChange is called and sensor reading is valid.');
 
 sensor_test(sensor => {
-  let ambientLightSensor = new AmbientLightSensor({frequency: 60});
-  ambientLightSensor.start();
-  let testPromise = sensor.mockSensorProvider.getCreatedSensor()
-      .then(mockSensor => {
-        return mockSensor.setUpdateSensorReadingFunction(update_sensor_reading);
-      })
-      .then((mockSensor) => {
-        return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = () => {
-            if (ambientLightSensor.state === 'idle') {
-              assert_equals(ambientLightSensor.reading, null);
-              resolve(mockSensor);
-            }
-          }
-
-          ambientLightSensor.onchange = () => {
-            assert_equals(ambientLightSensor.reading.illuminance, kDefaultReadingValue);
-            ambientLightSensor.stop();
-          }
-          ambientLightSensor.onerror = reject;
-        });
-      })
-      .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
-
-  return testPromise;
-}, 'Test that sensor reading is not updated when sensor is stopped.');
-
-sensor_test(sensor => {
   let ambientLightSensor = new AmbientLightSensor();
   ambientLightSensor.start();
   let testPromise = sensor.mockSensorProvider.getCreatedSensor()
@@ -253,12 +198,8 @@ sensor_test(sensor => {
       })
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = () => {
-            if (ambientLightSensor.state === 'idle') {
-              resolve(mockSensor);
-            }
-          }
           ambientLightSensor.stop();
+          resolve(mockSensor);
           ambientLightSensor.onerror = reject;
         });
       })
@@ -268,7 +209,6 @@ sensor_test(sensor => {
 }, 'Test that sensor receives suspend / resume notifications when page'
     +' visibility changes.');
 
-
 sensor_test(sensor => {
   let sensor1 = new AmbientLightSensor({frequency: 60});
   sensor1.start();
@@ -281,12 +221,6 @@ sensor_test(sensor => {
       })
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          sensor1.onstatechange = event => {
-            if (sensor1.state === 'idle') {
-              resolve(mockSensor);
-            }
-          };
-
           sensor1.onchange = () => {
             // Reading value is correct.
             assert_equals(sensor1.reading.illuminance, kDefaultReadingValue);
@@ -306,6 +240,8 @@ sensor_test(sensor => {
 
             // Cached reading remains.
             assert_equals(reading.illuminance, kDefaultReadingValue);
+
+            resolve(mockSensor);
           };
 
           sensor1.onerror = reject;