Identify and repair ONC files with duplicate GUIDs

chromeos/network/onc/onc_validator.h

Index: chromeos/network/onc/onc_validator.h
diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h
index 8d8efeeb47b125d97457cee2d639580b78a23a0c..47dd0698718817305d4b8a4bb3ee3b3d66674575 100644
--- a/chromeos/network/onc/onc_validator.h
+++ b/chromeos/network/onc/onc_validator.h
@@ -5,6 +5,7 @@
 #ifndef CHROMEOS_NETWORK_ONC_ONC_VALIDATOR_H_
 #define CHROMEOS_NETWORK_ONC_ONC_VALIDATOR_H_
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -174,6 +175,10 @@ class CHROMEOS_EXPORT Validator : public Mapper {
 
   bool RequireField(const base::DictionaryValue& dict, const std::string& key);
 
+  bool VerifyGuidUniqueAndAddToHash(const base::DictionaryValue& dict,

[pneubeck (no reviews), 2014/02/17 10:11:36]

Hash -> Set ?

Add a comment that explains when it returns true/false.
yes, the above functions are missing comments as well ;-) but for some it's
obvious when they return what.

Instead of "Verify" you could also use something that better indicates the
meaning of the result, like "GuidIsUnique...."

[kaliamoorthi, 2014/02/17 15:06:49]

Done.

+                                    const std::string& kGUID,
+                                    std::set<std::string> *guids);
+
   // Prohibit certificate patterns for device policy ONC so that an unmanaged
   // user won't have a certificate presented for them involuntarily.
   bool IsCertPatternInDevicePolicy(const std::string& cert_type);
@@ -195,6 +200,9 @@ class CHROMEOS_EXPORT Validator : public Mapper {
   // are stored as strings in decimal notation.
   std::vector<std::string> path_;
 
+  std::set<std::string> network_guids_;

[pneubeck (no reviews), 2014/02/17 10:11:36]

add comments like:

Accumulates all network GUIDs during validation. Used to identify duplicate
GUIDs.

[kaliamoorthi, 2014/02/17 15:06:49]

Done.

+  std::set<std::string> certificate_guids_;
+
   // Tracks if an error or warning occurred within validation initiated by
   // function ValidateAndRepairObject.
   bool error_or_warning_found_;