Reduce FOR_EACH_OBSERVER macro usage in chrome/browser

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

 // Copyright 2015 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 "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 183 matching lines @@
 
   auto* sinks_query = it->second;
   sinks_query->has_cached_result = true;
   sinks_query->origins.swap(origin_list);
   sinks_query->cached_sink_list.swap(sink_list);
 
   if (!sinks_query->observers.might_have_observers()) {
     DVLOG_WITH_INSTANCE(1)
         << "Received sink list without any active observers: " << media_source;
   } else {
-    FOR_EACH_OBSERVER(
-        MediaSinksObserver, sinks_query->observers,
-        OnSinksUpdated(sinks_query->cached_sink_list, sinks_query->origins));
+    for (auto& observer : sinks_query->observers) {
+      observer.OnSinksUpdated(sinks_query->cached_sink_list,
+                              sinks_query->origins);
+    }
   }
 }
 
 void MediaRouterMojoImpl::OnRoutesUpdated(
     std::vector<mojom::MediaRoutePtr> routes,
     const std::string& media_source,
     const std::vector<std::string>& joinable_route_ids) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   DVLOG_WITH_INSTANCE(1) << "OnRoutesUpdated";
   auto it = routes_queries_.find(media_source);
   if (it == routes_queries_.end() ||
       !(it->second->observers.might_have_observers())) {
     DVLOG_WITH_INSTANCE(1)
         << "Received route list without any active observers: " << media_source;
     return;
   }
 
   std::vector<MediaRoute> routes_converted;
   routes_converted.reserve(routes.size());
   for (size_t i = 0; i < routes.size(); ++i)
     routes_converted.push_back(routes[i].To<MediaRoute>());
 
-  FOR_EACH_OBSERVER(
-      MediaRoutesObserver, it->second->observers,
-      OnRoutesUpdated(routes_converted, joinable_route_ids));
+  for (auto& observer : it->second->observers)
+    observer.OnRoutesUpdated(routes_converted, joinable_route_ids);
 }
 
 void MediaRouterMojoImpl::RouteResponseReceived(
     const std::string& presentation_id,
     bool incognito,
     const std::vector<MediaRouteResponseCallback>& callbacks,
     mojom::MediaRoutePtr media_route,
     const base::Optional<std::string>& error_text,
     mojom::RouteRequestResultCode result_code) {
   std::unique_ptr<RouteRequestResult> result;
@@ skipping 460 matching lines @@
   DVLOG_WITH_INSTANCE(1) << "OnRouteMessagesReceived";
 
   if (messages.empty())
     return;
 
   auto* observer_list = message_observers_.get(route_id);
   if (!observer_list) {
     return;
   }
 
-  FOR_EACH_OBSERVER(RouteMessageObserver, *observer_list,
-                    OnMessagesReceived(messages));
+  for (auto& observer : *observer_list)
+    observer.OnMessagesReceived(messages);
 }
 
 void MediaRouterMojoImpl::OnSinkAvailabilityUpdated(
     SinkAvailability availability) {
   if (availability_ == availability)
     return;
 
   availability_ = availability;
   if (availability_ == mojom::MediaRouter::SinkAvailability::UNAVAILABLE) {
     // Sinks are no longer available. MRPM has already removed all sink queries.
@@ skipping 247 matching lines @@
                         base::Unretained(this), source_id));
 }
 
 void MediaRouterMojoImpl::DoUpdateMediaSinks(
     const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoUpdateMediaSinks" << source_id;
   media_route_provider_->UpdateMediaSinks(source_id);
 }
 
 }  // namespace media_router