Don't reject server and CA certs during device ONC validation

chromeos/network/onc/onc_validator_unittest.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 <memory>
 #include <string>
 #include <utility>
 
@@ skipping 145 matching lines @@
                   true,
                   ::onc::ONC_SOURCE_DEVICE_POLICY),
         // AllowOnlyPolicyNetworksToConnect is only allowed for device policies.
         OncParams("managed_toplevel_with_only_managed.onc",
                   &kToplevelConfigurationSignature,
                   true,
                   ::onc::ONC_SOURCE_DEVICE_POLICY),
         OncParams("managed_toplevel_l2tpipsec.onc",
                   &kToplevelConfigurationSignature,
                   true),
+        OncParams("managed_toplevel_with_server_and_ca_cert.onc",
+                  &kToplevelConfigurationSignature,
+                  true),
         OncParams("toplevel_wifi_hexssid.onc",
                   &kToplevelConfigurationSignature,
                   false),
         OncParams("toplevel_wifi_ssid_and_hexssid.onc",
                   &kToplevelConfigurationSignature,
                   false),
         OncParams("toplevel_wifi_wpa_psk.onc",
                   &kToplevelConfigurationSignature,
                   false),
         OncParams("toplevel_wifi_wep_proxy.onc",
@@ skipping 279 matching lines @@
                        ExpectBothNotValid("toplevel-empty", "toplevel-empty")),
         std::make_pair(OncParams("wifi-ssid-and-hexssid-inconsistent",
                                  &kNetworkConfigurationSignature,
                                  false),
                        ExpectBothNotValid("wifi-ssid-and-hexssid-repaired",
                                           "wifi-ssid-and-hexssid-repaired")),
         std::make_pair(OncParams("wifi-ssid-and-hexssid-partially-invalid",
                                  &kNetworkConfigurationSignature,
                                  false),
                        ExpectBothNotValid("wifi-ssid-and-hexssid-repaired",
-                                          "wifi-ssid-and-hexssid-repaired")),
-        std::make_pair(
-            OncParams("toplevel-with-server-and-ca-cert",
-                      &kToplevelConfigurationSignature,
-                      true,
-                      ::onc::ONC_SOURCE_DEVICE_POLICY),
-            ExpectBothNotValid("toplevel-server-and-ca-cert-dropped",
-                               "toplevel-server-and-ca-cert-dropped"))));
+                                          "wifi-ssid-and-hexssid-repaired"))));
 
 // Strict and liberal validator both repair, but with different results.
 INSTANTIATE_TEST_CASE_P(
     StrictAndLiberalRepairDifferently,
     ONCValidatorTestRepairable,
     ::testing::Values(std::make_pair(OncParams("toplevel-with-nested-warning",
                                                &kToplevelConfigurationSignature,
                                                false),
                                      ExpectBothNotValid("toplevel-empty",
                                                         "toplevel-repaired"))));
@@ skipping 93 matching lines @@
                                  &kNetworkWithStateSignature,
                                  true),
                        ExpectBothNotValid("", "")),
         std::make_pair(OncParams("tether-signal-strength-over-100",
                                  &kNetworkWithStateSignature,
                                  true),
                        ExpectBothNotValid("", ""))));
 
 }  // namespace onc
 }  // namespace chromeos