Reduce FOR_EACH_OBSERVER usage in ui/

ui/display/display_list.cc

 // Copyright 2016 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 "ui/display/display_list.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/display/display_observer.h"
 
 namespace display {
@@ skipping 74 matching lines @@
   if (local_display->rotation() != display.rotation()) {
     local_display->set_rotation(display.rotation());
     changed_values |= display::DisplayObserver::DISPLAY_METRIC_ROTATION;
   }
   if (local_display->device_scale_factor() != display.device_scale_factor()) {
     local_display->set_device_scale_factor(display.device_scale_factor());
     changed_values |=
         display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
   }
   if (should_notify_observers()) {
-    FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
-                      OnDisplayMetricsChanged(*local_display, changed_values));
+    for (display::DisplayObserver& observer : observers_)
+      observer.OnDisplayMetricsChanged(*local_display, changed_values);
   }
 }
 
 void DisplayList::AddDisplay(const display::Display& display, Type type) {
   DCHECK(displays_.end() == FindDisplayById(display.id()));
   displays_.push_back(display);
   if (type == Type::PRIMARY)
     primary_display_index_ = static_cast<int>(displays_.size()) - 1;
   if (should_notify_observers()) {
-    FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
-                      OnDisplayAdded(display));
+    for (display::DisplayObserver& observer : observers_)
+      observer.OnDisplayAdded(display);
   }
 }
 
 void DisplayList::RemoveDisplay(int64_t id) {
   auto iter = FindDisplayById(id);
   DCHECK(displays_.end() != iter);
   if (primary_display_index_ == static_cast<int>(iter - displays_.begin())) {
     // The primary display can only be removed if it is the last display.
     // Users must choose a new primary before removing an old primary display.
     DCHECK_EQ(1u, displays_.size());
     primary_display_index_ = -1;
   } else if (primary_display_index_ >
              static_cast<int>(iter - displays_.begin())) {
     primary_display_index_--;
   }
   const display::Display display = *iter;
   displays_.erase(iter);
   if (should_notify_observers()) {
-    FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
-                      OnDisplayRemoved(display));
+    for (display::DisplayObserver& observer : observers_)
+      observer.OnDisplayRemoved(display);
   }
 }
 
 void DisplayList::IncrementObserverSuspendLockCount() {
   observer_suspend_lock_count_++;
 }
 
 void DisplayList::DecrementObserverSuspendLockCount() {
   DCHECK_GT(observer_suspend_lock_count_, 0);
   observer_suspend_lock_count_--;
 }
 
 }  // namespace display