ONC: Fix Static-/Saved-/IPConfig.

chromeos/network/onc/onc_validator.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 "chromeos/network/onc/onc_validator.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/json/json_writer.h"
@@ skipping 85 matching lines @@
 }
 
 scoped_ptr<base::DictionaryValue> Validator::MapObject(
     const OncValueSignature& signature,
     const base::DictionaryValue& onc_object,
     bool* error) {
   scoped_ptr<base::DictionaryValue> repaired(new base::DictionaryValue);
 
   bool valid = ValidateObjectDefault(signature, onc_object, repaired.get());
   if (valid) {
-    if (&signature == &kToplevelConfigurationSignature)
+    if (&signature == &kToplevelConfigurationSignature) {
       valid = ValidateToplevelConfiguration(repaired.get());
-    else if (&signature == &kNetworkConfigurationSignature)
+    } else if (&signature == &kNetworkConfigurationSignature) {
       valid = ValidateNetworkConfiguration(repaired.get());
-    else if (&signature == &kEthernetSignature)
+    } else if (&signature == &kEthernetSignature) {
       valid = ValidateEthernet(repaired.get());
-    else if (&signature == &kIPConfigSignature)
+    } else if (&signature == &kIPConfigSignature ||
+               &signature == &kSavedIPConfigSignature ||
+               &signature == &kStaticIPConfigSignature) {
       valid = ValidateIPConfig(repaired.get());
-    else if (&signature == &kWiFiSignature)
+    } else if (&signature == &kWiFiSignature) {
       valid = ValidateWiFi(repaired.get());
-    else if (&signature == &kVPNSignature)
+    } else if (&signature == &kVPNSignature) {
       valid = ValidateVPN(repaired.get());
-    else if (&signature == &kIPsecSignature)
+    } else if (&signature == &kIPsecSignature) {
       valid = ValidateIPsec(repaired.get());
-    else if (&signature == &kOpenVPNSignature)
+    } else if (&signature == &kOpenVPNSignature) {
       valid = ValidateOpenVPN(repaired.get());
-    else if (&signature == &kVerifyX509Signature)
+    } else if (&signature == &kVerifyX509Signature) {
       valid = ValidateVerifyX509(repaired.get());
-    else if (&signature == &kCertificatePatternSignature)
+    } else if (&signature == &kCertificatePatternSignature) {
       valid = ValidateCertificatePattern(repaired.get());
-    else if (&signature == &kProxySettingsSignature)
+    } else if (&signature == &kProxySettingsSignature) {
       valid = ValidateProxySettings(repaired.get());
-    else if (&signature == &kProxyLocationSignature)
+    } else if (&signature == &kProxyLocationSignature) {
       valid = ValidateProxyLocation(repaired.get());
-    else if (&signature == &kEAPSignature)
+    } else if (&signature == &kEAPSignature) {
       valid = ValidateEAP(repaired.get());
-    else if (&signature == &kCertificateSignature)
+    } else if (&signature == &kCertificateSignature) {
       valid = ValidateCertificate(repaired.get());
+    }
   }
 
   if (valid) {
     return repaired.Pass();
   } else {
     DCHECK(error_or_warning_found_);
     error_or_warning_found_ = *error = true;
     return scoped_ptr<base::DictionaryValue>();
   }
 }
@@ skipping 692 matching lines @@
 }
 
 std::string Validator::MessageHeader() {
   std::string path = path_.empty() ? "toplevel" : JoinString(path_, ".");
   std::string message = "At " + path + ": ";
   return message;
 }
 
 }  // namespace onc
 }  // namespace chromeos