Reduce usage of FOR_EACH_OBSERVER macro in components/

components/user_prefs/tracked/segregated_pref_store.cc

 // Copyright 2014 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/user_prefs/tracked/segregated_pref_store.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 
 SegregatedPrefStore::AggregatingObserver::AggregatingObserver(
     SegregatedPrefStore* outer)
     : outer_(outer),
       failed_sub_initializations_(0),
       successful_sub_initializations_(0) {
 }
 
 void SegregatedPrefStore::AggregatingObserver::OnPrefValueChanged(
     const std::string& key) {
   // There is no need to tell clients about changes if they have not yet been
   // told about initialization.
   if (failed_sub_initializations_ + successful_sub_initializations_ < 2)
     return;
 
-  FOR_EACH_OBSERVER(PrefStore::Observer, outer_->observers_,
-                    OnPrefValueChanged(key));
+  for (auto& observer : outer_->observers_)
+    observer.OnPrefValueChanged(key);
 }
 
 void SegregatedPrefStore::AggregatingObserver::OnInitializationCompleted(
     bool succeeded) {
   if (succeeded)
     ++successful_sub_initializations_;
   else
     ++failed_sub_initializations_;
 
   DCHECK_LE(failed_sub_initializations_ + successful_sub_initializations_, 2);
 
   if (failed_sub_initializations_ + successful_sub_initializations_ == 2) {
     if (successful_sub_initializations_ == 2 && outer_->read_error_delegate_) {
       PersistentPrefStore::PrefReadError read_error = outer_->GetReadError();
       if (read_error != PersistentPrefStore::PREF_READ_ERROR_NONE)
         outer_->read_error_delegate_->OnError(read_error);
     }
 
-    FOR_EACH_OBSERVER(
-        PrefStore::Observer, outer_->observers_,
-        OnInitializationCompleted(successful_sub_initializations_ == 2));
+    for (auto& observer : outer_->observers_)
+      observer.OnInitializationCompleted(successful_sub_initializations_ == 2);
   }
 }
 
 SegregatedPrefStore::SegregatedPrefStore(
     const scoped_refptr<PersistentPrefStore>& default_pref_store,
     const scoped_refptr<PersistentPrefStore>& selected_pref_store,
     const std::set<std::string>& selected_pref_names)
     : default_pref_store_(default_pref_store),
       selected_pref_store_(selected_pref_store),
       selected_preference_names_(selected_pref_names),
@@ skipping 112 matching lines @@
       .get();
 }
 
 const PersistentPrefStore* SegregatedPrefStore::StoreForKey(
     const std::string& key) const {
   return (base::ContainsKey(selected_preference_names_, key)
               ? selected_pref_store_
               : default_pref_store_)
       .get();
 }