Modified PolicyService to register observers by domain only, instead of domain and component.

chrome/browser/policy/policy_service_impl.cc

Index: chrome/browser/policy/policy_service_impl.cc
diff --git a/chrome/browser/policy/policy_service_impl.cc b/chrome/browser/policy/policy_service_impl.cc
index d927c657cf1c381bf10f0e9bfa12ecfac031cfe4..3a20c47498ff0ae978ab8fc0ac0718dc0484a90f 100644
--- a/chrome/browser/policy/policy_service_impl.cc
+++ b/chrome/browser/policy/policy_service_impl.cc
@@ -30,20 +30,16 @@ PolicyServiceImpl::~PolicyServiceImpl() {
 }
 
 void PolicyServiceImpl::AddObserver(PolicyDomain domain,
-                                    const std::string& component_id,
                                     PolicyService::Observer* observer) {
-  PolicyBundle::PolicyNamespace ns(domain, component_id);
-  Observers*& list = observers_[ns];
+  Observers*& list = observers_[domain];
   if (!list)
     list = new Observers();
   list->AddObserver(observer);
 }
 
 void PolicyServiceImpl::RemoveObserver(PolicyDomain domain,
-                                       const std::string& component_id,
                                        PolicyService::Observer* observer) {
-  PolicyBundle::PolicyNamespace ns(domain, component_id);
-  ObserverMap::iterator it = observers_.find(ns);
+  ObserverMap::iterator it = observers_.find(domain);
   if (it == observers_.end()) {
     NOTREACHED();
     return;
@@ -117,7 +113,7 @@ void PolicyServiceImpl::NotifyNamespaceUpdated(
     const PolicyBundle::PolicyNamespace& ns,
     const PolicyMap& previous,
     const PolicyMap& current) {
-  ObserverMap::iterator iterator = observers_.find(ns);
+  ObserverMap::iterator iterator = observers_.find(ns.first);
   if (iterator != observers_.end()) {
     FOR_EACH_OBSERVER(
         PolicyService::Observer,