Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/policy_bundle.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_bundle.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
 
+namespace {
+
+// Comparison predicate for std::equal in PolicyBundle::Equals.
+bool BundleEntryEquals(const PolicyBundle::MapType::value_type& a,

[Mattias Nissler (ping if slow), 2012/05/14 16:55:59]

Unused?

[Joao da Silva, 2012/05/15 13:07:05]

Yes. Equals() was initially implemented as std::equal with this predicate, but
then it failed for the reason explained in the comment there.

+                       const PolicyBundle::MapType::value_type& b) {
+  return a.first == b.first && a.second->Equals(*b.second);
+}
+
+}  // namespace
+
 PolicyBundle::PolicyBundle() {}
 
 PolicyBundle::~PolicyBundle() {
   Clear();
 }
 
 PolicyMap& PolicyBundle::Get(PolicyDomain domain,
                              const std::string& component_id) {
   DCHECK(domain != POLICY_DOMAIN_CHROME || component_id.empty());
   PolicyMap*& policy = policy_bundle_[PolicyNamespace(domain, component_id)];
@@ skipping 56 matching lines @@
   // Add extra PolicyMaps at the end.
   while (it_other != end_other) {
     PolicyMap*& policy = policy_bundle_[it_other->first];
     DCHECK(!policy);
     policy = new PolicyMap();
     policy->CopyFrom(*it_other->second);
     ++it_other;
   }
 }
 
+bool PolicyBundle::Equals(const PolicyBundle& other) const {
+  // Equals() has the peculiarity that an entry with an empty PolicyMap equals
+  // an non-existant entry. This handles usage of non-const Get() that doesn't
+  // insert any policies.
+  const_iterator it_this = begin();
+  const_iterator it_other = other.begin();
+
+  for (;;) {
+    // Skip empty PolicyMaps.
+    while (it_this != end() && it_this->second->empty())
+      ++it_this;
+    while (it_other != other.end() && it_other->second->empty())
+      ++it_other;
+    if (it_this != end() && it_other != other.end()) {
+      if (it_this->first != it_other->first ||
+          !it_this->second->Equals(*it_other->second))
+        return false;
+      ++it_this;
+      ++it_other;
+    } else {
+      return it_this == end() && it_other == other.end();
+    }
+  }

[Mattias Nissler (ping if slow), 2012/05/14 16:55:59]

return false? Could as well put the statement in line 119 here.

[Joao da Silva, 2012/05/15 13:07:05]

Done.

+}
+
 PolicyBundle::const_iterator PolicyBundle::begin() const {
   return policy_bundle_.begin();
 }
 
 PolicyBundle::const_iterator PolicyBundle::end() const {
   return policy_bundle_.end();
 }
 
 void PolicyBundle::Clear() {
   STLDeleteValues(&policy_bundle_);
 }
 
+void PolicyBundle::Dump() const {

[Mattias Nissler (ping if slow), 2012/05/14 16:55:59]

Remove?

[Joao da Silva, 2012/05/15 13:07:05]

Done.

+  LOG(ERROR) << "----------------- PolicyBundle Dump";
+  for (const_iterator it = begin(); it != end(); ++it) {
+    LOG(ERROR) << "-- Domain " << it->first.first << " component \""
+               << it->first.second << "\"";
+    const PolicyMap* policies = it->second;
+    for (PolicyMap::const_iterator it2 = policies->begin();
+         it2 != policies->end(); ++it2) {
+      LOG(ERROR) << "\"" << it2->first << "\"";
+    }
+  }
+}
+
 }  // namespace policy