Revert 156348 (caused http://crbug.com/149828)

chrome/common/extensions/api/experimental_bluetooth.idl

 // Copyright (c) 2012 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.
 
 // Bluetooth API.
 // TODO(bryeung): mark this API as ChromeOS only (see crbug.com/119398).
 
 namespace experimental.bluetooth {
   dictionary Device {
     // The address of the device, in the format 'XX:XX:XX:XX:XX:XX'.
@@ skipping 53 matching lines @@
   // Options for the getDevices function. If neither |uuid| or |name| are
   // provided, all devices known to the system are returned.
   dictionary GetDevicesOptions {
     // Only devices providing a service with a UUID that matches |uuid| will be
     // returned.
     DOMString? uuid;
 
     // Only devices providing a service with a name that matches |name| will be
     // returned.
     DOMString? name;
-
-    // Called for each matching device.  Note that a service discovery request
-    // must be made to each non-matching device before it can be definitively
-    // excluded.  This can take some time.
-    DeviceCallback deviceCallback;
   };
 
   // Options for the getServices function.
   dictionary GetServicesOptions {
     // The address of the device to inquire about. |deviceAddress| should be
     // in the format 'XX:XX:XX:XX:XX:XX'.
     DOMString deviceAddress;
   };
 
   // Options for the connect function.
@@ skipping 57 matching lines @@
     // Get the Bluetooth address of the system's Bluetooth module.
     // |callback| : Called with the address of the Bluetooth adapter, or "" if
     //              there is no adapater available.
     static void getAddress(AddressCallback callback);
 
     // Get the name of the Bluetooth adapter.
     // |callback| : Called with the name of the Bluetooth adapter, or "" if
     //              there is no adapater available.
     static void getName(NameCallback callback);
 
-    // Get a bluetooth devices known to the system.  Known devices are either
-    // currently bonded, or have been bonded in the past.
-    // |options|  : Controls which devices are returned and provides
-    //              |deviceCallback|, which is called for each matching device.
-    // |callback| : Called when the search is completed.
-    //              |options.deviceCallback| will not be called after
-    //              |callback| has been called.
+    // Get a list of Bluetooth devices.
+    // NOTE: This API is likely to change.  Please see crbug.com/134545
+    // |options|  : Controls which devices are returned.
+    // |callback| : Called with an array of Device objects.
     static void getDevices(GetDevicesOptions options,
-                           ResultCallback callback);
+                           DevicesCallback callback);
 
     // Get a list of services provided by a device.
     static void getServices(GetServicesOptions options,
                             ServicesCallback callback);
 
     // Connect to a service on a device.
     // |options|  : The options for the connection.
     // |callback| : Called when the connection is established with a Socket
     //              that can be used to communicate with |device|.
     static void connect(ConnectOptions options,
@@ skipping 53 matching lines @@
     // Fired when the power state of Bluetooth on the system changes.
     // |powered| : True if Bluetooth is powered, false otherwise.
     static void onPowerChanged(boolean has_power);
 
     // Fired when the discovering state of the system changes.
     // |discovering| : True if the system is currently in discovery mode, false
     //                 otherwise.
     static void onDiscoveringChanged(boolean discovering);
   };
 };