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

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright 2013 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.
 
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 135 matching lines @@
 BluetoothDeviceChromeOS::~BluetoothDeviceChromeOS() {
   DBusThreadManager::Get()->GetBluetoothGattServiceClient()->
       RemoveObserver(this);
 
   // Copy the GATT services list here and clear the original so that when we
   // send GattServiceRemoved(), GetGattServices() returns no services.
   GattServiceMap gatt_services = gatt_services_;
   gatt_services_.clear();
   for (GattServiceMap::iterator iter = gatt_services.begin();
        iter != gatt_services.end(); ++iter) {
-    FOR_EACH_OBSERVER(BluetoothDevice::Observer, observers_,
-                      GattServiceRemoved(this, iter->second));
+    DCHECK(adapter_);
+    adapter_->NotifyGattServiceRemoved(
+        static_cast<BluetoothRemoteGattServiceChromeOS*>(iter->second));
     delete iter->second;
   }
 }
 
-void BluetoothDeviceChromeOS::AddObserver(
-    device::BluetoothDevice::Observer* observer) {
-  DCHECK(observer);
-  observers_.AddObserver(observer);
-}
-
-void BluetoothDeviceChromeOS::RemoveObserver(
-    device::BluetoothDevice::Observer* observer) {
-  DCHECK(observer);
-  observers_.RemoveObserver(observer);
-}
-
 uint32 BluetoothDeviceChromeOS::GetBluetoothClass() const {
   BluetoothDeviceClient::Properties* properties =
       DBusThreadManager::Get()->GetBluetoothDeviceClient()->
           GetProperties(object_path_);
   DCHECK(properties);
 
   return properties->bluetooth_class.value();
 }
 
 std::string BluetoothDeviceChromeOS::GetDeviceName() const {
@@ skipping 319 matching lines @@
 
   VLOG(1) << "Adding new remote GATT service for device: " << GetAddress();
 
   BluetoothRemoteGattServiceChromeOS* service =
       new BluetoothRemoteGattServiceChromeOS(adapter_, this, object_path);
 
   gatt_services_[service->GetIdentifier()] = service;
   DCHECK(service->object_path() == object_path);
   DCHECK(service->GetUUID().IsValid());
 
-  FOR_EACH_OBSERVER(device::BluetoothDevice::Observer, observers_,
-                    GattServiceAdded(this, service));
+  DCHECK(adapter_);
+  adapter_->NotifyGattServiceAdded(service);
 }
 
 void BluetoothDeviceChromeOS::GattServiceRemoved(
     const dbus::ObjectPath& object_path) {
   GattServiceMap::iterator iter = gatt_services_.find(object_path.value());
   if (iter == gatt_services_.end()) {
     VLOG(3) << "Unknown GATT service removed: " << object_path.value();
     return;
   }
 
   VLOG(1) << "Removing remote GATT service from device: " << GetAddress();
 
   BluetoothRemoteGattServiceChromeOS* service =
       static_cast<BluetoothRemoteGattServiceChromeOS*>(iter->second);
   DCHECK(service->object_path() == object_path);
   gatt_services_.erase(iter);
-  FOR_EACH_OBSERVER(device::BluetoothDevice::Observer, observers_,
-                    GattServiceRemoved(this, service));
+
+  DCHECK(adapter_);
+  adapter_->NotifyGattServiceRemoved(service);
+
   delete service;
 }
 
 void BluetoothDeviceChromeOS::ConnectInternal(
     bool after_pairing,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   VLOG(1) << object_path_.value() << ": Connecting";
   DBusThreadManager::Get()->GetBluetoothDeviceClient()->
       Connect(
@@ skipping 166 matching lines @@
 void BluetoothDeviceChromeOS::OnForgetError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   LOG(WARNING) << object_path_.value() << ": Failed to remove device: "
                << error_name << ": " << error_message;
   error_callback.Run();
 }
 
 }  // namespace chromeos