Reduce usage of FOR_EACH_OBSERVER macro in content/browser

content/browser/notification_service_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/notification_service_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 87 matching lines @@
                                      const NotificationDetails& details) {
   DCHECK_GT(type, NOTIFICATION_ALL) <<
       "Allowed for observing, but not posting.";
 
   // There's no particular reason for the order in which the different
   // classes of observers get notified here.
 
   // Notify observers of all types and all sources
   if (HasKey(observers_[NOTIFICATION_ALL], AllSources()) &&
       source != AllSources()) {
-    FOR_EACH_OBSERVER(NotificationObserver,
-                      *observers_[NOTIFICATION_ALL][AllSources().map_key()],
-                      Observe(type, source, details));
+    for (auto& observer : *observers_[NOTIFICATION_ALL][AllSources().map_key()])
+      observer.Observe(type, source, details);
   }
 
   // Notify observers of all types and the given source
   if (HasKey(observers_[NOTIFICATION_ALL], source)) {
-    FOR_EACH_OBSERVER(NotificationObserver,
-                      *observers_[NOTIFICATION_ALL][source.map_key()],
-                      Observe(type, source, details));
+    for (auto& observer : *observers_[NOTIFICATION_ALL][source.map_key()])
+      observer.Observe(type, source, details);
   }
 
   // Notify observers of the given type and all sources
   if (HasKey(observers_[type], AllSources()) &&
       source != AllSources()) {
-    FOR_EACH_OBSERVER(NotificationObserver,
-                      *observers_[type][AllSources().map_key()],
-                      Observe(type, source, details));
+    for (auto& observer : *observers_[type][AllSources().map_key()])
+      observer.Observe(type, source, details);
   }
 
   // Notify observers of the given type and the given source
   if (HasKey(observers_[type], source)) {
-    FOR_EACH_OBSERVER(NotificationObserver,
-                      *observers_[type][source.map_key()],
-                      Observe(type, source, details));
+    for (auto& observer : *observers_[type][source.map_key()])
+      observer.Observe(type, source, details);
   }
 }
 
 
 NotificationServiceImpl::~NotificationServiceImpl() {
   lazy_tls_ptr.Pointer()->Set(NULL);
 
 #ifndef NDEBUG
   for (int i = 0; i < static_cast<int>(observer_counts_.size()); i++) {
     if (observer_counts_[i] > 0) {
       // This may not be completely fixable -- see
       // http://code.google.com/p/chromium/issues/detail?id=11010 .
       VLOG(1) << observer_counts_[i] << " notification observer(s) leaked "
                  "of notification type " << i;
     }
   }
 #endif
 
   for (int i = 0; i < static_cast<int>(observers_.size()); i++) {
     NotificationSourceMap omap = observers_[i];
     for (NotificationSourceMap::iterator it = omap.begin();
          it != omap.end(); ++it)
       delete it->second;
   }
 }
 
 }  // namespace content