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

chrome/browser/policy/policy_service_impl.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/policy/policy_service_impl.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
@@ skipping 12 matching lines @@
   // the processed policy values.
   MergeAndTriggerUpdates();
 }
 
 PolicyServiceImpl::~PolicyServiceImpl() {
   STLDeleteElements(&registrars_);
   STLDeleteValues(&observers_);
 }
 
 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;
   }
   it->second->RemoveObserver(observer);
   if (it->second->size() == 0) {
     delete it->second;
     observers_.erase(it);
   }
 }
@@ skipping 53 matching lines @@
       return it;
   }
   NOTREACHED();
   return registrars_.end();
 }
 
 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,
         *iterator->second,
         OnPolicyUpdated(ns.first, ns.second, previous, current));
   }
 }
 
 void PolicyServiceImpl::MergeAndTriggerUpdates() {
   // Merge from each provider in their order of priority.
@@ skipping 70 matching lines @@
   // Invoke all the callbacks if a refresh has just fully completed.
   if (refresh_pending_.empty() && !refresh_callbacks_.empty()) {
     std::vector<base::Closure> callbacks;
     callbacks.swap(refresh_callbacks_);
     for (size_t i = 0; i < callbacks.size(); ++i)
       callbacks[i].Run();
   }
 }
 
 }  // namespace policy