diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-08-12 18:39:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-13 01:39:36 +0000 |
| commit | e4695f45330a7f79ef5ea3309c3ea784f6c5f83a (patch) | |
| tree | caaa5d5bc180fe2073494be77bb00031eab92dce /chromeos/test | |
| parent | 4f336a6bca18d7a71660d79e7a56d018d74dabaf (diff) | |
| download | chromium_src-e4695f45330a7f79ef5ea3309c3ea784f6c5f83a.zip chromium_src-e4695f45330a7f79ef5ea3309c3ea784f6c5f83a.tar.gz chromium_src-e4695f45330a7f79ef5ea3309c3ea784f6c5f83a.tar.bz2 | |
Make Type an unmanaged ONC property
This will simplify some of the new Settings UI, allowing us
to read onc.Type directly without parsing a managed dictionary.
BUG=none
Review URL: https://codereview.chromium.org/1284963002
Cr-Commit-Position: refs/heads/master@{#343146}
Diffstat (limited to 'chromeos/test')
3 files changed, 3 insertions, 11 deletions
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json index f06cc2f..500813d 100644 --- a/chromeos/test/data/network/augmented_merge.json +++ b/chromeos/test/data/network/augmented_merge.json @@ -55,13 +55,7 @@ "UserSetting": "Direct" } }, - "Type": { - "Active": "VPN", - "DevicePolicy": "VPN", - "Effective": "UserPolicy", - "UserPolicy": "VPN", - "UserSetting": "Ethernet" - }, + "Type": "VPN", "VPN": { "Host": { "DeviceEditable": true, diff --git a/chromeos/test/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc b/chromeos/test/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc index a3c79ce..8205bd5 100644 --- a/chromeos/test/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc +++ b/chromeos/test/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc @@ -3,9 +3,7 @@ "Active": "wifi2" }, "Source": "User", - "Type": { - "Active": "WiFi" - }, + "Type": "WiFi", "WiFi": { "AutoConnect": { "Active": false, diff --git a/chromeos/test/data/network/user.onc b/chromeos/test/data/network/user.onc index b277e11..4e6835e 100644 --- a/chromeos/test/data/network/user.onc +++ b/chromeos/test/data/network/user.onc @@ -1,4 +1,4 @@ -{ "Type": "Ethernet", +{ "Type": "VPN", "Name": "testopenvpn", "VPN": { "Host": "users host", |