Reduce usage of FOR_EACH_OBSERVER macro in chrome/browser/signin

chrome/browser/download/download_history.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.
 
 // DownloadHistory manages persisting DownloadItems to the history service by
 // observing a single DownloadManager and all its DownloadItems using an
 // AllDownloadItemNotifier.
 //
 // DownloadHistory decides whether and when to add items to, remove items from,
 // and update items in the database. DownloadHistory uses DownloadHistoryData to
@@ skipping 206 matching lines @@
   for (content::DownloadManager::DownloadVector::const_iterator
        it = items.begin(); it != items.end(); ++it) {
     OnDownloadCreated(notifier_.GetManager(), *it);
   }
   history_->QueryDownloads(base::Bind(
       &DownloadHistory::QueryCallback, weak_ptr_factory_.GetWeakPtr()));
 }
 
 DownloadHistory::~DownloadHistory() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadHistoryDestroyed());
+  for (Observer& observer : observers_)
+    observer.OnDownloadHistoryDestroyed();
   observers_.Clear();
 }
 
 void DownloadHistory::AddObserver(DownloadHistory::Observer* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   observers_.AddObserver(observer);
 
   if (initial_history_query_complete_)
     observer->OnHistoryQueryComplete();
 }
@@ skipping 43 matching lines @@
       item->UpdateObservers();
     }
 #endif
     DCHECK_EQ(DownloadHistoryData::PERSISTED,
               DownloadHistoryData::Get(item)->state());
     ++history_size_;
   }
   notifier_.GetManager()->CheckForHistoryFilesRemoval();
 
   initial_history_query_complete_ = true;
-  FOR_EACH_OBSERVER(Observer, observers_, OnHistoryQueryComplete());
+  for (Observer& observer : observers_)
+    observer.OnHistoryQueryComplete();
 }
 
 void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   uint32_t download_id = item->GetId();
   DownloadHistoryData* data = DownloadHistoryData::Get(item);
   bool removing = removing_ids_.find(download_id) != removing_ids_.end();
 
   // TODO(benjhayden): Remove IsTemporary().
   if (download_crx_util::IsExtensionDownload(*item) ||
       item->IsTemporary() ||
       (data->state() != DownloadHistoryData::NOT_PERSISTED) ||
       removing)
     return;
 
   data->SetState(DownloadHistoryData::PERSISTING);
   if (data->info() == NULL) {
     // Keep the info here regardless of whether the item is in progress so that,
     // when ItemAdded() calls OnDownloadUpdated(), it can decide whether to
     // Update the db and/or clear the info.
     data->set_info(GetDownloadRow(item));
   }
 
   history_->CreateDownload(*data->info(), base::Bind(
       &DownloadHistory::ItemAdded, weak_ptr_factory_.GetWeakPtr(),
       download_id));
-  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
-      item, *data->info()));
+  for (Observer& observer : observers_)
+    observer.OnDownloadStored(item, *data->info());
 }
 
 void DownloadHistory::ItemAdded(uint32_t download_id, bool success) {
   if (removed_while_adding_.find(download_id) !=
       removed_while_adding_.end()) {
     removed_while_adding_.erase(download_id);
     if (success)
       ScheduleRemoveDownload(download_id);
     return;
   }
@@ skipping 26 matching lines @@
 
   UMA_HISTOGRAM_CUSTOM_COUNTS("Download.HistorySize2",
                               history_size_,
                               1/*min*/,
                               (1 << 23)/*max*/,
                               (1 << 7)/*num_buckets*/);
   ++history_size_;
 
   // Notify the observer about the change in the persistence state.
   if (was_persisted != IsPersisted(item)) {
-    FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
-        item, *data->info()));
+    for (Observer& observer : observers_)
+      observer.OnDownloadStored(item, *data->info());
   }
 
   // In case the item changed or became temporary while it was being added.
   OnDownloadUpdated(notifier_.GetManager(), item);
 }
 
 void DownloadHistory::OnDownloadCreated(
     content::DownloadManager* manager, content::DownloadItem* item) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 24 matching lines @@
     OnDownloadRemoved(notifier_.GetManager(), item);
     return;
   }
 
   history::DownloadRow current_info(GetDownloadRow(item));
   bool should_update = ShouldUpdateHistory(data->info(), current_info);
   UMA_HISTOGRAM_ENUMERATION("Download.HistoryPropagatedUpdate",
                             should_update, 2);
   if (should_update) {
     history_->UpdateDownload(current_info);
-    FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
-        item, current_info));
+    for (Observer& observer : observers_)
+      observer.OnDownloadStored(item, current_info);
   }
   if (item->GetState() == content::DownloadItem::IN_PROGRESS) {
     data->set_info(current_info);
   } else {
     data->clear_info();
   }
 }
 
 void DownloadHistory::OnDownloadOpened(
     content::DownloadManager* manager, content::DownloadItem* item) {
@@ skipping 33 matching lines @@
                    weak_ptr_factory_.GetWeakPtr()));
   }
   removing_ids_.insert(download_id);
 }
 
 void DownloadHistory::RemoveDownloadsBatch() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   IdSet remove_ids;
   removing_ids_.swap(remove_ids);
   history_->RemoveDownloads(remove_ids);
-  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadsRemoved(remove_ids));
+  for (Observer& observer : observers_)
+    observer.OnDownloadsRemoved(remove_ids);
 }