[sensors] Close mock sensor stubs after test is finished

third_party/WebKit/LayoutTests/sensor/resources/sensor-helpers.js

 'use strict';
 
 function sensor_mocks(mojo) {
   return define('Generic Sensor API mocks', [
     'mojo/public/js/core',
     'mojo/public/js/bindings',
     'mojo/public/js/connection',
     'device/generic_sensor/public/interfaces/sensor_provider.mojom',
     'device/generic_sensor/public/interfaces/sensor.mojom',
   ], (core, bindings, connection, sensor_provider, sensor) => {
@@ skipping 94 matching lines @@
           this.resume_called_(this);
         }
       }
 
       // Mock functions
 
       // Resets mock Sensor state.
       reset() {
         if (this.sensor_reading_timer_id_) {
           window.clearTimeout(this.sensor_reading_timer_id_);
+          this.sensor_reading_timer_id_ = null;
         }
 
         this.start_should_fail_ = false;
-        this.sensor_reading_timer_id_ = null;
+        this.update_reading_function_ = null;
         this.active_sensor_configurations_ = [];
         this.suspend_called_ = null;
         this.resume_called_ = null;
         this.add_configuration_called_ = null;
         this.remove_configuration_called_ = null;
         this.resetBuffer();
+        core.unmapBuffer(this.buffer_array_);
+        this.buffer_array_ = null;
+        bindings.StubBindings(this.stub_).close();
       }
 
       // Zeroes shared buffer.
       resetBuffer() {
         for (let i = 0; i < this.buffer_.length; ++i) {
           this.buffer_[i] = 0;
         }
       }
 
       // Sets callback that is used to deliver sensor reading updates.
@@ skipping 115 matching lines @@
             pipe, sensor_provider.SensorProvider);
         bindings.StubBindings(this.stub_).delegate = this;
       }
 
       // Mock functions
 
       // Resets state of mock SensorProvider between test runs.
       reset() {
         if (this.active_sensor_ != null) {
           this.active_sensor_.reset();
+          this.active_sensor_ = null;
         }
 
         this.get_sensor_should_fail_ = false;
         this.resolve_func_ = null;
       }
 
       // Sets flag that forces mock SensorProvider to fail when getSensor() is
       // invoked.
       setGetSensorShouldFail(should_fail) {
         this.get_sensor_should_fail_ = should_fail;
@@ skipping 24 matching lines @@
         });
 
     return Promise.resolve({
       mockSensorProvider: mockSensorProvider,
     });
   });
 }
 
 function sensor_test(func, name, properties) {
   mojo_test(mojo => sensor_mocks(mojo).then(sensor => {
-    let result = Promise.resolve(func(sensor));
-    let cleanUp = () => { sensor.mockSensorProvider.reset(); };
-    return result.then(cleanUp, cleanUp);
+    // Clean up and reset mock sensor stubs asynchronously, so that the blink
+    // side closes its proxies and notifies JS sensor objects before new test is
+    // started.
+    let onSuccess = () => {
+      sensor.mockSensorProvider.reset();
+      return new Promise((resolve, reject) => { setTimeout(resolve, 0); });
+    };
+
+    let onFailure = () => {
+      sensor.mockSensorProvider.reset();
+      return new Promise((resolve, reject) => { setTimeout(reject, 0); });
+    };
+
+    return Promise.resolve(func(sensor)).then(onSuccess, onFailure);
   }), name, properties);
 }