diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 15:10:56 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 15:10:56 +0000 |
| commit | 19d2aafef84472a3b62886a12da38e37c12cc7f2 (patch) | |
| tree | 77488e920e7fec6cf62c3bd205dcc70cbb3ba5d7 /chromeos/test/data/network | |
| parent | 18a9737c61c2ab50cf3c37c557d80faaec4fa28f (diff) | |
| download | chromium_src-19d2aafef84472a3b62886a12da38e37c12cc7f2.zip chromium_src-19d2aafef84472a3b62886a12da38e37c12cc7f2.tar.gz chromium_src-19d2aafef84472a3b62886a12da38e37c12cc7f2.tar.bz2 | |
Remove most of NetworkUIData.
As client certificate information is now retrieved from policy, most of NetworkUIData can be removed except ONCSource to indicate whether a network was managed after the policy got removed.
BUG=391292
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/370623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/test/data/network')
6 files changed, 1 insertions, 59 deletions
diff --git a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json b/chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json index 0cabd3f..ba74c29 100644 --- a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json +++ b/chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json @@ -3,5 +3,5 @@ "GUID":"guid", "Profile": "/profile/user1/shill", "Type":"etherneteap", - "UIData": "{\"certificate_pattern\":{\"IssuerCAPEMs\":[\"pem1\"]},\"certificate_type\":\"pattern\",\"onc_source\":\"user_policy\"}" + "UIData": "{\"onc_source\":\"user_policy\"}" } diff --git a/chromeos/test/data/network/uidata_for_l2tpipsec_clientcert.json b/chromeos/test/data/network/uidata_for_l2tpipsec_clientcert.json deleted file mode 100644 index 618e31a..0000000 --- a/chromeos/test/data/network/uidata_for_l2tpipsec_clientcert.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "certificate_pattern": { - "EnrollmentURI": [ - "my.enrollment.url" - ], - "IssuerCAPEMs": [ - "pem1", - "pem2" - ], - "Issuer": { - "CommonName": "common_name", - "Locality": "locality", - "Organization": "organization", - "OrganizationalUnit": "unit" - } - }, - "certificate_type": "pattern", - "onc_source": "user_policy" -} diff --git a/chromeos/test/data/network/uidata_for_openvpn_clientcert.json b/chromeos/test/data/network/uidata_for_openvpn_clientcert.json deleted file mode 100644 index 660a11b..0000000 --- a/chromeos/test/data/network/uidata_for_openvpn_clientcert.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "certificate_pattern": { - "EnrollmentURI": [ - "my.enrollment.url" - ], - "IssuerCAPEMs": [ - "pem1", - "pem2" - ], - "Subject": { - "CommonName": "common_name", - "Locality": "locality", - "Organization": "organization", - "OrganizationalUnit": "unit" - } - }, - "certificate_type": "pattern", - "onc_source": "user_policy" -} diff --git a/chromeos/test/data/network/uidata_for_wifi_clientcert.json b/chromeos/test/data/network/uidata_for_wifi_clientcert.json deleted file mode 100644 index b7af987..0000000 --- a/chromeos/test/data/network/uidata_for_wifi_clientcert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "certificate_pattern": { - "EnrollmentURI": [ - "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html" - ], - "IssuerCAPEMs": [ - "pem1", - "pem2" - ] - }, - "certificate_type": "pattern", - "onc_source": "user_policy" -} diff --git a/chromeos/test/data/network/uidata_for_wifi_clientref.json b/chromeos/test/data/network/uidata_for_wifi_clientref.json deleted file mode 100644 index d8a8bc0..0000000 --- a/chromeos/test/data/network/uidata_for_wifi_clientref.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "certificate_type": "ref", - "onc_source": "user_policy" -} diff --git a/chromeos/test/data/network/uidata_for_wifi_psk.json b/chromeos/test/data/network/uidata_for_wifi_psk.json deleted file mode 100644 index f4edf00..0000000 --- a/chromeos/test/data/network/uidata_for_wifi_psk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "onc_source": "user_policy" -} |