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

device/bluetooth/bluetooth_remote_gatt_service_chromeos.h

 // Copyright 2014 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_REMOTE_GATT_SERVICE_CHROMEOS_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_CHROMEOS_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 class BluetoothRemoteGattDescriptorChromeOS;
 
 // The BluetoothRemoteGattServiceChromeOS class implements BluetootGattService
 // for remote GATT services on the the Chrome OS platform.
 class BluetoothRemoteGattServiceChromeOS
     : public device::BluetoothGattService,
       public BluetoothGattServiceClient::Observer,
       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;
   virtual bool IsPrimary() const OVERRIDE;
   virtual device::BluetoothDevice* GetDevice() const OVERRIDE;
   virtual std::vector<device::BluetoothGattCharacteristic*>
       GetCharacteristics() const OVERRIDE;
   virtual std::vector<device::BluetoothGattService*>
       GetIncludedServices() const OVERRIDE;
   virtual device::BluetoothGattCharacteristic* GetCharacteristic(
       const std::string& identifier) const OVERRIDE;
   virtual bool AddCharacteristic(
       device::BluetoothGattCharacteristic* characteristic) OVERRIDE;
   virtual bool AddIncludedService(
       device::BluetoothGattService* service) OVERRIDE;
   virtual void Register(const base::Closure& callback,
                         const ErrorCallback& error_callback) OVERRIDE;
   virtual void Unregister(const base::Closure& callback,
                           const ErrorCallback& error_callback) OVERRIDE;
 
   // Object path of the underlying service.
   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
   // service observers when characteristic descriptors get added and removed.
   void NotifyServiceChanged();
 
   // Notifies its observers that the value of a characteristic has changed.
   // Called by BluetoothRemoteGattCharacteristicChromeOS instances to notify
   // service observers when their cached value is updated after a successful
   // read request or when a "ValueUpdated" signal is received.
@@ skipping 38 matching lines @@
       const dbus::ObjectPath& object_path) OVERRIDE;
   virtual void GattCharacteristicRemoved(
       const dbus::ObjectPath& object_path) OVERRIDE;
   virtual void GattCharacteristicPropertyChanged(
       const dbus::ObjectPath& object_path,
       const std::string& property_name) OVERRIDE;
 
   // 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_;
 
   // The device this GATT service belongs to. It's ok to store a raw pointer
   // here since |device_| owns this instance.
   BluetoothDeviceChromeOS* device_;
 
   // Mapping from GATT characteristic object paths to characteristic objects.
   // owned by this service. Since the Chrome OS implementation uses object
@@ skipping 10 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothRemoteGattServiceChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattServiceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_CHROMEOS_H_