Bluetooth: clean up BluetoothDevice

device/bluetooth/bluetooth_adapter.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 68 matching lines @@
 
   // Adds and removes observers for events on this bluetooth adapter,
   // if monitoring multiple adapters check the |adapter| parameter of
   // observer methods to determine which adapter is issuing the event.
   virtual void AddObserver(BluetoothAdapter::Observer* observer) = 0;
   virtual void RemoveObserver(
       BluetoothAdapter::Observer* observer) = 0;
 
   // The address of this adapter.  The address format is "XX:XX:XX:XX:XX:XX",
   // where each XX is a hexadecimal number.
-  virtual std::string address() const = 0;
+  virtual std::string GetAddress() const = 0;
 
   // The name of the adapter.
-  virtual std::string name() const = 0;
+  virtual std::string GetName() const = 0;
 
   // Indicates whether the adapter is initialized and ready to use.
   virtual bool IsInitialized() const = 0;
 
   // Indicates whether the adapter is actually present on the system, for
   // the default adapter this indicates whether any adapter is present. An
   // adapter is only considered present if the address has been obtained.
   virtual bool IsPresent() const = 0;
 
   // Indicates whether the adapter radio is powered.
@@ skipping 11 matching lines @@
 
   // Requests that the adapter begin discovering new devices, code must
   // always call this method if they require the adapter be in discovery
   // and should not make it conditional on the value of IsDiscovering()
   // as other adapter users may be making the same request. Code must also
   // call StopDiscovering() when done. On success |callback| will be called,
   // on failure |error_callback| will be called instead.
   //
   // Since discovery may already be in progress when this method is called,
   // callers should retrieve the current set of discovered devices by calling
-  // GetDevices() and checking for those with IsVisible() as true.
+  // GetDevices() and checking for those with IsPaired() as false.
   virtual void StartDiscovering(const base::Closure& callback,
                                 const ErrorCallback& error_callback) = 0;
 
   // Requests that an earlier call to StartDiscovering() be cancelled; the
   // adapter may not actually cease discovering devices if other callers
   // have called StartDiscovering() and not yet called this method. On
   // success |callback| will be called, on failure |error_callback| will be
   // called instead.
   virtual void StopDiscovering(const base::Closure& callback,
                                const ErrorCallback& error_callback) = 0;
@@ skipping 26 matching lines @@
   // adapter. The key is the Bluetooth address of the device and the value
   // is the BluetoothDevice object whose lifetime is managed by the
   // adapter instance.
   typedef std::map<const std::string, BluetoothDevice*> DevicesMap;
   DevicesMap devices_;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_