Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: chromeos/test/data/network/augmented_merge.json

Issue 749013003: ONC: Add IPAddressConfigType and NameServersConfigType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Alywas use empty dictionary to clear StaticIPConfig properties Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/test/data/network/augmented_merge.json
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json
index 5c7c434978d587aeb577ad7453815ca68d31b818..f06cc2f4a51a863183b4fc61c656663b734b2370 100644
--- a/chromeos/test/data/network/augmented_merge.json
+++ b/chromeos/test/data/network/augmented_merge.json
@@ -13,7 +13,12 @@
"IPAddress": "124.124.124.124",
"NameServers": [ "1.1.1.5", "1.1.1.6" ],
"RoutingPrefix": 25,
- "Type": "IPv4",
+ "Type": "IPv4"
+ },
+ "IPAddressConfigType": {
+ "DevicePolicy": "Static",
+ "Effective": "UserPolicy",
+ "UserSetting": "Static"
},
"StaticIPConfig": {
"IPAddress": {
« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698