Index: chrome/browser/download/download_history.cc |
diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc |
index 510de553f51344665d75bee713238b927e58f7f4..49262d0d42d9fca3591ac486b2b6a0d48e259efc 100644 |
--- a/chrome/browser/download/download_history.cc |
+++ b/chrome/browser/download/download_history.cc |
@@ -224,7 +224,8 @@ DownloadHistory::DownloadHistory(content::DownloadManager* manager, |
DownloadHistory::~DownloadHistory() { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
- FOR_EACH_OBSERVER(Observer, observers_, OnDownloadHistoryDestroyed()); |
+ for (Observer& observer : observers_) |
+ observer.OnDownloadHistoryDestroyed(); |
observers_.Clear(); |
} |
@@ -288,7 +289,8 @@ void DownloadHistory::QueryCallback(std::unique_ptr<InfoVector> infos) { |
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) { |
@@ -316,8 +318,8 @@ void DownloadHistory::MaybeAddToHistory(content::DownloadItem* 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) { |
@@ -364,8 +366,8 @@ void DownloadHistory::ItemAdded(uint32_t download_id, bool success) { |
// 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. |
@@ -410,8 +412,8 @@ void DownloadHistory::OnDownloadUpdated( |
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); |
@@ -465,5 +467,6 @@ void DownloadHistory::RemoveDownloadsBatch() { |
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); |
} |