Reduce usage of FOR_EACH_OBSERVER macro in content/browser

content/browser/download/download_manager_impl.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 "content/browser/download/download_manager_impl.h"
 
 #include <iterator>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 256 matching lines @@
 DownloadManagerDelegate* DownloadManagerImpl::GetDelegate() const {
   return delegate_;
 }
 
 void DownloadManagerImpl::Shutdown() {
   DVLOG(20) << __func__ << "() shutdown_needed_ = " << shutdown_needed_;
   if (!shutdown_needed_)
     return;
   shutdown_needed_ = false;
 
-  FOR_EACH_OBSERVER(Observer, observers_, ManagerGoingDown(this));
+  for (auto& observer : observers_)
+    observer.ManagerGoingDown(this);
   // TODO(benjhayden): Consider clearing observers_.
 
   // If there are in-progress downloads, cancel them. This also goes for
   // dangerous downloads which will remain in history if they aren't explicitly
   // accepted or discarded. Canceling will remove the intermediate download
   // file.
   for (const auto& it : downloads_) {
     DownloadItemImpl* download = it.second;
     if (download->GetState() == DownloadItem::IN_PROGRESS)
       download->Cancel(false);
@@ skipping 88 matching lines @@
   // attempt.
 
   download->Start(std::move(download_file), std::move(info->request_handle),
                   *info);
 
   // For interrupted downloads, Start() will transition the state to
   // IN_PROGRESS and consumers will be notified via OnDownloadUpdated().
   // For new downloads, we notify here, rather than earlier, so that
   // the download_file is bound to download and all the usual
   // setters (e.g. Cancel) work.
-  if (new_download)
-    FOR_EACH_OBSERVER(Observer, observers_, OnDownloadCreated(this, download));
+  if (new_download) {
+    for (auto& observer : observers_)
+      observer.OnDownloadCreated(this, download);
+  }
 
   if (!on_started.is_null())
     on_started.Run(download, DOWNLOAD_INTERRUPT_REASON_NONE);
 }
 
 void DownloadManagerImpl::CheckForHistoryFilesRemoval() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (const auto& it : downloads_) {
     DownloadItemImpl* item = it.second;
     CheckForFileRemoval(item);
@@ skipping 55 matching lines @@
   DCHECK_NE(content::DownloadItem::kInvalidId, id);
   DCHECK(!base::ContainsKey(downloads_, id));
   net::NetLogWithSource net_log =
       net::NetLogWithSource::Make(net_log_, net::NetLogSourceType::DOWNLOAD);
   DownloadItemImpl* download_item = item_factory_->CreateSavePageItem(
       this, id, main_file_path, page_url, mime_type, std::move(request_handle),
       net_log);
   downloads_[download_item->GetId()] = download_item;
   DCHECK(!base::ContainsKey(downloads_by_guid_, download_item->GetGuid()));
   downloads_by_guid_[download_item->GetGuid()] = download_item;
-  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadCreated(
-      this, download_item));
+  for (auto& observer : observers_)
+    observer.OnDownloadCreated(this, download_item);
   if (!item_created.is_null())
     item_created.Run(download_item);
 }
 
 void DownloadManagerImpl::OnSavePackageSuccessfullyFinished(
     DownloadItem* download_item) {
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    OnSavePackageSuccessfullyFinished(this, download_item));
+  for (auto& observer : observers_)
+    observer.OnSavePackageSuccessfullyFinished(this, download_item);
 }
 
 // Resume a download of a specific URL. We send the request to the
 // ResourceDispatcherHost, and let it send us responses like a regular
 // download.
 void DownloadManagerImpl::ResumeInterruptedDownload(
     std::unique_ptr<content::DownloadUrlParameters> params,
     uint32_t id) {
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::IO, FROM_HERE,
@@ skipping 215 matching lines @@
   }
   DCHECK(!base::ContainsKey(downloads_by_guid_, guid));
   DownloadItemImpl* item = item_factory_->CreatePersistedItem(
       this, guid, id, current_path, target_path, url_chain, referrer_url,
       site_url, tab_url, tab_refererr_url, mime_type, original_mime_type,
       start_time, end_time, etag, last_modified, received_bytes, total_bytes,
       hash, state, danger_type, interrupt_reason, opened,
       net::NetLogWithSource::Make(net_log_, net::NetLogSourceType::DOWNLOAD));
   downloads_[id] = item;
   downloads_by_guid_[guid] = item;
-  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadCreated(this, item));
+  for (auto& observer : observers_)
+    observer.OnDownloadCreated(this, item);
   DVLOG(20) << __func__ << "() download = " << item->DebugString(true);
   return item;
 }
 
 int DownloadManagerImpl::InProgressCount() const {
   int count = 0;
   for (const auto& it : downloads_) {
     if (it.second->GetState() == DownloadItem::IN_PROGRESS)
       ++count;
   }
@@ skipping 45 matching lines @@
   if (delegate_)
     delegate_->OpenDownload(download);
 }
 
 void DownloadManagerImpl::ShowDownloadInShell(DownloadItemImpl* download) {
   if (delegate_)
     delegate_->ShowDownloadInShell(download);
 }
 
 }  // namespace content