Add WiMAX to ONC validation list

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 511 matching lines @@
 
   if (IsGlobalNetworkConfigInUserImport(*result))
     return false;
 
   return true;
 }
 
 bool Validator::ValidateNetworkConfiguration(base::DictionaryValue* result) {
   using namespace ::onc::network_config;
 
-  const char* const kValidTypes[] = {
-      ::onc::network_type::kEthernet, ::onc::network_type::kVPN,
-      ::onc::network_type::kWiFi, ::onc::network_type::kCellular};
+  const char* const kValidTypes[] = {::onc::network_type::kEthernet,
+                                     ::onc::network_type::kVPN,
+                                     ::onc::network_type::kWiFi,
+                                     ::onc::network_type::kCellular,
+                                     ::onc::network_type::kWimax};
   const std::vector<const char*> valid_types(toVector(kValidTypes));
   const char* const kValidIPConfigTypes[] = {kIPConfigTypeDHCP,
                                              kIPConfigTypeStatic};
   const std::vector<const char*> valid_ipconfig_types(
       toVector(kValidIPConfigTypes));
   if (FieldExistsAndHasNoValidValue(*result, kType, valid_types) ||
       FieldExistsAndHasNoValidValue(*result, kIPAddressConfigType,
                                     valid_ipconfig_types) ||
       FieldExistsAndHasNoValidValue(*result, kNameServersConfigType,
                                     valid_ipconfig_types) ||
@@ skipping 39 matching lines @@
     }
 
     if (type == ::onc::network_type::kWiFi) {
       all_required_exist &= RequireField(*result, ::onc::network_config::kWiFi);
     } else if (type == ::onc::network_type::kEthernet) {
       all_required_exist &=
           RequireField(*result, ::onc::network_config::kEthernet);
     } else if (type == ::onc::network_type::kCellular) {
       all_required_exist &=
           RequireField(*result, ::onc::network_config::kCellular);
+    } else if (type == ::onc::network_type::kWimax) {
+      all_required_exist &=
+          RequireField(*result, ::onc::network_config::kWimax);
     } else if (type == ::onc::network_type::kVPN) {
       all_required_exist &= RequireField(*result, ::onc::network_config::kVPN);
     }
   }
 
   return !error_on_missing_field_ || all_required_exist;
 }
 
 bool Validator::ValidateEthernet(base::DictionaryValue* result) {
   using namespace ::onc::ethernet;
@@ skipping 332 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