summaryrefslogtreecommitdiffstats
path: root/chromeos/test
diff options
context:
space:
mode:
authorSteven Bennetts <stevenjb@chromium.org>2014-09-11 13:50:25 -0700
committerSteven Bennetts <stevenjb@chromium.org>2014-09-11 20:56:15 +0000
commitb4dd54b73384e5ca0af94aefcef95e4521c338ea (patch)
treefbe22869ad30317d49cbe26965c185467d1af69e /chromeos/test
parent93c37f1b01ef982bce30d4404562f05c7b1d439e (diff)
downloadchromium_src-b4dd54b73384e5ca0af94aefcef95e4521c338ea.zip
chromium_src-b4dd54b73384e5ca0af94aefcef95e4521c338ea.tar.gz
chromium_src-b4dd54b73384e5ca0af94aefcef95e4521c338ea.tar.bz2
Add ONC 'Source' configuration property
This also includes a bit of JS cleanup to use ONC properties directly where possible. BUG=279351 R=pneubeck@chromium.org Review URL: https://codereview.chromium.org/552113002 Cr-Commit-Position: refs/heads/master@{#294462}
Diffstat (limited to 'chromeos/test')
-rw-r--r--chromeos/test/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc1
-rw-r--r--chromeos/test/data/network/shill_cellular_with_state.json3
-rw-r--r--chromeos/test/data/network/shill_wifi_with_state.json1
-rw-r--r--chromeos/test/data/network/translation_of_shill_cellular_with_state.onc3
-rw-r--r--chromeos/test/data/network/translation_of_shill_wifi_with_state.onc1
5 files changed, 7 insertions, 2 deletions
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 d8c252a9..3de8b23 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
@@ -2,6 +2,7 @@
"Name": {
"Active": "wifi2"
},
+ "Source": "User",
"Type": {
"Active": "WiFi"
},
diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json
index 3edece1..081f173 100644
--- a/chromeos/test/data/network/shill_cellular_with_state.json
+++ b/chromeos/test/data/network/shill_cellular_with_state.json
@@ -49,5 +49,6 @@
"LockType": "sim-pin",
"LockEnabled": true
}
- }
+ },
+ "Profile": "/profile/default",
}
diff --git a/chromeos/test/data/network/shill_wifi_with_state.json b/chromeos/test/data/network/shill_wifi_with_state.json
index 8ae1dc5..9a2fe93 100644
--- a/chromeos/test/data/network/shill_wifi_with_state.json
+++ b/chromeos/test/data/network/shill_wifi_with_state.json
@@ -6,6 +6,7 @@
"Name": "OpenWrt",
"Passphrase": "some passphrase",
"Priority": 1,
+ "Profile": "/profile/someuser",
"Security": "psk",
"State": "idle",
"Strength": 10,
diff --git a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
index 8179464..7180366 100644
--- a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
@@ -43,5 +43,6 @@
"LockType": "sim-pin",
"LockEnabled": true
}
- }
+ },
+ "Source":"Device"
}
diff --git a/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc b/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
index 6ba3974..25c833e 100644
--- a/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
@@ -14,4 +14,5 @@
"SignalStrength": 10
},
"ConnectionState": "NotConnected",
+ "Source":"User"
}