bluetooth: Standardize Bluetooth adapter access in Adapter service.

chrome/browser/resources/bluetooth_internals/bluetooth_internals.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Javascript for bluetooth_internals.html, served from
  *     chrome://bluetooth-internals/.
  */
 
 /**
@@ skipping 15 matching lines @@
    * Prints removed device to console.
    * @param {!Object} device the device that was removed
    */
   deviceRemoved: function(device) {
     console.log('Device removed');
     console.log(device);
   }
 };
 
 (function() {
+  var adapterFactory = null;
   var adapter = null;
+  var adapterHandle = null;
   var adapterClient = null;
   var adapterClientHandle = null;
 
   /**
    * TODO: Move to shared location. See crbug.com/652361.
    * Helper to convert callback-based define() API to a promise-based API.
    * @param {!Array<string>} moduleNames
    * @return {!Promise}
    */
   function importModules(moduleNames) {
     return new Promise(function(resolve, reject) {
       define(moduleNames, function(var_args) {
         resolve(Array.prototype.slice.call(arguments, 0));
       });
     });
   }
 
   /**
    * Initializes Mojo proxies for page and Bluetooth services.
-   * @return {!Promise}
+   * @return {!Promise} resolves if adapter is acquired
    */
   function initializeProxies() {
     return importModules([
       'content/public/renderer/frame_interfaces',
       'device/bluetooth/public/interfaces/adapter.mojom',
       'mojo/public/js/connection',
     ]).then(function([frameInterfaces, bluetoothAdapter, connection]) {
       console.log('Loaded modules');
 
       // Hook up the instance properties.
       AdapterClient.prototype.__proto__ =
           bluetoothAdapter.AdapterClient.stubClass.prototype;
 
       // Create a message pipe and bind one end to client
       // implementation.
       adapterClient = new AdapterClient();
       adapterClientHandle = connection.bindStubDerivedImpl(adapterClient);
 
-      adapter = connection.bindHandleToProxy(
-          frameInterfaces.getInterface(bluetoothAdapter.Adapter.name),
-          bluetoothAdapter.Adapter);
+      adapterFactory = connection.bindHandleToProxy(
+          frameInterfaces.getInterface(bluetoothAdapter.AdapterFactory.name),
+          bluetoothAdapter.AdapterFactory);
 
-      adapter.setClient(adapterClientHandle);
+      // Create a message pipe for the Adapter service.
+      return new Promise(function(resolve) {
+        adapterHandle = connection.bindProxy(resolve, bluetoothAdapter.Adapter);
+      }).then(function(proxy) {
+        adapter = proxy;
+        return adapterFactory.getAdapter(adapterHandle, adapterClientHandle);
+      }).then(function(response) {
+        if (!response.success) {
+          throw new Error('Failed to acquire adapter.');
+        }
+      });
     });
   }
 
   document.addEventListener('DOMContentLoaded', function() {
     initializeProxies()
       .then(function() { return adapter.getDevices(); })
-      .then(function(response) { console.log(response.devices); });
+      .then(function(response) { console.log(response.devices); })
+      .catch(function(error) { console.error(error); });
   });
 })();