Remove usage of FOR_EACH_OBSERVER macro in ash/common

ash/common/shelf/shelf_model.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 "ash/common/shelf/shelf_model.h"
 
 #include <algorithm>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
@@ skipping 46 matching lines @@
 }
 
 int ShelfModel::Add(const ShelfItem& item) {
   return AddAt(items_.size(), item);
 }
 
 int ShelfModel::AddAt(int index, const ShelfItem& item) {
   index = ValidateInsertionIndex(item.type, index);
   items_.insert(items_.begin() + index, item);
   items_[index].id = next_id_++;
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_, ShelfItemAdded(index));
+  for (auto& observer : observers_)
+    observer.ShelfItemAdded(index);
   return index;
 }
 
 void ShelfModel::RemoveItemAt(int index) {
   DCHECK(index >= 0 && index < item_count());
   // The app list and browser shortcut can't be removed.
   DCHECK(items_[index].type != TYPE_APP_LIST &&
          items_[index].type != TYPE_BROWSER_SHORTCUT);
   ShelfID id = items_[index].id;
   items_.erase(items_.begin() + index);
   RemoveShelfItemDelegate(id);
   // TODO(jamescook): Fold this into ShelfItemRemoved in existing observers.
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
-                    OnSetShelfItemDelegate(id, nullptr));
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
-                    ShelfItemRemoved(index, id));
+  for (auto& observer : observers_)
+    observer.OnSetShelfItemDelegate(id, nullptr);
+  for (auto& observer : observers_)
+    observer.ShelfItemRemoved(index, id);
 }
 
 void ShelfModel::Move(int index, int target_index) {
   if (index == target_index)
     return;
   // TODO: this needs to enforce valid ranges.
   ShelfItem item(items_[index]);
   items_.erase(items_.begin() + index);
   items_.insert(items_.begin() + target_index, item);
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
-                    ShelfItemMoved(index, target_index));
+  for (auto& observer : observers_)
+    observer.ShelfItemMoved(index, target_index);
 }
 
 void ShelfModel::Set(int index, const ShelfItem& item) {
   DCHECK(index >= 0 && index < item_count());
   int new_index = item.type == items_[index].type
                       ? index
                       : ValidateInsertionIndex(item.type, index);
 
   ShelfItem old_item(items_[index]);
   items_[index] = item;
   items_[index].id = old_item.id;
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
-                    ShelfItemChanged(index, old_item));
+  for (auto& observer : observers_)
+    observer.ShelfItemChanged(index, old_item);
 
   // If the type changes confirm that the item is still in the right order.
   if (new_index != index) {
     // The move function works by removing one item and then inserting it at the
     // new location. However - by removing the item first the order will change
     // so that our target index needs to be corrected.
     // TODO(skuhne): Moving this into the Move function breaks lots of unit
     // tests. So several functions were already using this incorrectly.
     // That needs to be cleaned up.
     if (index < new_index)
@@ skipping 45 matching lines @@
 }
 
 void ShelfModel::SetShelfItemDelegate(
     ShelfID id,
     std::unique_ptr<ShelfItemDelegate> item_delegate) {
   // If another ShelfItemDelegate is already registered for |id|, we assume
   // that this request is replacing ShelfItemDelegate for |id| with
   // |item_delegate|.
   RemoveShelfItemDelegate(id);
 
-  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
-                    OnSetShelfItemDelegate(id, item_delegate.get()));
+  for (auto& observer : observers_)
+    observer.OnSetShelfItemDelegate(id, item_delegate.get());
 
   id_to_item_delegate_map_[id] = std::move(item_delegate);
 }
 
 ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     return id_to_item_delegate_map_[id].get();
   return nullptr;
 }
 
@@ skipping 22 matching lines @@
 
   return index;
 }
 
 void ShelfModel::RemoveShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     id_to_item_delegate_map_.erase(id);
 }
 
 }  // namespace ash