Remove usage of FOR_EACH_OBSERVER macro in device/

device/bluetooth/bluetooth_adapter.cc

 // 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.
 
 #include "device/bluetooth/bluetooth_adapter.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 148 matching lines @@
 }
 
 BluetoothDevice::PairingDelegate* BluetoothAdapter::DefaultPairingDelegate() {
   if (pairing_delegates_.empty())
     return NULL;
 
   return pairing_delegates_.front().first;
 }
 
 void BluetoothAdapter::NotifyAdapterPoweredChanged(bool powered) {
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    AdapterPoweredChanged(this, powered));
+  for (auto& observer : observers_)
+    observer.AdapterPoweredChanged(this, powered);
 }
 
 void BluetoothAdapter::NotifyDeviceChanged(BluetoothDevice* device) {
   DCHECK(device);
   DCHECK_EQ(device->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    DeviceChanged(this, device));
+  for (auto& observer : observers_)
+    observer.DeviceChanged(this, device);
 }
 
 #if defined(OS_CHROMEOS) || defined(OS_LINUX)
 void BluetoothAdapter::NotifyDevicePairedChanged(BluetoothDevice* device,
                                                  bool new_paired_status) {
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    DevicePairedChanged(this, device, new_paired_status));
+  for (auto& observer : observers_)
+    observer.DevicePairedChanged(this, device, new_paired_status);
 }
 #endif
 
 void BluetoothAdapter::NotifyGattServiceAdded(
     BluetoothRemoteGattService* service) {
   DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattServiceAdded(this, service->GetDevice(), service));
+  for (auto& observer : observers_)
+    observer.GattServiceAdded(this, service->GetDevice(), service);
 }
 
 void BluetoothAdapter::NotifyGattServiceRemoved(
     BluetoothRemoteGattService* service) {
   DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattServiceRemoved(this, service->GetDevice(), service));
+  for (auto& observer : observers_)
+    observer.GattServiceRemoved(this, service->GetDevice(), service);
 }
 
 void BluetoothAdapter::NotifyGattServiceChanged(
     BluetoothRemoteGattService* service) {
   DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattServiceChanged(this, service));
+  for (auto& observer : observers_)
+    observer.GattServiceChanged(this, service);
 }
 
 void BluetoothAdapter::NotifyGattServicesDiscovered(BluetoothDevice* device) {
   DCHECK(device->GetAdapter() == this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattServicesDiscovered(this, device));
+  for (auto& observer : observers_)
+    observer.GattServicesDiscovered(this, device);
 }
 
 void BluetoothAdapter::NotifyGattDiscoveryComplete(
     BluetoothRemoteGattService* service) {
   DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattDiscoveryCompleteForService(this, service));
+  for (auto& observer : observers_)
+    observer.GattDiscoveryCompleteForService(this, service);
 }
 
 void BluetoothAdapter::NotifyGattCharacteristicAdded(
     BluetoothRemoteGattCharacteristic* characteristic) {
   DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattCharacteristicAdded(this, characteristic));
+  for (auto& observer : observers_)
+    observer.GattCharacteristicAdded(this, characteristic);
 }
 
 void BluetoothAdapter::NotifyGattCharacteristicRemoved(
     BluetoothRemoteGattCharacteristic* characteristic) {
   DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattCharacteristicRemoved(this, characteristic));
+  for (auto& observer : observers_)
+    observer.GattCharacteristicRemoved(this, characteristic);
 }
 
 void BluetoothAdapter::NotifyGattDescriptorAdded(
     BluetoothRemoteGattDescriptor* descriptor) {
   DCHECK_EQ(
       descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
       this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattDescriptorAdded(this, descriptor));
+  for (auto& observer : observers_)
+    observer.GattDescriptorAdded(this, descriptor);
 }
 
 void BluetoothAdapter::NotifyGattDescriptorRemoved(
     BluetoothRemoteGattDescriptor* descriptor) {
   DCHECK_EQ(
       descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
       this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattDescriptorRemoved(this, descriptor));
+  for (auto& observer : observers_)
+    observer.GattDescriptorRemoved(this, descriptor);
 }
 
 void BluetoothAdapter::NotifyGattCharacteristicValueChanged(
     BluetoothRemoteGattCharacteristic* characteristic,
     const std::vector<uint8_t>& value) {
   DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
 
-  FOR_EACH_OBSERVER(
-      BluetoothAdapter::Observer, observers_,
-      GattCharacteristicValueChanged(this, characteristic, value));
+  for (auto& observer : observers_)
+    observer.GattCharacteristicValueChanged(this, characteristic, value);
 }
 
 void BluetoothAdapter::NotifyGattDescriptorValueChanged(
     BluetoothRemoteGattDescriptor* descriptor,
     const std::vector<uint8_t>& value) {
   DCHECK_EQ(
       descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
       this);
 
-  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                    GattDescriptorValueChanged(this, descriptor, value));
+  for (auto& observer : observers_)
+    observer.GattDescriptorValueChanged(this, descriptor, value);
 }
 
 BluetoothAdapter::BluetoothAdapter() : weak_ptr_factory_(this) {
 }
 
 BluetoothAdapter::~BluetoothAdapter() {
 }
 
 void BluetoothAdapter::OnStartDiscoverySession(
     std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter,
@@ skipping 99 matching lines @@
       continue;
     }
 
     VLOG(1) << "Removing device: " << device->GetAddress();
     DevicesMap::iterator next = it;
     next++;
     std::unique_ptr<BluetoothDevice> removed_device =
         devices_.take_and_erase(it);
     it = next;
 
-    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                      DeviceRemoved(this, removed_device.get()));
+    for (auto& observer : observers_)
+      observer.DeviceRemoved(this, removed_device.get());
   }
 }
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStartOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Start.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStopOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Stop.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 // static
 const base::TimeDelta BluetoothAdapter::timeoutSec =
     base::TimeDelta::FromSeconds(180);
 
 }  // namespace device