Remove FOR_EACH_OBSERVER macro usage in chrome/browser/extensions

chrome/browser/profiles/profile_info_cache.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/profiles/profile_info_cache.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 191 matching lines @@
   info->SetBoolean(kIsUsingDefaultAvatarKey, true);
   cache->SetWithoutPathExpansion(key, info.release());
 
   sorted_keys_.insert(FindPositionForProfile(key, name), key);
   profile_attributes_entries_[user_data_dir_.AppendASCII(key).value()] =
       std::unique_ptr<ProfileAttributesEntry>();
 
   if (!disable_avatar_download_for_testing_)
     DownloadHighResAvatarIfNeeded(icon_index, profile_path);
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileAdded(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileAdded(profile_path);
 }
 
 void ProfileInfoCache::AddObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.AddObserver(obs);
 }
 
 void ProfileInfoCache::RemoveObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.RemoveObserver(obs);
 }
 
 void ProfileInfoCache::DeleteProfileFromCache(
     const base::FilePath& profile_path) {
   size_t profile_index = GetIndexOfProfileWithPath(profile_path);
   if (profile_index == std::string::npos) {
     NOTREACHED();
     return;
   }
   base::string16 name = GetNameOfProfileAtIndex(profile_index);
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileWillBeRemoved(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileWillBeRemoved(profile_path);
 
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
   base::DictionaryValue* cache = update.Get();
   std::string key = CacheKeyFromProfilePath(profile_path);
   cache->Remove(key, NULL);
   sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
   profile_attributes_entries_.erase(profile_path.value());
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileWasRemoved(profile_path, name));
+  for (auto& observer : observer_list_)
+    observer.OnProfileWasRemoved(profile_path, name);
 }
 
 size_t ProfileInfoCache::GetNumberOfProfiles() const {
   return sorted_keys_.size();
 }
 
 size_t ProfileInfoCache::GetIndexOfProfileWithPath(
     const base::FilePath& profile_path) const {
   if (profile_path.DirName() != user_data_dir_)
     return std::string::npos;
@@ skipping 297 matching lines @@
   info->SetString(kNameKey, name);
 
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::string16 new_display_name = GetNameOfProfileAtIndex(index);
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
-    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                      observer_list_,
-                      OnProfileNameChanged(profile_path, old_display_name));
+    for (auto& observer : observer_list_)
+      observer.OnProfileNameChanged(profile_path, old_display_name);
   }
 }
 
 void ProfileInfoCache::SetShortcutNameOfProfileAtIndex(
     size_t index,
     const base::string16& shortcut_name) {
   if (shortcut_name == GetShortcutNameOfProfileAtIndex(index))
     return;
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
@@ skipping 15 matching lines @@
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
 
   info->SetString(kGAIAIdKey, gaia_id);
   info->SetString(kUserNameKey, user_name);
 
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileAuthInfoChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileAuthInfoChanged(profile_path);
 }
 
 void ProfileInfoCache::SetAvatarIconOfProfileAtIndex(size_t index,
                                                      size_t icon_index) {
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kAvatarIconKey,
       profiles::GetDefaultAvatarIconUrl(icon_index));
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
 
   if (!disable_avatar_download_for_testing_)
     DownloadHighResAvatarIfNeeded(icon_index, profile_path);
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileAvatarChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileAvatarChanged(profile_path);
 }
 
 void ProfileInfoCache::SetIsOmittedProfileAtIndex(size_t index,
                                                   bool is_omitted) {
   if (IsOmittedProfileAtIndex(index) == is_omitted)
     return;
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kIsOmittedFromProfileListKey, is_omitted);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileIsOmittedChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileIsOmittedChanged(profile_path);
 }
 
 void ProfileInfoCache::SetSupervisedUserIdOfProfileAtIndex(
     size_t index,
     const std::string& id) {
   if (GetSupervisedUserIdOfProfileAtIndex(index) == id)
     return;
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kSupervisedUserId, id);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileSupervisedUserIdChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileSupervisedUserIdChanged(profile_path);
 }
 
 void ProfileInfoCache::SetLocalAuthCredentialsOfProfileAtIndex(
     size_t index,
     const std::string& credentials) {
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kAuthCredentialsKey, credentials);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ skipping 30 matching lines @@
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIANameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   base::string16 new_display_name = GetNameOfProfileAtIndex(index);
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
-    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                      observer_list_,
-                      OnProfileNameChanged(profile_path, old_display_name));
+    for (auto& observer : observer_list_)
+      observer.OnProfileNameChanged(profile_path, old_display_name);
   }
 }
 
 void ProfileInfoCache::SetGAIAGivenNameOfProfileAtIndex(
     size_t index,
     const base::string16& name) {
   if (name == GetGAIAGivenNameOfProfileAtIndex(index))
     return;
 
   base::string16 old_display_name = GetNameOfProfileAtIndex(index);
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAGivenNameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   base::string16 new_display_name = GetNameOfProfileAtIndex(index);
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
-    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                      observer_list_,
-                      OnProfileNameChanged(profile_path, old_display_name));
+    for (auto& observer : observer_list_)
+      observer.OnProfileNameChanged(profile_path, old_display_name);
   }
 }
 
 void ProfileInfoCache::SetGAIAPictureOfProfileAtIndex(size_t index,
                                                       const gfx::Image* image) {
   base::FilePath path = GetPathOfProfileAtIndex(index);
   std::string key = CacheKeyFromProfilePath(path);
 
   // Delete the old bitmap from cache.
   cached_avatar_images_.erase(key);
@@ skipping 18 matching lines @@
     SaveAvatarImageAtPath(
         GetPathOfProfileAtIndex(index), image, key, image_path);
   }
 
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAPictureFileNameKey, new_file_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileAvatarChanged(path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileAvatarChanged(path);
 }
 
 void ProfileInfoCache::SetIsUsingGAIAPictureOfProfileAtIndex(size_t index,
                                                              bool value) {
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kUseGAIAPictureKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileAvatarChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileAvatarChanged(profile_path);
 }
 
 void ProfileInfoCache::SetProfileSigninRequiredAtIndex(size_t index,
                                                        bool value) {
   if (value == ProfileIsSigninRequiredAtIndex(index))
     return;
 
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kSigninRequiredKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileSigninRequiredChanged(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileSigninRequiredChanged(profile_path);
 }
 
 void ProfileInfoCache::SetProfileIsEphemeralAtIndex(size_t index, bool value) {
   if (value == ProfileIsEphemeralAtIndex(index))
     return;
 
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kProfileIsEphemeral, value);
   // This takes ownership of |info|.
@@ skipping 10 matching lines @@
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kIsUsingDefaultNameKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   base::string16 new_display_name = GetNameOfProfileAtIndex(index);
   const base::FilePath profile_path = GetPathOfProfileAtIndex(index);
 
   if (old_display_name != new_display_name) {
-    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                      observer_list_,
-                      OnProfileNameChanged(profile_path, old_display_name));
+    for (auto& observer : observer_list_)
+      observer.OnProfileNameChanged(profile_path, old_display_name);
   }
 }
 
 void ProfileInfoCache::SetProfileIsUsingDefaultAvatarAtIndex(
     size_t index, bool value) {
   if (value == ProfileIsUsingDefaultAvatarAtIndex(index))
     return;
 
   std::unique_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
@@ skipping 290 matching lines @@
     // Place an empty image in the cache to avoid reloading it again.
     cached_avatar_images_[key].reset(new gfx::Image());
   }
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/461175
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile4(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "461175 ProfileInfoCache::OnAvatarPictureLoaded::DeleteImage"));
   delete image;
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                    observer_list_,
-                    OnProfileHighResAvatarLoaded(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileHighResAvatarLoaded(profile_path);
 }
 
 void ProfileInfoCache::OnAvatarPictureSaved(
       const std::string& file_name,
       const base::FilePath& profile_path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-      observer_list_,
-      OnProfileHighResAvatarLoaded(profile_path));
+  for (auto& observer : observer_list_)
+    observer.OnProfileHighResAvatarLoaded(profile_path);
 }
 
 void ProfileInfoCache::MigrateLegacyProfileNamesAndDownloadAvatars() {
   // Only do this on desktop platforms.
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   // Migrate any legacy profile names ("First user", "Default Profile") to
   // new style default names ("Person 1"). The problem here is that every
   // time you rename a profile, the ProfileInfoCache sorts itself, so
   // whatever you were iterating through is no longer valid. We need to
   // save a list of the profile paths (which thankfully do not change) that
@@ skipping 65 matching lines @@
   if (!current_entry) {
     // The profile info is in the cache but its entry isn't created yet, insert
     // it in the map.
     current_entry.reset(new ProfileAttributesEntry());
     current_entry->Initialize(this, path);
   }
 
   *entry = current_entry.get();
   return true;
 }