Reduce FOR_EACH_OBSERVER macro usage in chrome/browser

chrome/browser/media_galleries/media_galleries_preferences.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 "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 620 matching lines @@
     StorageInfo::Type device_type;
     if (!StorageInfo::CrackDeviceId(this_device_id, &device_type, NULL))
       continue;
 
     if (device_type == singleton_type) {
       dict->SetString(kMediaGalleriesDeviceIdKey, device_id);
       update.reset();  // commits the update.
       InitFromPrefs();
       MediaGalleryPrefId pref_id;
       if (GetPrefId(*dict, &pref_id)) {
-        FOR_EACH_OBSERVER(GalleryChangeObserver,
-                          gallery_change_observers_,
-                          OnGalleryInfoUpdated(this, pref_id));
+        for (auto& observer : gallery_change_observers_)
+          observer.OnGalleryInfoUpdated(this, pref_id);
       }
       return true;
     }
   }
   return false;
 }
 
 void MediaGalleriesPreferences::OnStorageMonitorInit(
     bool api_has_been_used) {
   if (api_has_been_used)
@@ skipping 336 matching lines @@
         }
         dict->SetInteger(kMediaGalleriesPrefsVersionKey, prefs_version);
         break;
       }
     }
 
     // Commits the prefs update.
     update.reset();
 
     InitFromPrefs();
-    FOR_EACH_OBSERVER(GalleryChangeObserver, gallery_change_observers_,
-                      OnGalleryInfoUpdated(this, *pref_id_it));
+    for (auto& observer : gallery_change_observers_)
+      observer.OnGalleryInfoUpdated(this, *pref_id_it);
     return *pref_id_it;
   }
 
   PrefService* prefs = profile_->GetPrefs();
 
   MediaGalleryPrefInfo gallery_info;
   gallery_info.pref_id = prefs->GetUint64(prefs::kMediaGalleriesUniqueId);
   prefs->SetUint64(prefs::kMediaGalleriesUniqueId, gallery_info.pref_id + 1);
   gallery_info.display_name = display_name;
   gallery_info.device_id = device_id;
@@ skipping 10 matching lines @@
   gallery_info.video_count = video_count;
   gallery_info.prefs_version = prefs_version;
   gallery_info.default_gallery_type = default_gallery_type;
 
   {
     ListPrefUpdate update(prefs, prefs::kMediaGalleriesRememberedGalleries);
     base::ListValue* list = update.Get();
     list->Append(CreateGalleryPrefInfoDictionary(gallery_info));
   }
   InitFromPrefs();
-  FOR_EACH_OBSERVER(GalleryChangeObserver,
-                    gallery_change_observers_,
-                    OnGalleryAdded(this, gallery_info.pref_id));
+  for (auto& observer : gallery_change_observers_)
+    observer.OnGalleryAdded(this, gallery_info.pref_id);
 
   return gallery_info.pref_id;
 }
 
 
 void MediaGalleriesPreferences::UpdateDefaultGalleriesPaths() {
   base::FilePath music_path;
   base::FilePath pictures_path;
   base::FilePath videos_path;
   bool got_music_path = PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
@@ skipping 53 matching lines @@
     pref_ids.push_back(pref_id);
   }
 
   // Commit the prefs update.
   update.reset();
   InitFromPrefs();
 
   for (std::vector<MediaGalleryPrefId>::iterator iter = pref_ids.begin();
        iter != pref_ids.end();
        ++iter) {
-    FOR_EACH_OBSERVER(GalleryChangeObserver,
-                      gallery_change_observers_,
-                      OnGalleryInfoUpdated(this, *iter));
+    for (auto& observer : gallery_change_observers_)
+      observer.OnGalleryInfoUpdated(this, *iter);
   }
 }
 
 
 MediaGalleryPrefId MediaGalleriesPreferences::AddGalleryByPath(
     const base::FilePath& path, MediaGalleryPrefInfo::Type type) {
   DCHECK(IsInitialized());
   MediaGalleryPrefInfo gallery_info;
   if (LookUpGalleryByPath(path, &gallery_info) &&
       !gallery_info.IsBlackListedType()) {
@@ skipping 53 matching lines @@
           dict->SetInteger(kMediaGalleriesScanAudioCountKey, 0);
           dict->SetInteger(kMediaGalleriesScanImageCountKey, 0);
           dict->SetInteger(kMediaGalleriesScanVideoCountKey, 0);
         }
       } else {
         list->Erase(iter, NULL);
       }
       update.reset(NULL);  // commits the update.
 
       InitFromPrefs();
-      FOR_EACH_OBSERVER(GalleryChangeObserver,
-                        gallery_change_observers_,
-                        OnGalleryRemoved(this, id));
+      for (auto& observer : gallery_change_observers_)
+        observer.OnGalleryRemoved(this, id);
       return;
     }
   }
 }
 
 bool MediaGalleriesPreferences::NonAutoGalleryHasPermission(
     MediaGalleryPrefId id) const {
   DCHECK(IsInitialized());
   DCHECK(!base::ContainsKey(known_galleries_, id) ||
          known_galleries_.find(id)->second.type !=
@@ skipping 81 matching lines @@
     default_permission = HasAutoDetectedGalleryPermission(extension);
   // When the permission matches the default, we don't need to remember it.
   if (has_permission == default_permission) {
     if (!UnsetGalleryPermissionInPrefs(extension.id(), pref_id))
       // If permission wasn't set, assume nothing has changed.
       return false;
   } else {
     if (!SetGalleryPermissionInPrefs(extension.id(), pref_id, has_permission))
       return false;
   }
-  if (has_permission)
-    FOR_EACH_OBSERVER(GalleryChangeObserver,
-                      gallery_change_observers_,
-                      OnPermissionAdded(this, extension.id(), pref_id));
-  else
-    FOR_EACH_OBSERVER(GalleryChangeObserver,
-                      gallery_change_observers_,
-                      OnPermissionRemoved(this, extension.id(), pref_id));
+  if (has_permission) {
+    for (auto& observer : gallery_change_observers_)
+      observer.OnPermissionAdded(this, extension.id(), pref_id);
+  } else {
+    for (auto& observer : gallery_change_observers_)
+      observer.OnPermissionRemoved(this, extension.id(), pref_id);
+  }
   return true;
 }
 
 const MediaGalleriesPrefInfoMap& MediaGalleriesPreferences::known_galleries()
     const {
   DCHECK(IsInitialized());
   return known_galleries_;
 }
 
 void MediaGalleriesPreferences::Shutdown() {
@@ skipping 132 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }