chromeos networking: move from security to securityclass property

Adopt shill's kSecurityClassProperty, in place of shill's
kSecurityProperty. This eliminates the need for Chrome to understand
the equivalence of WPA and RSN networks.

This CL introduces only one functional change. Namely,
NetworkState::GetSpecifier will now collapse WPA and RSN networks into
one class (by virtue of using kSecurityClassProperty). The previous
behavior is considered a bug.

After this CL, only WifiAccessPointInfoProviderChromeOs still uses
kSecurityProperty. In that one case, we want to break out WPA and RSN
networks, to understand what fraction of systems are connecting
through older APs.

While there: remove a couple of unused files in chromeos/test/data/network/policy/.

BUG=chromium:440032
TEST=ManagedNetworkConfigurationHandlerTest.*
TEST=ONC*

Review URL: https://codereview.chromium.org/788633003

Cr-Commit-Position: refs/heads/master@{#310840}

16 files changed, 11 insertions, 60 deletions

diff --git a/chromeos/test/data/network/policy/shill_disallow_autoconnect_on_unmanaged_wifi2.json b/chromeos/test/data/network/policy/shill_disallow_autoconnect_on_unmanaged_wifi2.json
index d21b704..d03b86c 100644
--- a/chromeos/test/data/network/policy/shill_disallow_autoconnect_on_unmanaged_wifi2.json
+++ b/chromeos/test/data/network/policy/shill_disallow_autoconnect_on_unmanaged_wifi2.json
@@ -2,7 +2,7 @@
   "AutoConnect": false,
   "Mode": "managed",
   "Profile": "/profile/user1/shill",
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "WiFi.HexSSID": "7769666932"  // "wifi2"
 }
diff --git a/chromeos/test/data/network/policy/shill_managed_wifi1_rsn.json b/chromeos/test/data/network/policy/shill_managed_wifi1_rsn.json
deleted file mode 100644
index 1ab8bb9..0000000
--- a/chromeos/test/data/network/policy/shill_managed_wifi1_rsn.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "AutoConnect": true,
-  "GUID": "policy_wifi1",
-  "Mode": "managed",
-  "Passphrase": "user's passphrase",
-  "Profile": "/profile/user1/shill",
-  "WiFi.HexSSID": "7769666931", // "wifi1"
-  "Security": "rsn",
-  "Type": "wifi",
-  "UIData": "{\"onc_source\":\"user_policy\",\"user_settings\":{\"WiFi\":{\"Passphrase\":\"FAKE_CREDENTIAL_VPaJDV9x\"}}}"
-}
diff --git a/chromeos/test/data/network/policy/shill_policy_autoconnect_on_unconfigured_wifi1.json b/chromeos/test/data/network/policy/shill_policy_autoconnect_on_unconfigured_wifi1.json
index 219af79..178e76b 100644
--- a/chromeos/test/data/network/policy/shill_policy_autoconnect_on_unconfigured_wifi1.json
+++ b/chromeos/test/data/network/policy/shill_policy_autoconnect_on_unconfigured_wifi1.json
@@ -5,7 +5,7 @@
   "Mode": "managed",
   "Passphrase": "policy's passphrase",
   "Profile": "/profile/user1/shill",
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "UIData": "{\"onc_source\":\"user_policy\"}",
   "WiFi.HexSSID": "7769666931"  // "wifi1"
diff --git a/chromeos/test/data/network/policy/shill_policy_on_unconfigured_wifi1.json b/chromeos/test/data/network/policy/shill_policy_on_unconfigured_wifi1.json
index d998ba9..68f4564 100644
--- a/chromeos/test/data/network/policy/shill_policy_on_unconfigured_wifi1.json
+++ b/chromeos/test/data/network/policy/shill_policy_on_unconfigured_wifi1.json
@@ -3,7 +3,7 @@
   "Mode": "managed",
   "Passphrase": "policy's passphrase",
   "Profile": "/profile/user1/shill",
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "UIData": "{\"onc_source\":\"user_policy\"}",
   "WiFi.HexSSID": "7769666931"  // "wifi1"
diff --git a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1.json b/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1.json
index 7c9c4bc..5a8f5f2 100644
--- a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1.json
+++ b/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1.json
@@ -4,7 +4,7 @@
   "Passphrase": "user's passphrase",
   "Profile": "/profile/user1/shill",
   "WiFi.HexSSID": "7769666931", // "wifi1"
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "UIData": "{\"onc_source\":\"user_policy\",\"user_settings\":{\"WiFi\":{\"Passphrase\":\"FAKE_CREDENTIAL_VPaJDV9x\"}}}"
 }
diff --git a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1_wo_uidata.json b/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1_wo_uidata.json
deleted file mode 100644
index 9df16c0..0000000
--- a/chromeos/test/data/network/policy/shill_policy_on_unmanaged_wifi1_wo_uidata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "GUID": "policy_wifi1",
-  "Mode": "managed",
-  "Passphrase": "user's passphrase",
-  "Profile": "/profile/user1/shill",
-  "Security": "psk",
-  "Type": "wifi",
-  "UIData": "{\"onc_source\":\"user_policy\"}}",
-  "WiFi.HexSSID": "7769666931"  // "wifi1"
-}
diff --git a/chromeos/test/data/network/policy/shill_unmanaged_wifi1.json b/chromeos/test/data/network/policy/shill_unmanaged_wifi1.json
index a83b2ed..9467416 100644
--- a/chromeos/test/data/network/policy/shill_unmanaged_wifi1.json
+++ b/chromeos/test/data/network/policy/shill_unmanaged_wifi1.json
@@ -4,7 +4,7 @@
   "Passphrase": "user's passphrase",
   "Profile": "/profile/user1/shill",
   "WiFi.HexSSID": "7769666931", // "wifi1"
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "UIData": "{\"user_settings\":{\"WiFi\":{\"Passphrase\":\"user's passphrase\"}}}"
 }
diff --git a/chromeos/test/data/network/policy/shill_unmanaged_wifi1_wo_uidata.json b/chromeos/test/data/network/policy/shill_unmanaged_wifi1_wo_uidata.json
deleted file mode 100644
index 6028b6b..0000000
--- a/chromeos/test/data/network/policy/shill_unmanaged_wifi1_wo_uidata.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "GUID": "{unmanaged_user_wifi1}",
-  "Mode": "managed",
-  "Passphrase": "user's passphrase",
-  "Profile": "/profile/user1/shill",
-  "Security": "psk",
-  "Type": "wifi",
-  "WiFi.HexSSID": "7769666931"  // "wifi1"
-}
diff --git a/chromeos/test/data/network/policy/shill_unmanaged_wifi2.json b/chromeos/test/data/network/policy/shill_unmanaged_wifi2.json
index 74b3d63..4b26449 100644
--- a/chromeos/test/data/network/policy/shill_unmanaged_wifi2.json
+++ b/chromeos/test/data/network/policy/shill_unmanaged_wifi2.json
@@ -3,7 +3,7 @@
   "Mode": "managed",
   "Passphrase": "user's passphrase",
   "Profile": "/profile/user1/shill",
-  "Security": "psk",
+  "SecurityClass": "psk",
   "Type": "wifi",
   "WiFi.HexSSID": "7769666932"  // "wifi2"
 }
diff --git a/chromeos/test/data/network/shill_wifi_clientcert.json b/chromeos/test/data/network/shill_wifi_clientcert.json
index 0015800..8a0bd7a 100644
--- a/chromeos/test/data/network/shill_wifi_clientcert.json
+++ b/chromeos/test/data/network/shill_wifi_clientcert.json
@@ -5,7 +5,7 @@
    "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
    "Mode": "managed",
    "SaveCredentials": true,
