[Sensors] Stop exposing sensor state

third_party/WebKit/LayoutTests/sensor/resources/generic-sensor-tests.js

 'use strict';
 
 // Run a set of tests for a given |sensorType|. |updateReading| is
 // a called by the test to provide the mock values for sensor. |verifyReading|
 // is called so that the value read in JavaScript are the values expected (the ones
 // sent by |updateReading|).
 function runGenericSensorTests(sensorType, updateReading, verifyReading) {
   sensor_test(sensor => {
     sensor.mockSensorProvider.setGetSensorShouldFail(true);
     let sensorObject = new sensorType;
     sensorObject.start();
     return new Promise((resolve, reject) => {
       let wrapper = new CallbackWrapper(event => {
-        assert_equals(sensorObject.state, 'errored');
+        assert_false(sensorObject.activated);
         assert_equals(event.error.name, 'NotReadableError');
         sensorObject.onerror = null;
         resolve();
       }, reject);
 
       sensorObject.onerror = wrapper.callback;
     });
   }, 'Test that "onerror" is send when sensor is not supported.');
 
   sensor_test(sensor => {
       let sensorObject = new sensorType({frequency: 560});
       sensorObject.start();
 
       let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then(mockSensor => {
           mockSensor.setStartShouldFail(true);
           return mockSensor.addConfigurationCalled(); })
         .then(mockSensor => {
           return new Promise((resolve, reject) => {
             let wrapper = new CallbackWrapper(event => {
-              assert_equals(sensorObject.state, 'errored');
-              assert_equals(event.error.name, 'OperationError');
+              assert_false(sensorObject.activated);
+              assert_equals(event.error.name, 'NotReadableError');
               sensorObject.onerror = null;
               resolve();
             }, reject);
 
             sensorObject.onerror = wrapper.callback;
           });
         });
       return testPromise;
   }, 'Test that "onerror" is send when start() call has failed.');
 
   sensor_test(sensor => {
       let sensorObject = new sensorType({frequency: 560});
       sensorObject.start();
 
       let testPromise = sensor.mockSensorProvider.getCreatedSensor()
           .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
           .then(mockSensor => {
             return new Promise((resolve, reject) => {
               let wrapper = new CallbackWrapper(() => {
                 let configuration = mockSensor.active_sensor_configurations_[0];
                 assert_equals(configuration.frequency, 60);
                 sensorObject.stop();
-                assert_equals(sensorObject.state, 'idle');
+                assert_false(sensorObject.activated);
                 resolve(mockSensor);
               }, reject);
               sensorObject.onactivate = wrapper.callback;
               sensorObject.onerror = reject;
             });
           })
           .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
       return testPromise;
   }, 'Test that frequency is capped to 60.0 Hz.');
 
   sensor_test(sensor => {
     let maxSupportedFrequency = 15;
     sensor.mockSensorProvider.setMaximumSupportedFrequency(maxSupportedFrequency);
     let sensorObject = new sensorType({frequency: 50});
     sensorObject.start();
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
         .then(mockSensor => {
           return new Promise((resolve, reject) => {
             let wrapper = new CallbackWrapper(() => {
               let configuration = mockSensor.active_sensor_configurations_[0];
               assert_equals(configuration.frequency, maxSupportedFrequency);
               sensorObject.stop();
-              assert_equals(sensorObject.state, 'idle');
+              assert_false(sensorObject.activated);
               resolve(mockSensor);
            }, reject);
            sensorObject.onactivate = wrapper.callback;
            sensorObject.onerror = reject;
           });
         })
         .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
     return testPromise;
   }, 'Test that frequency is capped to the maximum supported from frequency.');
 
   sensor_test(sensor => {
     let minSupportedFrequency = 2;
     sensor.mockSensorProvider.setMinimumSupportedFrequency(minSupportedFrequency);
     let sensorObject = new sensorType({frequency: -1});
     sensorObject.start();
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
         .then(mockSensor => {
           return new Promise((resolve, reject) => {
             let wrapper = new CallbackWrapper(() => {
               let configuration = mockSensor.active_sensor_configurations_[0];
               assert_equals(configuration.frequency, minSupportedFrequency);
               sensorObject.stop();
-              assert_equals(sensorObject.state, 'idle');
+              assert_false(sensorObject.activated);
               resolve(mockSensor);
            }, reject);
            sensorObject.onactivate = wrapper.callback;
            sensorObject.onerror = reject;
           });
         })
         .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
     return testPromise;
   }, 'Test that frequency is limited to the minimum supported from frequency.');
 
   sensor_test(sensor => {
     let sensorObject = new sensorType({frequency: 60});
-    assert_equals(sensorObject.state, 'unconnected');
+    assert_false(sensorObject.activated);
     sensorObject.start();
-    assert_equals(sensorObject.state, 'activating');
+    assert_false(sensorObject.activated);
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
       .then((mockSensor) => {
         return new Promise((resolve, reject) => {
           let wrapper = new CallbackWrapper(() => {
-            assert_equals(sensorObject.state, 'activated');
+            assert_true(sensorObject.activated);
             sensorObject.stop();
-            assert_equals(sensorObject.state, 'idle');
+            assert_false(sensorObject.activated);
             resolve(mockSensor);
           }, reject);
           sensorObject.onactivate = wrapper.callback;
           sensorObject.onerror = reject;
         });
       })
       .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
     return testPromise;
   }, 'Test that sensor can be successfully created and its states are correct.');
 
   sensor_test(sensor => {
     let sensorObject = new sensorType();
     sensorObject.start();
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then((mockSensor) => {
           return new Promise((resolve, reject) => {
             let wrapper = new CallbackWrapper(() => {
-              assert_equals(sensorObject.state, 'activated');
+              assert_true(sensorObject.activated);
               sensorObject.stop();
-              assert_equals(sensorObject.state, 'idle');
+              assert_false(sensorObject.activated);
               resolve(mockSensor);
             }, reject);
 
             sensorObject.onactivate = wrapper.callback;
             sensorObject.onerror = reject;
           });
         })
         .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
     return testPromise;
   }, 'Test that sensor can be constructed with default configuration.');
 
   sensor_test(sensor => {
     let sensorObject = new sensorType({frequency: 60});
     sensorObject.start();
 
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then(mockSensor => { return mockSensor.addConfigurationCalled(); })
         .then(mockSensor => {
           return new Promise((resolve, reject) => {
             let wrapper = new CallbackWrapper(() => {
-              assert_equals(sensorObject.state, 'activated');
+              assert_true(sensorObject.activated);
               sensorObject.stop();
-              assert_equals(sensorObject.state, 'idle');
+              assert_false(sensorObject.activated);
               resolve(mockSensor);
            }, reject);
            sensorObject.onactivate = wrapper.callback;
            sensorObject.onerror = reject;
           });
         })
         .then(mockSensor => { return mockSensor.removeConfigurationCalled(); });
 
     return testPromise;
   }, 'Test that addConfiguration and removeConfiguration is called.');
@@ skipping 110 matching lines @@
     return testPromise;
   }, 'Test that sensor reading is correct.');
 
   function checkFrequencyHintWorks(sensor) {
     let fastSensor = new sensorType({frequency: 30});
     let slowSensor = new sensorType({frequency: 9});
     slowSensor.start();
 
     let testPromise = sensor.mockSensorProvider.getCreatedSensor()
         .then(mockSensor => {
-          mockSensor.setExpectsModifiedReading(true);
           return mockSensor.setUpdateSensorReadingFunction(updateReading);
         })
         .then(mockSensor => {
           return new Promise((resolve, reject) => {
             let fastSensorNotifiedCounter = 0;
             let slowSensorNotifiedCounter = 0;
             let readingUpdatesCounter = 0;
 
             let fastSensorWrapper = new CallbackWrapper(() => {
               fastSensorNotifiedCounter++;
@@ skipping 32 matching lines @@
 
   sensor_test(sensor => {
     return checkFrequencyHintWorks(sensor);
   }, 'Test that frequency hint works (onchange reporting).');
 
   sensor_test(sensor => {
     sensor.mockSensorProvider.setContinuousReportingMode();
     return checkFrequencyHintWorks(sensor);
   }, 'Test that frequency hint works (continuous reporting).');
 }