device/bluetooth: Move GATT observer methods to BluetoothAdapter::Observer.

device/bluetooth/bluetooth_device.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_DEVICE_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 63 matching lines @@
     ERROR_UNKNOWN,
     ERROR_INPROGRESS,
     ERROR_FAILED,
     ERROR_AUTH_FAILED,
     ERROR_AUTH_CANCELED,
     ERROR_AUTH_REJECTED,
     ERROR_AUTH_TIMEOUT,
     ERROR_UNSUPPORTED_DEVICE
   };
 
-  // Interface for observing changes from bluetooth devices.
-  class Observer {
-   public:
-    virtual ~Observer() {}
-
-    // Called when a new GATT service |service| is added to the device |device|,
-    // as the service is received from the device. Don't cache |service|. Store
-    // its identifier instead (i.e. BluetoothGattService::GetIdentifier).
-    virtual void GattServiceAdded(BluetoothDevice* device,
-                                  BluetoothGattService* service) {}
-
-    // Called when the GATT service |service| is removed from the device
-    // |device|. This can happen if the attribute database of the remote device
-    // changes or when |device| gets removed.
-    virtual void GattServiceRemoved(BluetoothDevice* device,
-                                    BluetoothGattService* service) {}
-
-    // TODO(keybuk): add observers for pairing and connection.
-  };
-
   // Interface for negotiating pairing of bluetooth devices.
   class PairingDelegate {
    public:
     virtual ~PairingDelegate() {}
 
     // This method will be called when the Bluetooth daemon requires a
     // PIN Code for authentication of the device |device|, the delegate should
     // obtain the code from the user and call SetPinCode() on the device to
     // provide it, or RejectPairing() or CancelPairing() to reject or cancel
     // the request.
@@ skipping 69 matching lines @@
     // authorized. The delegate should decide whether the user should confirm
     // or not, then call ConfirmPairing() on the device to confirm the pairing
     // (whether by user action or by default), RejectPairing() on the device to
     // reject or CancelPairing() on the device to cancel authorization for
     // any other reason.
     virtual void AuthorizePairing(BluetoothDevice* device) = 0;
   };
 
   virtual ~BluetoothDevice();
 
-  // Adds and removes observers for events on this Bluetooth device. If
-  // monitoring multiple devices, check the |device| parameter of the observer
-  // methods to determine which device is issuing the event.
-  virtual void AddObserver(Observer* observer) = 0;
-  virtual void RemoveObserver(Observer* observer) = 0;
-
   // Returns the Bluetooth class of the device, used by GetDeviceType()
   // and metrics logging,
   virtual uint32 GetBluetoothClass() const = 0;
 
   // Returns the Bluetooth of address the device. This should be used as
   // a unique key to identify the device and copied where needed.
   virtual std::string GetAddress() const = 0;
 
   // Returns the allocation source of the identifier returned by GetVendorID(),
   // where available, or VENDOR_ID_UNKNOWN where not.
@@ skipping 220 matching lines @@
 
  private:
   // Returns a localized string containing the device's bluetooth address and
   // a device type for display when |name_| is empty.
   base::string16 GetAddressWithLocalizedDeviceTypeName() const;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_