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

device/bluetooth/bluetooth_remote_gatt_service_chromeos.h

Index: device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
index 600233dc51510d2687238b2744dc5c201d9d41a0..54bde8930fcfec7edc5fa5e614ffc5244473e383 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
@@ -40,10 +40,6 @@ class BluetoothRemoteGattServiceChromeOS
       public BluetoothGattCharacteristicClient::Observer {
  public:
   // device::BluetoothGattService overrides.
-  virtual void AddObserver(
-      device::BluetoothGattService::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      device::BluetoothGattService::Observer* observer) OVERRIDE;
   virtual std::string GetIdentifier() const OVERRIDE;
   virtual device::BluetoothUUID GetUUID() const OVERRIDE;
   virtual bool IsLocal() const OVERRIDE;
@@ -68,7 +64,7 @@ class BluetoothRemoteGattServiceChromeOS
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
   // Returns the adapter associated with this service.
-  scoped_refptr<device::BluetoothAdapter> GetAdapter() const;
+  BluetoothAdapterChromeOS* GetAdapter() const;
 
   // Notifies its observers that the GATT service has changed. This is mainly
   // used by BluetoothRemoteGattCharacteristicChromeOS instances to notify
@@ -127,9 +123,6 @@ class BluetoothRemoteGattServiceChromeOS
   // Object path of the GATT service.
   dbus::ObjectPath object_path_;
 
-  // List of observers interested in event notifications from us.
-  ObserverList<device::BluetoothGattService::Observer> observers_;
-
   // The adapter associated with this service. It's ok to store a raw pointer
   // here since |adapter_| indirectly owns this instance.
   BluetoothAdapterChromeOS* adapter_;