bluetooth: Componentize device list fixes

chrome/browser/resources/bluetooth_internals/adapter_broker.js

Index: chrome/browser/resources/bluetooth_internals/adapter_broker.js
diff --git a/chrome/browser/resources/bluetooth_internals/adapter_broker.js b/chrome/browser/resources/bluetooth_internals/adapter_broker.js
index c17c89fe2a4806ce63a0155d4f5fba024ef10c33..ae9bfaae28d35ebe689de7cc5ff7634a2ce52976 100644
--- a/chrome/browser/resources/bluetooth_internals/adapter_broker.js
+++ b/chrome/browser/resources/bluetooth_internals/adapter_broker.js
@@ -28,7 +28,7 @@ cr.define('adapter_broker', function() {
 
     /**
      * Sets client of Adapter service.
-     * @param {interfaces.BluetoothAdapter.AdapterClient} adapterClient
+     * @param {!interfaces.BluetoothAdapter.AdapterClient} adapterClient
      */
     setClient: function(adapterClient) {
       this.adapter_.setClient(interfaces.Connection.bindStubDerivedImpl(
@@ -37,7 +37,7 @@ cr.define('adapter_broker', function() {
 
     /**
      * Gets an array of currently detectable devices from the Adapter service.
-     * @return {Array<interfaces.BluetoothDevice.DeviceInfo>}
+     * @return {!Array<!interfaces.BluetoothDevice.DeviceInfo>}
      */
     getDevices: function() {
       return this.adapter_.getDevices();
@@ -45,7 +45,7 @@ cr.define('adapter_broker', function() {
 
     /**
      * Gets the current state of the Adapter.
-     * @return {interfaces.BluetoothAdapter.AdapterInfo}
+     * @return {!interfaces.BluetoothAdapter.AdapterInfo}
      */
     getInfo: function() {
       return this.adapter_.getInfo();
@@ -109,15 +109,13 @@ cr.define('adapter_broker', function() {
 
   /**
    * Initializes an AdapterBroker if one doesn't exist.
-   * @return {Promise<AdapterBroker>} resolves with AdapterBroker,
+   * @return {!Promise<!AdapterBroker>} resolves with AdapterBroker,
    *     rejects if Bluetooth is not supported.
    */
   function getAdapterBroker() {
-    if (adapterBroker) {
-      return Promise.resolve(adapterBroker);
-    }
+    if (adapterBroker) return Promise.resolve(adapterBroker);
 
-    return interfaces.importInterfaces().then(function(adapter) {
+    return interfaces.setupInterfaces().then(function(adapter) {
       // Hook up the instance properties.
       AdapterClient.prototype.__proto__ =
           interfaces.BluetoothAdapter.AdapterClient.stubClass.prototype;