| Index: chrome/test/data/webui/bluetooth_internals_browsertest.js
|
| diff --git a/chrome/test/data/webui/bluetooth_internals_browsertest.js b/chrome/test/data/webui/bluetooth_internals_browsertest.js
|
| index 998eeafafafe3babfe2019339e9215e1cfeee4a9..5e4f60283a95f2ede1833c3d967d43d95e9a8369 100644
|
| --- a/chrome/test/data/webui/bluetooth_internals_browsertest.js
|
| +++ b/chrome/test/data/webui/bluetooth_internals_browsertest.js
|
| @@ -65,7 +65,7 @@ BluetoothInternalsTest.prototype = {
|
| ]);
|
|
|
| this.binding = new bindings.Binding(adapter.AdapterFactory, this);
|
| - this.adapter = new TestAdapter();
|
| + this.adapter = new TestAdapterProxy();
|
| this.adapterBinding_ = new bindings.Binding(adapter.Adapter,
|
| this.adapter);
|
| };
|
| @@ -83,22 +83,6 @@ BluetoothInternalsTest.prototype = {
|
| };
|
|
|
| /**
|
| - * A test adapter for the chrome://bluetooth-internals page.
|
| - * Must be used to create message pipe handle from test code.
|
| - *
|
| - * @constructor
|
| - */
|
| - var TestAdapter = function() {
|
| - this.proxy = new TestAdapterProxy();
|
| - };
|
| -
|
| - TestAdapter.prototype = {
|
| - getInfo: function() { return this.proxy.getInfo(); },
|
| - getDevices: function() { return this.proxy.getDevices(); },
|
| - setClient: function(client) { return this.proxy.setClient(client); }
|
| - };
|
| -
|
| - /**
|
| * A test adapter proxy for the chrome://bluetooth-internals page.
|
| *
|
| * @constructor
|
| @@ -146,11 +130,11 @@ BluetoothInternalsTest.prototype = {
|
| this.adapterFactory = new TestAdapterFactoryProxy();
|
| this.adapterFactory.binding.bind(handle);
|
|
|
| - this.adapterFactory.adapter.proxy.setTestDevices([
|
| + this.adapterFactory.adapter.setTestDevices([
|
| this.fakeDeviceInfo1(),
|
| this.fakeDeviceInfo2(),
|
| ]);
|
| - this.adapterFactory.adapter.proxy.setTestAdapter(
|
| + this.adapterFactory.adapter.setTestAdapter(
|
| this.fakeAdapterInfo());
|
|
|
| this.setupResolver.resolve();
|
| @@ -239,9 +223,9 @@ TEST_F('BluetoothInternalsTest', 'Startup_BluetoothInternals', function() {
|
| return setupPromise.then(function() {
|
| return Promise.all([
|
| adapterFactory.whenCalled('getAdapter'),
|
| - adapterFactory.adapter.proxy.whenCalled('getInfo'),
|
| - adapterFactory.adapter.proxy.whenCalled('getDevices'),
|
| - adapterFactory.adapter.proxy.whenCalled('setClient'),
|
| + adapterFactory.adapter.whenCalled('getInfo'),
|
| + adapterFactory.adapter.whenCalled('getDevices'),
|
| + adapterFactory.adapter.whenCalled('setClient'),
|
| ]);
|
| });
|
| });
|
|
|