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

chromeos/network/network_state.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 74 matching lines @@
 
   // Cellular property accessors
   const std::string& network_technology() const {
     return network_technology_;
   }
   const std::string& activation_type() const { return activation_type_; }
   const std::string& activation_state() const { return activation_state_; }
   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.
   bool IsConnectedState() const;
   bool IsConnectingState() const;
 
   // Returns true if this is a network stored in a profile.
   bool IsInProfile() const;
 
   // Returns true if the network properties are stored in a user profile.
@@ skipping 69 matching lines @@
   int signal_strength_;
 
   // Cellular properties, used for icons, Connect, and Activation.
   std::string network_technology_;
   std::string activation_type_;
   std::string activation_state_;
   std::string roaming_;
   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
   base::DictionaryValue proxy_config_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_