Reduce usage of FOR_EACH_OBSERVER macro in components/

components/ntp_snippets/content_suggestions_service.cc

 // Copyright 2016 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 "components/ntp_snippets/content_suggestions_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <utility>
@@ skipping 28 matching lines @@
 
 ContentSuggestionsService::~ContentSuggestionsService() = default;
 
 void ContentSuggestionsService::Shutdown() {
   ntp_snippets_service_ = nullptr;
   suggestions_by_category_.clear();
   providers_by_category_.clear();
   categories_.clear();
   providers_.clear();
   state_ = State::DISABLED;
-  FOR_EACH_OBSERVER(Observer, observers_, ContentSuggestionsServiceShutdown());
+  for (Observer& observer : observers_)
+    observer.ContentSuggestionsServiceShutdown();
 }
 
 // static
 void ContentSuggestionsService::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kDismissedCategories);
 }
 
 CategoryStatus ContentSuggestionsService::GetCategoryStatus(
     Category category) const {
@@ skipping 45 matching lines @@
   for (const auto& provider : providers_) {
     provider->ClearHistory(begin, end, filter);
   }
 }
 
 void ContentSuggestionsService::ClearAllCachedSuggestions() {
   suggestions_by_category_.clear();
   for (const auto& category_provider_pair : providers_by_category_) {
     category_provider_pair.second->ClearCachedSuggestions(
         category_provider_pair.first);
-    FOR_EACH_OBSERVER(Observer, observers_,
-                      OnNewSuggestions(category_provider_pair.first));
+    for (Observer& observer : observers_)
+      observer.OnNewSuggestions(category_provider_pair.first);
   }
 }
 
 void ContentSuggestionsService::ClearCachedSuggestions(Category category) {
   suggestions_by_category_[category].clear();
   auto iterator = providers_by_category_.find(category);
   if (iterator != providers_by_category_.end())
     iterator->second->ClearCachedSuggestions(category);
 }
 
@@ skipping 94 matching lines @@
   }
 
   if (!IsCategoryStatusAvailable(provider->GetCategoryStatus(category))) {
     // A provider shouldn't send us suggestions while it's not available.
     DCHECK(suggestions.empty());
     return;
   }
 
   suggestions_by_category_[category] = std::move(suggestions);
 
-  FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions(category));
+  for (Observer& observer : observers_)
+    observer.OnNewSuggestions(category);
 }
 
 void ContentSuggestionsService::OnCategoryStatusChanged(
     ContentSuggestionsProvider* provider,
     Category category,
     CategoryStatus new_status) {
   if (new_status == CategoryStatus::NOT_PROVIDED) {
     UnregisterCategory(category, provider);
   } else {
     if (!IsCategoryStatusAvailable(new_status))
       suggestions_by_category_.erase(category);
     TryRegisterProviderForCategory(provider, category);
     DCHECK_EQ(new_status, provider->GetCategoryStatus(category));
   }
 
   if (!IsCategoryDismissed(category))
     NotifyCategoryStatusChanged(category);
 }
 
 void ContentSuggestionsService::OnSuggestionInvalidated(
     ContentSuggestionsProvider* provider,
     const ContentSuggestion::ID& suggestion_id) {
   RemoveSuggestionByID(suggestion_id);
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    OnSuggestionInvalidated(suggestion_id));
+  for (Observer& observer : observers_)
+    observer.OnSuggestionInvalidated(suggestion_id);
 }
 
 // history::HistoryServiceObserver implementation.
 void ContentSuggestionsService::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   // We don't care about expired entries.
@@ skipping 102 matching lines @@
                      return suggestion_id == suggestion.id();
                    });
   if (position == suggestions->end())
     return false;
   suggestions->erase(position);
 
   return true;
 }
 
 void ContentSuggestionsService::NotifyCategoryStatusChanged(Category category) {
-  FOR_EACH_OBSERVER(
-      Observer, observers_,
-      OnCategoryStatusChanged(category, GetCategoryStatus(category)));
+  for (Observer& observer : observers_)
+    observer.OnCategoryStatusChanged(category, GetCategoryStatus(category));
 }
 
 void ContentSuggestionsService::SortCategories() {
   std::sort(categories_.begin(), categories_.end(),
             [this](const Category& left, const Category& right) {
               return category_factory_.CompareCategories(left, right);
             });
 }
 
 bool ContentSuggestionsService::IsCategoryDismissed(Category category) const {
@@ skipping 36 matching lines @@
 void ContentSuggestionsService::StoreDismissedCategoriesToPrefs() {
   base::ListValue list;
   for (const auto& category_provider_pair : dismissed_providers_by_category_) {
     list.AppendInteger(category_provider_pair.first.id());
   }
 
   pref_service_->Set(prefs::kDismissedCategories, list);
 }
 
 }  // namespace ntp_snippets