ONC: Some trivial cleanup in the Validator.

- Removed unused argument from the Validate*() methods.
- Fixed formatting.

BUG=NONE
R=dconnelly@chromium.org

Review URL: https://codereview.chromium.org/69933010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240611 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 69 insertions, 143 deletions

diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
index 5f5aecb..d5bbb77 100644
--- a/chromeos/network/onc/onc_validator.cc
+++ b/chromeos/network/onc/onc_validator.cc
@@ -39,20 +39,17 @@ std::string ValueTypeToString(base::Value::Type type) {
 
 }  // namespace
 
-Validator::Validator(
-    bool error_on_unknown_field,
-    bool error_on_wrong_recommended,
-    bool error_on_missing_field,
-    bool managed_onc)
+Validator::Validator(bool error_on_unknown_field,
+                     bool error_on_wrong_recommended,
+                     bool error_on_missing_field,
+                     bool managed_onc)
     : error_on_unknown_field_(error_on_unknown_field),
       error_on_wrong_recommended_(error_on_wrong_recommended),
       error_on_missing_field_(error_on_missing_field),
       managed_onc_(managed_onc),
-      onc_source_(::onc::ONC_SOURCE_NONE) {
-}
+      onc_source_(::onc::ONC_SOURCE_NONE) {}
 