-   "Security": "802_1x",
+   "SecurityClass": "802_1x",
    "Type": "wifi",
    "WiFi.HexSSID": "536F6D65576966692D5859" // "SomeWifi-XY"
 }
diff --git a/chromeos/test/data/network/shill_wifi_clientref.json b/chromeos/test/data/network/shill_wifi_clientref.json
index 551cda8..65dfbdc 100644
--- a/chromeos/test/data/network/shill_wifi_clientref.json
+++ b/chromeos/test/data/network/shill_wifi_clientref.json
@@ -5,7 +5,7 @@
    "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
    "Mode": "managed",
    "SaveCredentials": true,
-   "Security": "802_1x",
+   "SecurityClass": "802_1x",
    "Type": "wifi",
    "WiFi.HexSSID": "536F6D65576966692D5859" // "SomeWifi-XY"
 }
diff --git a/chromeos/test/data/network/shill_wifi_dhcp.json b/chromeos/test/data/network/shill_wifi_dhcp.json
index ccbe750..1e9b269 100644
--- a/chromeos/test/data/network/shill_wifi_dhcp.json
+++ b/chromeos/test/data/network/shill_wifi_dhcp.json
@@ -4,7 +4,7 @@
    "Mode": "managed",
    "StaticIPConfig": {},
    "Passphrase": "some passphrase",
-   "Security": "psk",
+   "SecurityClass": "psk",
    "Type": "wifi",
    "WiFi.HexSSID": "576966695769746844484350", // "WifiWithDHCP"
 }
diff --git a/chromeos/test/data/network/shill_wifi_psk.json b/chromeos/test/data/network/shill_wifi_psk.json
index 9969879..2e48e7d 100644
--- a/chromeos/test/data/network/shill_wifi_psk.json
+++ b/chromeos/test/data/network/shill_wifi_psk.json
@@ -3,7 +3,7 @@
    "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
    "Mode": "managed",
    "Passphrase": "some passphrase",
-   "Security": "psk",
+   "SecurityClass": "psk",
    "Type": "wifi",
    "WiFi.HexSSID": "4F70656E577274", // "OpenWrt"
    "WiFi.HiddenSSID": false,
diff --git a/chromeos/test/data/network/shill_wifi_with_state.json b/chromeos/test/data/network/shill_wifi_with_state.json
index 9a2fe93..a152675 100644
--- a/chromeos/test/data/network/shill_wifi_with_state.json
+++ b/chromeos/test/data/network/shill_wifi_with_state.json
@@ -7,7 +7,7 @@
    "Passphrase": "some passphrase",
    "Priority": 1,
    "Profile": "/profile/someuser",
-   "Security": "psk",
+   "SecurityClass": "psk",
    "State": "idle",
    "Strength": 10,
    "Type": "wifi",
diff --git a/chromeos/test/data/network/shill_wifi_wpa1.json b/chromeos/test/data/network/shill_wifi_wpa1.json
deleted file mode 100644
index db1e353..0000000
--- a/chromeos/test/data/network/shill_wifi_wpa1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "GUID":"{64c4f86b-cf6a-4e4a-8eff-456def}",
-  "Mode":"managed",
-  "Name":"OpenWrt",
-  "Passphrase":"some passphrase",
-  "Security":"wpa",
-  "Type":"wifi",
-  "WiFi.HexSSID": "4F70656E577274" // "OpenWrt"
-}
diff --git a/chromeos/test/data/network/translation_of_shill_wifi_wpa1.onc b/chromeos/test/data/network/translation_of_shill_wifi_wpa1.onc
deleted file mode 100644
index c23df0f..0000000
--- a/chromeos/test/data/network/translation_of_shill_wifi_wpa1.onc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "GUID":"{64c4f86b-cf6a-4e4a-8eff-456def}",
-  "Name":"OpenWrt",
-  "Type":"WiFi",
-  "WiFi":{
-    "Passphrase":"some passphrase",
-    "SSID":"OpenWrt",
-    "Security":"WPA-PSK"
-  }
-}