Revert of Mojo JS bindings: switch most usage of "connection"/"router" module to "bindings".

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

 'use strict';
 
 // Wraps callback and calls reject_func if callback throws an error.
 class CallbackWrapper {
   constructor(callback, reject_func) {
     this.wrapper_func_ = (args) => {
       try {
         callback(args);
       } catch(e) {
         reject_func();
       }
     }
   }
 
   get callback() {
     return this.wrapper_func_;
   }
 }
 
 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, sensor_provider, sensor) => {
+  ], (core, bindings, connection, sensor_provider, sensor) => {
 
     // Helper function that returns resolved promise with result.
     function sensorResponse(success) {
       return Promise.resolve({success});
     }
 
     // Class that mocks Sensor interface defined in sensor.mojom
     class MockSensor {
-      constructor(sensorRequest, handle, offset, size, reportingMode) {
+      constructor(stub, handle, offset, size, reportingMode) {
         this.client_ = null;
+        this.stub_ = stub;
         this.expects_modified_reading_ = false;
         this.start_should_fail_ = false;
         this.reporting_mode_ = reportingMode;
         this.sensor_reading_timer_id_ = null;
         this.update_reading_function_ = null;
         this.suspend_called_ = null;
         this.resume_called_ = null;
         this.add_configuration_called_ = null;
         this.remove_configuration_called_ = null;
         this.active_sensor_configurations_ = [];
         let rv = core.mapBuffer(handle, offset, size,
             core.MAP_BUFFER_FLAG_NONE);
         assert_equals(rv.result, core.RESULT_OK, "Failed to map shared buffer");
         this.buffer_array_ = rv.buffer;
         this.buffer_ = new Float64Array(this.buffer_array_);
         this.resetBuffer();
-        this.binding_ = new bindings.Binding(sensor.Sensor, this,
-                                             sensorRequest);
-        this.binding_.setConnectionErrorHandler(() => {
+        bindings.StubBindings(this.stub_).delegate = this;
+        bindings.StubBindings(this.stub_).connectionErrorHandler = () => {
           this.reset();
-        });
+        };
       }
 
       // Returns default configuration.
       getDefaultConfiguration() {
         return Promise.resolve({frequency: 5});
       }
 
       // Adds configuration for the sensor and starts reporting fake data
       // through update_reading_function_ callback.
       addConfiguration(configuration) {
@@ skipping 61 matching lines @@
         this.start_should_fail_ = false;
         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;
-        this.binding_.close();
+        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 83 matching lines @@
                 core.createSharedBuffer(
                         this.shared_buffer_size_in_bytes_,
                         core.CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE);
         assert_equals(rv.result, core.RESULT_OK, "Failed to create buffer");
         this.shared_buffer_handle_ = rv.handle;
         this.active_sensor_ = null;
         this.get_sensor_should_fail_ = false;
         this.resolve_func_ = null;
         this.is_continuous_ = false;
         this.max_frequency_ = 60;
-        this.binding_ = new bindings.Binding(sensor_provider.SensorProvider,
-                                             this);
       }
 
       // Returns initialized Sensor proxy to the client.
       getSensor(type, request) {
         if (this.get_sensor_should_fail_) {
           var ignored = new sensor.SensorClientPtr();
           return getSensorResponse(null, bindings.makeRequest(ignored));
         }
 
         let offset =
                 (sensor.SensorType.LAST - type) * this.reading_size_in_bytes_;
         let reporting_mode = sensor.ReportingMode.ON_CHANGE;
         if (this.is_continuous_) {
             reporting_mode = sensor.ReportingMode.CONTINUOUS;
         }
 
         if (this.active_sensor_ == null) {
-          let mockSensor = new MockSensor(request, this.shared_buffer_handle_,
+          var stub = connection.bindHandleToStub(request.handle, sensor.Sensor);
+          let mockSensor = new MockSensor(stub, this.shared_buffer_handle_,
               offset, this.reading_size_in_bytes_, reporting_mode);
           this.active_sensor_ = mockSensor;
         }
 
         let rv =
                 core.duplicateBufferHandle(
                         this.shared_buffer_handle_,
                         core.DUPLICATE_BUFFER_HANDLE_OPTIONS_FLAG_NONE);
 
         assert_equals(rv.result, core.RESULT_OK);
 
         let default_config = {frequency: 5};
 
         let init_params =
             new sensor_provider.SensorInitParams(
                 { memory: rv.handle,
                   buffer_offset: offset,
                   mode: reporting_mode,
                   default_configuration: default_config,
                   maximum_frequency: this.max_frequency_});
 
         if (this.resolve_func_ !== null) {
           this.resolve_func_(this.active_sensor_);
         }
 
-        this.active_sensor_.client_ = new sensor.SensorClientPtr();
-        return getSensorResponse(
-            init_params, bindings.makeRequest(this.active_sensor_.client_));
+        var client_request = new bindings.InterfaceRequest(
+            connection.bindProxy(proxy => {
+              this.active_sensor_.client_ = proxy;
+            }, sensor.SensorClient));
+        return getSensorResponse(init_params, client_request);
       }
 
       // Binds object to mojo message pipe
       bindToPipe(pipe) {
-        this.binding_.bind(pipe);
-        this.binding_.setConnectionErrorHandler(() => {
+        this.stub_ = connection.bindHandleToStub(
+            pipe, sensor_provider.SensorProvider);
+        bindings.StubBindings(this.stub_).delegate = this;
+        bindings.StubBindings(this.stub_).connectionErrorHandler = () => {
           this.reset();
-        });
+        };
       }
 
       // 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;
         this.max_frequency_ = 60;
         this.is_continuous_ = false;
-        this.binding_.close();
+        if (this.stub_)
+          bindings.StubBindings(this.stub_).close();
       }
 
       // Sets flag that forces mock SensorProvider to fail when getSensor() is
       // invoked.
       setGetSensorShouldFail(should_fail) {
         this.get_sensor_should_fail_ = should_fail;
       }
 
       // Returns mock sensor that was created in getSensor to the layout test.
       getCreatedSensor() {
@@ skipping 41 matching lines @@
     };
 
     let onFailure = () => {
       sensor.mockSensorProvider.reset();
       return new Promise((resolve, reject) => { setTimeout(reject, 0); });
     };
 
     return Promise.resolve(func(sensor)).then(onSuccess, onFailure);
   }), name, properties);
 }