[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 3f199c3c25b2d39d75f0ef5b51bdb25a44baaa79..a3e885620c913c5e8a9980bcbafd26644e838b98 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 = () => {
-      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) => {
     let wrapper = new CallbackWrapper(event => {
       assert_equals(ambientLightSensor.state, 'errored');
       assert_equals(event.error.name, 'NotFoundError');
@@ -83,18 +70,14 @@ sensor_test(sensor => {
       .then(mockSensor => {
         return new Promise((resolve, reject) => {
           let wrapper = new CallbackWrapper(() => {
-            if (ambientLightSensor.state == 'idle') {
-              resolve(mockSensor);
-            }
-
-            if (ambientLightSensor.state == 'active') {
-              let configuration = mockSensor.active_sensor_configurations_[0];
-              assert_equals(configuration.frequency, 60);
-              ambientLightSensor.stop();
-            }
+            let configuration = mockSensor.active_sensor_configurations_[0];
+            assert_equals(configuration.frequency, 60);
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
           }, reject);
 
-          ambientLightSensor.onstatechange = wrapper.callback;
+          ambientLightSensor.onactivate = wrapper.callback;
           ambientLightSensor.onerror = reject;
         });
       })
@@ -113,17 +96,16 @@ 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') {
-              let configuration = mockSensor.active_sensor_configurations_[0];
-              assert_equals(configuration.frequency, maxSupportedFrequency);
-              ambientLightSensor.stop();
-            }
-          };
+           let wrapper = new CallbackWrapper(() => {
+             let configuration = mockSensor.active_sensor_configurations_[0];
+             assert_equals(configuration.frequency, maxSupportedFrequency);
+             ambientLightSensor.stop();
+             assert_equals(ambientLightSensor.state, 'idle');
+             resolve(mockSensor);
+           }, reject);
+
+           ambientLightSensor.onactivate = wrapper.callback;
+           ambientLightSensor.onerror = reject;
         });
       })
       .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
@@ -137,15 +119,14 @@ sensor_test(sensor => {
   let testPromise = sensor.mockSensorProvider.getCreatedSensor()
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          ambientLightSensor.onstatechange = event => {
-            if (ambientLightSensor.state == 'idle') {
-              resolve(mockSensor);
-            }
+          let wrapper = new CallbackWrapper(() => {
+            assert_equals(ambientLightSensor.state, 'active');
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
+          }, reject);
 
-            if (ambientLightSensor.state == 'active') {
-              ambientLightSensor.stop();
-            }
-          };
+          ambientLightSensor.onactivate = wrapper.callback;
           ambientLightSensor.onerror = reject;
         });
       })
@@ -160,16 +141,14 @@ 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();
-            }
-          };
+          let wrapper = new CallbackWrapper(() => {
+            assert_equals(ambientLightSensor.state, 'active');
+            ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.state, 'idle');
+            resolve(mockSensor);
+          }, reject);
 
+          ambientLightSensor.onactivate = wrapper.callback;
           ambientLightSensor.onerror = reject;
         });
       })
@@ -186,17 +165,15 @@ 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.onerror = reject;
+           let wrapper = new CallbackWrapper(() => {
+             assert_equals(ambientLightSensor.state, 'active');
+             ambientLightSensor.stop();
+             assert_equals(ambientLightSensor.state, 'idle');
+             resolve(mockSensor);
+           }, reject);
+
+           ambientLightSensor.onactivate = wrapper.callback;
+           ambientLightSensor.onerror = reject;
          });
       })
       .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
@@ -217,14 +194,10 @@ sensor_test(sensor => {
             assert_equals(ambientLightSensor.reading.illuminance,
                           kDefaultReadingValue);
             ambientLightSensor.stop();
+            assert_equals(ambientLightSensor.reading, null);
+            resolve(mockSensor);
           }, reject);
 
-          ambientLightSensor.onstatechange = () => {
-            if (ambientLightSensor.state == 'idle') {
-              resolve(mockSensor);
-            }
-          };
-
           ambientLightSensor.onchange = wrapper.callback;
           ambientLightSensor.onerror = reject;
         });
@@ -235,36 +208,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 = new CallbackWrapper(() => {
-            if (ambientLightSensor.state == 'idle') {
-              assert_equals(ambientLightSensor.reading, null);
-              resolve(mockSensor);
-            }
-          }, reject).callback;
-
-          ambientLightSensor.onchange = new CallbackWrapper(() => {
-            assert_equals(ambientLightSensor.reading.illuminance,
-                          kDefaultReadingValue);
-            ambientLightSensor.stop();
-          }, reject).callback;
-
-          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()
@@ -292,12 +235,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;
         });
       })
@@ -307,7 +246,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();
@@ -320,12 +258,6 @@ sensor_test(sensor => {
       })
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
-          sensor1.onstatechange = event => {
-            if (sensor1.state == 'idle') {
-              resolve(mockSensor);
-            }
-          };
-
           let wrapper = new CallbackWrapper(() => {
             // Reading value is correct.
             assert_equals(sensor1.reading.illuminance, kDefaultReadingValue);
@@ -345,6 +277,7 @@ sensor_test(sensor => {
 
             // Cached reading remains.
             assert_equals(reading.illuminance, kDefaultReadingValue);
+            resolve(mockSensor);
           }, reject);
 
           sensor1.onchange = wrapper.callback;