Enable non-sequential entries when loading registry lists.

components/policy/core/common/registry_dict_win.cc

Index: components/policy/core/common/registry_dict_win.cc
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index 833a0dfcc4de5a201300e5c277724ece30ed0348..834b7241e738b8be57d32233d401b4453c41a815 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -322,25 +322,19 @@ std::unique_ptr<base::Value> RegistryDict::ConvertToJSON(
     case base::Value::TYPE_LIST: {
       std::unique_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
-      for (int i = 1; ; ++i) {
-        const std::string name(base::IntToString(i));
-        const RegistryDict* key = GetKey(name);
-        if (key) {
-          std::unique_ptr<base::Value> converted =
-              key->ConvertToJSON(item_schema);
-          if (converted)
-            result->Append(converted.release());
-          continue;
-        }
-        const base::Value* value = GetValue(name);
-        if (value) {
-          std::unique_ptr<base::Value> converted =
-              ConvertValue(*value, item_schema);
-          if (converted)
-            result->Append(converted.release());
-          continue;
-        }
-        break;
+      for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
+           entry != keys_.end(); ++entry) {

[pastarmovj, 2016/11/03 16:27:47]

I think it still makes sense to only parse numbered keys. The code as it is now
will parse a key with arbitrary names. Sometimes while testing polivies admins
tend to rename them to switch them off e.g. "HomePageUrl" -> "_HomePageUrl" one
can imagine they would do this to the indexed entries too so skipping anything
that is not a number sounds like a good idea to me. Wdyt?

If you agree about this change please augment the test to capture this too.

[Georges Khalil, 2016/11/03 18:16:16]

Skipping over non-integer names makes sense.

We won't enforce that integers have to be increasing, however. I don't see any
issues with that, WDYT? ie. 1, 5, 7, 3, 6 would be valid.

[Georges Khalil, 2016/11/03 20:24:54]

I just realized that a dictionary uses a map instead of an unordered_map, so
that's irrelevant, the number will always be increasing.

I'm adding just the numerical check.

+        std::unique_ptr<base::Value> converted =
+            entry->second->ConvertToJSON(item_schema);
+        if (converted)
+          result->Append(converted.release());
+      }
+      for (RegistryDict::ValueMap::const_iterator entry(values_.begin());
+           entry != values_.end(); ++entry) {
+        std::unique_ptr<base::Value> converted =
+            ConvertValue(*entry->second, item_schema);
+        if (converted)
+          result->Append(converted.release());
       }
       return std::move(result);
     }