Add an ONC property for the third-party VPN provider extension ID

chromeos/network/network_state.h

Index: chromeos/network/network_state.h
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index c456909150bfa65d97a4f094acf2ae4adbdd4d61..e4d9cce2cc090a730d8431e11f259c54abfcb0c5 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -92,8 +92,11 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   const std::string& roaming() const { return roaming_; }
   const std::string& payment_url() const { return payment_url_; }
   bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
-  const std::string& vpn_provider_extension_id() const {
-    return vpn_provider_extension_id_;
+
+  // VPN property accessors
+  const std::string& vpn_provider_type() const { return vpn_provider_type_; }
+  const std::string& third_party_vpn_provider_extension_id() const {
+    return third_party_vpn_provider_extension_id_;
   }
 
   // Returns true if |connection_state_| is a connected/connecting state.
@@ -183,10 +186,10 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   std::string payment_url_;
   bool cellular_out_of_credits_;
 
-  // VPN property. For networks using a third-party VPN provider, this will be
-  // the provider's extension ID. For networks using the built-in OpenVPN and
-  // L2TP support, this will be an empty string.
-  std::string vpn_provider_extension_id_;
+  // VPN properties, used to construct the display name and to show the correct
+  // configuration dialog.
+  std::string vpn_provider_type_;
+  std::string third_party_vpn_provider_extension_id_;
 
   // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
   // provides proxy configuration. crbug.com/241775