Chromium Code Reviews Chromium Code Reviews
Issue 166903002:
Identify and repair ONC files with duplicate GUIDs (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@Issue_23567011| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/network/onc/onc_validator.h" | 5 #include "chromeos/network/onc/onc_validator.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 327 // Strict and liberal validator repair identically. | 327 // Strict and liberal validator repair identically. |
| 328 INSTANTIATE_TEST_CASE_P( | 328 INSTANTIATE_TEST_CASE_P( |
| 329 StrictAndLiberalRepairIdentically, | 329 StrictAndLiberalRepairIdentically, |
| 330 ONCValidatorTestRepairable, | 330 ONCValidatorTestRepairable, |
| 331 ::testing::Values( | 331 ::testing::Values( |
| 332 std::make_pair(OncParams("toplevel-invalid-network", | 332 std::make_pair(OncParams("toplevel-invalid-network", |
| 333 &kToplevelConfigurationSignature, | 333 &kToplevelConfigurationSignature, |
| 334 false), | 334 false), |
| 335 RepairParams("toplevel-repaired", | 335 RepairParams("toplevel-repaired", |
| 336 "toplevel-repaired")), | 336 "toplevel-repaired")), |
| 337 std::make_pair(OncParams("duplicate-network-guid", | |
| 338 &kToplevelConfigurationSignature, | |
| 339 false), | |
| 340 RepairParams("repaired-duplicate-network-guid", | |
| 341 "repaired-duplicate-network-guid")), | |
| 342 std::make_pair(OncParams("duplicate-cert-id", | |
|
pneubeck (no reviews)
2014/02/17 10:11:36
nit: id -> guid
kaliamoorthi
2014/02/17 15:06:49
Done.
| |
| 343 &kToplevelConfigurationSignature, | |
| 344 false), | |
| 345 RepairParams("repaired-duplicate-cert-id", | |
| 346 "repaired-duplicate-cert-id")), | |
| 337 std::make_pair(OncParams("toplevel-invalid-network", | 347 std::make_pair(OncParams("toplevel-invalid-network", |
| 338 &kToplevelConfigurationSignature, | 348 &kToplevelConfigurationSignature, |
| 339 true), | 349 true), |
| 340 RepairParams("toplevel-repaired", | 350 RepairParams("toplevel-repaired", |
| 341 "toplevel-repaired")), | 351 "toplevel-repaired")), |
| 342 // Ignore recommended arrays in unmanaged ONC. | 352 // Ignore recommended arrays in unmanaged ONC. |
| 343 std::make_pair(OncParams("network-with-illegal-recommended", | 353 std::make_pair(OncParams("network-with-illegal-recommended", |
| 344 &kNetworkConfigurationSignature, | 354 &kNetworkConfigurationSignature, |
| 345 false), | 355 false), |
| 346 RepairParams("network-repaired", "network-repaired")), | 356 RepairParams("network-repaired", "network-repaired")), |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 408 &kNetworkConfigurationSignature, true, | 418 &kNetworkConfigurationSignature, true, |
| 409 ::onc::ONC_SOURCE_DEVICE_POLICY), | 419 ::onc::ONC_SOURCE_DEVICE_POLICY), |
| 410 RepairParams("", "")), | 420 RepairParams("", "")), |
| 411 std::make_pair(OncParams("openvpn-invalid-verify-x509-type", | 421 std::make_pair(OncParams("openvpn-invalid-verify-x509-type", |
| 412 &kNetworkConfigurationSignature, false), | 422 &kNetworkConfigurationSignature, false), |
| 413 RepairParams("", "")) | 423 RepairParams("", "")) |
| 414 )); | 424 )); |
| 415 | 425 |
| 416 } // namespace onc | 426 } // namespace onc |
| 417 } // namespace chromeos | 427 } // namespace chromeos |
| OLD | NEW |
