[GRC] Coordination Unit Graph Observer

services/resource_coordinator/coordination_unit/coordination_unit_impl.cc

 // Copyright 2017 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 "services/resource_coordinator/coordination_unit/coordination_unit_impl.h"
 
 #include <memory>
 #include <unordered_map>
 #include <utility>
 
@@ skipping 144 matching lines @@
 }
 
 bool CoordinationUnitImpl::AddChild(CoordinationUnitImpl* child) {
   // We don't recalculate the policy here as policies are only dependent
   // on the current CU or its parents, not its children. In other words,
   // policies only bubble down.
   bool success =
       children_.count(child) ? false : children_.insert(child).second;
 
   if (success) {
-    for (auto* observer :
-         on_child_added_event_observer_registry_.GetObserversForFilter(
-             child->id().type)) {
-      observer->OnChildAddedEvent(this, child);
+    for (auto& observer : observers_) {
+      observer.OnChildAdded(this, child);
     }
   }
 
   return success;
 }
 
 void CoordinationUnitImpl::RemoveChild(const CoordinationUnitID& child_id) {
   auto child_iter = g_cu_map().find(child_id);
   if (child_iter == g_cu_map().end()) {
     return;
@@ skipping 10 matching lines @@
   if (RemoveChild(child)) {
     child->RemoveParent(this);
   }
 }
 
 bool CoordinationUnitImpl::RemoveChild(CoordinationUnitImpl* child) {
   size_t children_removed = children_.erase(child);
   bool success = children_removed > 0;
 
   if (success) {
-    for (auto* observer :
-         on_child_removed_event_observer_registry_.GetObserversForFilter(
-             child->id().type)) {
-      observer->OnChildRemovedEvent(this, child);
+    for (auto& observer : observers_) {
+      observer.OnChildRemoved(this, child);
     }
   }
 
   return success;
 }
 
 void CoordinationUnitImpl::AddParent(CoordinationUnitImpl* parent) {
   DCHECK_EQ(0u, parents_.count(parent));
   parents_.insert(parent);
 
-  for (auto* observer :
-       on_parent_added_event_observer_registry_.GetObserversForFilter(
-           parent->id().type)) {
-    observer->OnParentAddedEvent(this, parent);
+  for (auto& observer : observers_) {
+    observer.OnParentAdded(this, parent);
   }
 
   RecalcCoordinationPolicy();
 }
 
 void CoordinationUnitImpl::RemoveParent(CoordinationUnitImpl* parent) {
   size_t parents_removed = parents_.erase(parent);
   DCHECK_EQ(1u, parents_removed);
 
   // TODO(matthalp, oysteine) should this go before or
   // after RecalcCoordinationPolicy?
-  for (auto* observer :
-       on_parent_removed_event_observer_registry_.GetObserversForFilter(
-           parent->id().type)) {
-    observer->OnParentRemovedEvent(this, parent);
+  for (auto& observer : observers_) {
+    observer.OnParentRemoved(this, parent);
   }
 
   RecalcCoordinationPolicy();
 }
 
 bool CoordinationUnitImpl::HasParent(CoordinationUnitImpl* unit) {
   for (CoordinationUnitImpl* parent : parents_) {
     if (parent == unit || parent->HasParent(unit)) {
       return true;
     }
@@ skipping 51 matching lines @@
                                        base::Value value) {
   // setting a property with an empty value is effectively clearing the
   // value from storage
   if (value.IsType(base::Value::Type::NONE)) {
     ClearProperty(property);
     return;
   }
 
   property_store_[property] = value;
 
-  for (auto* observer :
-       on_property_changed_event_observer_registry_.GetObserversForFilter(
-           property)) {
-    observer->OnPropertyChangedEvent(this, property);
+  for (auto& observer : observers_) {
+    observer.OnPropertyChanged(this, property);
   }
 }
 
-void CoordinationUnitImpl::WillBeDestroyed() {
-  for (auto* observer : on_will_be_destroyed_event_observer_registry_
-                            .GetObserversWithoutAFilter()) {
-    observer->OnWillBeDestroyedEvent(this);
-  }
+void CoordinationUnitImpl::AddObserver(
+    CoordinationUnitGraphObserver* observer) {
+  observers_.AddObserver(observer);
 }
 
-void CoordinationUnitImpl::ObserveOnChildAddedEvent(
-    CoordinationUnitGraphObserver* observer,
-    CoordinationUnitType child_filter) {
-  on_child_added_event_observer_registry_.AddObserver(observer, child_filter);
-}
-
-void CoordinationUnitImpl::ObserveOnChildAddedEvent(
+void CoordinationUnitImpl::RemoveObserver(
     CoordinationUnitGraphObserver* observer) {
-  ObserveOnChildAddedEvent(
-      observer,
-      CoordinationUnitGraphObserverRegistry<CoordinationUnitType>::kNoFilter);
-}
-
-void CoordinationUnitImpl::ObserveOnParentAddedEvent(
-    CoordinationUnitGraphObserver* observer,
-    CoordinationUnitType parent_filter) {
-  on_parent_added_event_observer_registry_.AddObserver(observer, parent_filter);
-}
-
-void CoordinationUnitImpl::ObserveOnParentAddedEvent(
-    CoordinationUnitGraphObserver* observer) {
-  ObserveOnParentAddedEvent(
-      observer,
-      CoordinationUnitGraphObserverRegistry<CoordinationUnitType>::kNoFilter);
-}
-
-void CoordinationUnitImpl::ObserveOnPropertyChangedEvent(
-    CoordinationUnitGraphObserver* observer,
-    mojom::PropertyType property_filter) {
-  on_property_changed_event_observer_registry_.AddObserver(observer,
-                                                           property_filter);
-}
-
-void CoordinationUnitImpl::ObserveOnPropertyChangedEvent(
-    CoordinationUnitGraphObserver* observer) {
-  ObserveOnPropertyChangedEvent(
-      observer,
-      CoordinationUnitGraphObserverRegistry<mojom::PropertyType>::kNoFilter);
-}
-
-void CoordinationUnitImpl::ObserveOnChildRemovedEvent(
-    CoordinationUnitGraphObserver* observer,
-    CoordinationUnitType child_filter) {
-  on_child_removed_event_observer_registry_.AddObserver(observer, child_filter);
-}
-
-void CoordinationUnitImpl::ObserveOnChildRemovedEvent(
-    CoordinationUnitGraphObserver* observer) {
-  ObserveOnChildRemovedEvent(
-      observer,
-      CoordinationUnitGraphObserverRegistry<CoordinationUnitType>::kNoFilter);
-}
-
-void CoordinationUnitImpl::ObserveOnParentRemovedEvent(
-    CoordinationUnitGraphObserver* observer,
-    CoordinationUnitType parent_filter) {
-  on_parent_removed_event_observer_registry_.AddObserver(observer,
-                                                         parent_filter);
-}
-
-void CoordinationUnitImpl::ObserveOnParentRemovedEvent(
-    CoordinationUnitGraphObserver* observer) {
-  ObserveOnParentRemovedEvent(
-      observer,
-      CoordinationUnitGraphObserverRegistry<CoordinationUnitType>::kNoFilter);
-}
-
-void CoordinationUnitImpl::ObserveOnWillBeDestroyedEvent(
-    CoordinationUnitGraphObserver* observer) {
-  on_will_be_destroyed_event_observer_registry_.AddObserver(observer);
+  observers_.RemoveObserver(observer);
 }
 
 }  // namespace resource_coordinator