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"
 
@@ skipping 68 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 (;;) {

[Mattias Nissler (ping if slow), 2012/05/15 17:07:24]

not sure what the style rule for this is, but while (true) wins the git grep
count over for (;;) ;)

[Joao da Silva, 2012/05/16 10:25:44]

I find this style cute:

#define ever ;;

for (ever) { ... }

Changed to while(true) :-)

+    // 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()) {

[Mattias Nissler (ping if slow), 2012/05/15 17:07:24]

It's probably easier to read this if you were to put here:

if (it_this == end() && it_other == other.end())
  break;

and then un-indent the if branch.

[Joao da Silva, 2012/05/16 10:25:44]

Done. I think you meant that the test for the break is

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 {
+      break;
+    }
+  }
+  return it_this == end() && it_other == other.end();
+}
+
 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_);
 }
 
 }  // namespace policy