Remove FOR_EACH_OBSERVER macro usage in chrome/browser/android

chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

 // Copyright 2013 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/android/bookmarks/partner_bookmarks_shim.h"
 
 #include <tuple>
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
@@ skipping 105 matching lines @@
   DCHECK(IsEditable(node));
   RenameBookmark(node, base::string16());
 }
 
 void PartnerBookmarksShim::RenameBookmark(const BookmarkNode* node,
                                           const base::string16& title) {
   DCHECK(IsEditable(node));
   const NodeRenamingMapKey key(node->url(), node->GetTitle());
   node_rename_remove_map_[key] = title;
   SaveNodeMapping();
-  FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
-                    PartnerShimChanged(this));
+  for (PartnerBookmarksShim::Observer& observer : observers_)

[Bernhard Bauer, 2016/10/19 11:42:51]

I think you could just use Observer (you're inside PartnerBookmarksShim anyway).

+    observer.PartnerShimChanged(this);
 }
 
 void PartnerBookmarksShim::AddObserver(
     PartnerBookmarksShim::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void PartnerBookmarksShim::RemoveObserver(
     PartnerBookmarksShim::Observer* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 35 matching lines @@
 
 const BookmarkNode* PartnerBookmarksShim::GetPartnerBookmarksRoot() const {
   return g_partner_model_keeper.Get().partner_bookmarks_root.get();
 }
 
 void PartnerBookmarksShim::SetPartnerBookmarksRoot(
     std::unique_ptr<bookmarks::BookmarkNode> root_node) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   g_partner_model_keeper.Get().partner_bookmarks_root = std::move(root_node);
   g_partner_model_keeper.Get().loaded = true;
-  FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
-                    PartnerShimLoaded(this));
+  for (PartnerBookmarksShim::Observer& observer : observers_)
+    observer.PartnerShimLoaded(this);
 }
 
 PartnerBookmarksShim::NodeRenamingMapKey::NodeRenamingMapKey(
     const GURL& url, const base::string16& provider_title)
     : url_(url), provider_title_(provider_title) {}
 
 PartnerBookmarksShim::NodeRenamingMapKey::~NodeRenamingMapKey() {}
 
 bool operator<(const PartnerBookmarksShim::NodeRenamingMapKey& a,
                const PartnerBookmarksShim::NodeRenamingMapKey& b) {
@@ skipping 19 matching lines @@
   g_disable_partner_bookmarks_editing = false;
 }
 
 PartnerBookmarksShim::PartnerBookmarksShim(PrefService* prefs)
     : prefs_(prefs),
       observers_(base::ObserverList<
           PartnerBookmarksShim::Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
 PartnerBookmarksShim::~PartnerBookmarksShim() {
-  FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
-                    ShimBeingDeleted(this));
+  for (PartnerBookmarksShim::Observer& observer : observers_)
+    observer.ShimBeingDeleted(this);
 }
 
 const BookmarkNode* PartnerBookmarksShim::GetNodeByID(
     const BookmarkNode* parent,
     int64_t id) const {
   if (parent->id() == id)
     return parent;
   for (int i = 0, child_count = parent->child_count(); i < child_count; ++i) {
     const BookmarkNode* result = GetNodeByID(parent->GetChild(i), id);
     if (result)
@@ skipping 47 matching lines @@
        i != node_rename_remove_map_.end();
        ++i) {
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString(kMappingUrl, i->first.url().spec());
     dict->SetString(kMappingProviderTitle, i->first.provider_title());
     dict->SetString(kMappingTitle, i->second);
     list.Append(dict);
   }
   prefs_->Set(prefs::kPartnerBookmarkMappings, list);
 }