-Validator::~Validator() {
-}
+Validator::~Validator() {}
 
 scoped_ptr<base::DictionaryValue> Validator::ValidateAndRepairObject(
     const OncValueSignature* object_signature,
@@ -82,10 +79,9 @@ scoped_ptr<base::DictionaryValue> Validator::ValidateAndRepairObject(
   return make_scoped_ptr(result_dict);
 }
 
-scoped_ptr<base::Value> Validator::MapValue(
-    const OncValueSignature& signature,
-    const base::Value& onc_value,
-    bool* error) {
+scoped_ptr<base::Value> Validator::MapValue(const OncValueSignature& signature,
+                                            const base::Value& onc_value,
+                                            bool* error) {
   if (onc_value.GetType() != signature.onc_type) {
     LOG(ERROR) << MessageHeader() << "Found value '" << onc_value
                << "' of type '" << ValueTypeToString(onc_value.GetType())
@@ -111,33 +107,33 @@ scoped_ptr<base::DictionaryValue> Validator::MapObject(
   bool valid = ValidateObjectDefault(signature, onc_object, repaired.get());
   if (valid) {
     if (&signature == &kToplevelConfigurationSignature)
-      valid = ValidateToplevelConfiguration(onc_object, repaired.get());
+      valid = ValidateToplevelConfiguration(repaired.get());
     else if (&signature == &kNetworkConfigurationSignature)
-      valid = ValidateNetworkConfiguration(onc_object, repaired.get());
+      valid = ValidateNetworkConfiguration(repaired.get());
     else if (&signature == &kEthernetSignature)
-      valid = ValidateEthernet(onc_object, repaired.get());
+      valid = ValidateEthernet(repaired.get());
     else if (&signature == &kIPConfigSignature)
-      valid = ValidateIPConfig(onc_object, repaired.get());
+      valid = ValidateIPConfig(repaired.get());
     else if (&signature == &kWiFiSignature)
-      valid = ValidateWiFi(onc_object, repaired.get());
+      valid = ValidateWiFi(repaired.get());
     else if (&signature == &kVPNSignature)
-      valid = ValidateVPN(onc_object, repaired.get());
+      valid = ValidateVPN(repaired.get());
     else if (&signature == &kIPsecSignature)
-      valid = ValidateIPsec(onc_object, repaired.get());
+      valid = ValidateIPsec(repaired.get());
     else if (&signature == &kOpenVPNSignature)
-      valid = ValidateOpenVPN(onc_object, repaired.get());
+      valid = ValidateOpenVPN(repaired.get());
     else if (&signature == &kVerifyX509Signature)
-      valid = ValidateVerifyX509(onc_object, repaired.get());
+      valid = ValidateVerifyX509(repaired.get());
     else if (&signature == &kCertificatePatternSignature)
-      valid = ValidateCertificatePattern(onc_object, repaired.get());
+      valid = ValidateCertificatePattern(repaired.get());
     else if (&signature == &kProxySettingsSignature)
-      valid = ValidateProxySettings(onc_object, repaired.get());
+      valid = ValidateProxySettings(repaired.get());
     else if (&signature == &kProxyLocationSignature)
-      valid = ValidateProxyLocation(onc_object, repaired.get());
+      valid = ValidateProxyLocation(repaired.get());
     else if (&signature == &kEAPSignature)
-      valid = ValidateEAP(onc_object, repaired.get());
+      valid = ValidateEAP(repaired.get());
     else if (&signature == &kCertificateSignature)
-      valid = ValidateCertificate(onc_object, repaired.get());
+      valid = ValidateCertificate(repaired.get());
   }
 
   if (valid) {
@@ -207,10 +203,9 @@ scoped_ptr<base::Value> Validator::MapEntry(int index,
   return result.Pass();
 }
 
-bool Validator::ValidateObjectDefault(
-    const OncValueSignature& signature,
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateObjectDefault(const OncValueSignature& signature,
+                                      const base::DictionaryValue& onc_object,
+                                      base::DictionaryValue* result) {
   bool found_unknown_field = false;
   bool nested_error_occured = false;
   MapFields(signature, onc_object, &found_unknown_field, &nested_error_occured,
@@ -312,7 +307,7 @@ std::string JoinStringRange(const char** range_begin,
 
 bool Validator::FieldExistsAndHasNoValidValue(
     const base::DictionaryValue& object,
-    const std::string &field_name,
+    const std::string& field_name,
     const char** valid_values) {
   std::string actual_value;
   if (!object.GetStringWithoutPathExpansion(field_name, &actual_value))
@@ -334,7 +329,7 @@ bool Validator::FieldExistsAndHasNoValidValue(
 }
 
 bool Validator::FieldExistsAndIsNotInRange(const base::DictionaryValue& object,
-                                           const std::string &field_name,
+                                           const std::string& field_name,
                                            int lower_bound,
                                            int upper_bound) {
   int actual_value;
@@ -404,9 +399,7 @@ bool Validator::IsGlobalNetworkConfigInUserImport(
   return false;
 }
 
-bool Validator::ValidateToplevelConfiguration(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateToplevelConfiguration(base::DictionaryValue* result) {
   using namespace ::onc::toplevel_config;
 
   static const char* kValidTypes[] = { kUnencryptedConfiguration,
@@ -441,9 +434,7 @@ bool Validator::ValidateToplevelConfiguration(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateNetworkConfiguration(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateNetworkConfiguration(base::DictionaryValue* result) {
   using namespace ::onc::network_config;
 
   static const char* kValidTypes[] = { ::onc::network_type::kEthernet,
@@ -496,9 +487,7 @@ bool Validator::ValidateNetworkConfiguration(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateEthernet(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateEthernet(base::DictionaryValue* result) {
   using namespace ::onc::ethernet;
 
   static const char* kValidAuthentications[] = { kNone, k8021X, NULL };
@@ -516,9 +505,7 @@ bool Validator::ValidateEthernet(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateIPConfig(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateIPConfig(base::DictionaryValue* result) {
   using namespace ::onc::ipconfig;
 
   static const char* kValidTypes[] = { kIPv4, kIPv6, NULL };
@@ -543,9 +530,7 @@ bool Validator::ValidateIPConfig(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateWiFi(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateWiFi(base::DictionaryValue* result) {
   using namespace ::onc::wifi;
 
   static const char* kValidSecurities[] =
@@ -566,9 +551,7 @@ bool Validator::ValidateWiFi(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateVPN(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateVPN(base::DictionaryValue* result) {
   using namespace ::onc::vpn;
 
   static const char* kValidTypes[] =
@@ -591,9 +574,7 @@ bool Validator::ValidateVPN(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateIPsec(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateIPsec(base::DictionaryValue* result) {
   using namespace ::onc::ipsec;
   using namespace ::onc::certificate;
 
@@ -629,9 +610,7 @@ bool Validator::ValidateIPsec(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateOpenVPN(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateOpenVPN(base::DictionaryValue* result) {
   using namespace ::onc::openvpn;
   using namespace ::onc::certificate;
 
@@ -667,8 +646,7 @@ bool Validator::ValidateOpenVPN(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateVerifyX509(const base::DictionaryValue& onc_object,
-                                   base::DictionaryValue* result) {
+bool Validator::ValidateVerifyX509(base::DictionaryValue* result) {
   using namespace ::onc::verify_x509;
 
   static const char* kValidTypeValues[] =
@@ -682,9 +660,7 @@ bool Validator::ValidateVerifyX509(const base::DictionaryValue& onc_object,
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateCertificatePattern(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateCertificatePattern(base::DictionaryValue* result) {
   using namespace ::onc::certificate;
 
   bool all_required_exist = true;
@@ -704,8 +680,7 @@ bool Validator::ValidateCertificatePattern(
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateProxySettings(const base::DictionaryValue& onc_object,
-                                      base::DictionaryValue* result) {
+bool Validator::ValidateProxySettings(base::DictionaryValue* result) {
   using namespace ::onc::proxy;
 
   static const char* kValidTypes[] = { kDirect, kManual, kPAC, kWPAD, NULL };
@@ -723,8 +698,7 @@ bool Validator::ValidateProxySettings(const base::DictionaryValue& onc_object,
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateProxyLocation(const base::DictionaryValue& onc_object,
-                                      base::DictionaryValue* result) {
+bool Validator::ValidateProxyLocation(base::DictionaryValue* result) {
   using namespace ::onc::proxy;
 
   bool all_required_exist =
@@ -733,8 +707,7 @@ bool Validator::ValidateProxyLocation(const base::DictionaryValue& onc_object,
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateEAP(const base::DictionaryValue& onc_object,
-                            base::DictionaryValue* result) {
+bool Validator::ValidateEAP(base::DictionaryValue* result) {
   using namespace ::onc::eap;
   using namespace ::onc::certificate;
 
@@ -767,9 +740,7 @@ bool Validator::ValidateEAP(const base::DictionaryValue& onc_object,
   return !error_on_missing_field_ || all_required_exist;
 }
 
-bool Validator::ValidateCertificate(
-    const base::DictionaryValue& onc_object,
-    base::DictionaryValue* result) {
+bool Validator::ValidateCertificate(base::DictionaryValue* result) {
   using namespace ::onc::certificate;
 
   static const char* kValidTypes[] = { kClient, kServer, kAuthority, NULL };
diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h
index a8983b5..8d8efee 100644
--- a/chromeos/network/onc/onc_validator.h
+++ b/chromeos/network/onc/onc_validator.h
@@ -99,10 +99,9 @@ class CHROMEOS_EXPORT Validator : public Mapper {
   // Overridden from Mapper:
   // Compare |onc_value|s type with |onc_type| and validate/repair according to
   // |signature|. On error returns NULL.
-  virtual scoped_ptr<base::Value> MapValue(
-    const OncValueSignature& signature,
-    const base::Value& onc_value,
-    bool* error) OVERRIDE;
+  virtual scoped_ptr<base::Value> MapValue(const OncValueSignature& signature,
+                                           const base::Value& onc_value,
+                                           bool* error) OVERRIDE;
 
   // Dispatch to the right validation function according to
   // |signature|. Iterates over all fields and recursively validates/repairs
@@ -129,81 +128,37 @@ class CHROMEOS_EXPORT Validator : public Mapper {
       bool* nested_error) OVERRIDE;
 
   // Pushes/pops the index to |path_|, otherwise like |Mapper::MapEntry|.
-  virtual scoped_ptr<base::Value> MapEntry(
-      int index,
-      const OncValueSignature& signature,
-      const base::Value& onc_value,
-      bool* error) OVERRIDE;
+  virtual scoped_ptr<base::Value> MapEntry(int index,
+                                           const OncValueSignature& signature,
+                                           const base::Value& onc_value,
+                                           bool* error) OVERRIDE;
 
   // This is the default validation of objects/dictionaries. Validates
   // |onc_object| according to |object_signature|. |result| must point to a
   // dictionary into which the repaired fields are written.
-  bool ValidateObjectDefault(
-      const OncValueSignature& object_signature,
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
+  bool ValidateObjectDefault(const OncValueSignature& object_signature,
+                             const base::DictionaryValue& onc_object,
+                             base::DictionaryValue* result);
 
   // Validates/repairs the kRecommended array in |result| according to
   // |object_signature| of the enclosing object.
-  bool ValidateRecommendedField(
-      const OncValueSignature& object_signature,
-      base::DictionaryValue* result);
-
-  bool ValidateToplevelConfiguration(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateNetworkConfiguration(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateEthernet(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateIPConfig(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateWiFi(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateVPN(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateIPsec(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateOpenVPN(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateVerifyX509(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateCertificatePattern(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateProxySettings(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateProxyLocation(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateEAP(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
-
-  bool ValidateCertificate(
-      const base::DictionaryValue& onc_object,
-      base::DictionaryValue* result);
+  bool ValidateRecommendedField(const OncValueSignature& object_signature,
+                                base::DictionaryValue* result);
+
+  bool ValidateToplevelConfiguration(base::DictionaryValue* result);
+  bool ValidateNetworkConfiguration(base::DictionaryValue* result);
+  bool ValidateEthernet(base::DictionaryValue* result);
+  bool ValidateIPConfig(base::DictionaryValue* result);
+  bool ValidateWiFi(base::DictionaryValue* result);
+  bool ValidateVPN(base::DictionaryValue* result);
+  bool ValidateIPsec(base::DictionaryValue* result);
+  bool ValidateOpenVPN(base::DictionaryValue* result);
+  bool ValidateVerifyX509(base::DictionaryValue* result);
+  bool ValidateCertificatePattern(base::DictionaryValue* result);
+  bool ValidateProxySettings(base::DictionaryValue* result);
+  bool ValidateProxyLocation(base::DictionaryValue* result);
+  bool ValidateEAP(base::DictionaryValue* result);
+  bool ValidateCertificate(base::DictionaryValue* result);
 
   bool FieldExistsAndHasNoValidValue(const base::DictionaryValue& object,
                                      const std::string &field_name,