Settings: Internet: Elim networkingPrivate.ThirdPartyVPNProperties

The type is not used for communication with chrome over the network
config api, it is associated with the chrome.send calls for
third party vpns.

Bug: 853953
Change-Id: I9c4217b2f3cd2cee482ad51c0f0c4edd66ba8326
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769617
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690820}

chrome/browser/resources/settings/internet_page/internet_page.js

@@ -101,7 +101,7 @@ Polymer({
 
     /**
      * List of third party VPN providers.
-     * @type {!Array<!chrome.networkingPrivate.ThirdPartyVPNProperties>}
+     * @type {!Array<!settings.ThirdPartyVPNProperties>}
      * @private
      */
     thirdPartyVpnProviders_: {
@@ -453,14 +453,12 @@ Polymer({
   },
 
   /**
-   * @param {!{model:
-   *            !{item: !chrome.networkingPrivate.ThirdPartyVPNProperties},
-   *        }} event
+   * @param {!{model: !{item: !settings.ThirdPartyVPNProperties}}} event
    * @private
    */
   onAddThirdPartyVpnTap_: function(event) {
     const provider = event.model.item;
-    this.browserProxy_.addThirdPartyVpn(provider.ExtensionID);
+    this.browserProxy_.addThirdPartyVpn(provider.extensionId);
   },
 
   /** @private */
@@ -496,8 +494,7 @@ Polymer({
 
   /**
    * If |extension| is a third-party VPN provider, add it to |vpnProviders|.
-   * @param {!Array<!chrome.networkingPrivate.ThirdPartyVPNProperties>}
-   *     vpnProviders
+   * @param {!Array<!settings.ThirdPartyVPNProperties>} vpnProviders
    * @param {!chrome.management.ExtensionInfo} extension
    * @private
    */
@@ -507,13 +504,13 @@ Polymer({
       return;
     }
     if (vpnProviders.find(function(provider) {
-          return provider.ExtensionID == extension.id;
+          return provider.extensionId == extension.id;
         })) {
       return;
     }
     const newProvider = {
-      ExtensionID: extension.id,
-      ProviderName: extension.name,
+      extensionId: extension.id,
+      providerName: extension.name,
     };
     vpnProviders.push(newProvider);
   },
@@ -535,7 +532,7 @@ Polymer({
   onExtensionRemoved_: function(extensionId) {
     for (let i = 0; i < this.thirdPartyVpnProviders_.length; ++i) {
       const provider = this.thirdPartyVpnProviders_[i];
-      if (provider.ExtensionID == extensionId) {
+      if (provider.extensionId == extensionId) {
         this.splice('thirdPartyVpnProviders_', i, 1);
         break;
       }
@@ -605,11 +602,11 @@ Polymer({
   },
 
   /**
-   * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} provider
+   * @param {!settings.ThirdPartyVPNProperties} provider
    * @return {string}
    */
   getAddThirdPartyVpnLabel_: function(provider) {
-    return this.i18n('internetAddThirdPartyVPN', provider.ProviderName || '');
+    return this.i18n('internetAddThirdPartyVPN', provider.providerName || '');
   },
 
   /**

chrome/browser/resources/settings/internet_page/internet_page_browser_proxy.js

@@ -15,6 +15,14 @@ cr.exportPath('settings');
  */
 settings.ArcVpnProvider;
 
+/**
+ * @typedef {{
+ *   extensionId: string,
+ *   providerName: (string|undefined)
+ * }}
+ */
+settings.ThirdPartyVPNProperties;
+
 cr.define('settings', function() {
   /** @interface */
   class InternetPageBrowserProxy {

chrome/browser/resources/settings/internet_page/internet_subpage.html

@@ -164,9 +164,9 @@
         <template is="dom-if" if="[[matchesType_('VPN', deviceState)]]">
           <!-- Third party VPNs. -->
           <template is="dom-repeat" items="[[thirdPartyVpnProviders]]">
-            <div id="[[item.ProviderName]]"
+            <div id="[[item.providerName]]"
                 class="vpn-header layout horizontal center">
-              <div class="flex settings-box-text">[[item.ProviderName]]</div>
+              <div class="flex settings-box-text">[[item.providerName]]</div>
               <cr-icon-button class="icon-add-circle"
                   aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]"
                   on-click="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">

chrome/browser/resources/settings/internet_page/internet_subpage.js

@@ -49,8 +49,7 @@ Polymer({
 
     /**
      * List of third party VPN providers.
-     * @type
-     *     {!Array<!chrome.networkingPrivate.ThirdPartyVPNProperties>|undefined}
+     * @type {!Array<!settings.ThirdPartyVPNProperties>|undefined}
      */
     thirdPartyVpnProviders: Array,
 
@@ -411,12 +410,12 @@ Polymer({
   },
 
   /**
-   * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} vpnState
+   * @param {!settings.ThirdPartyVPNProperties} vpnState
    * @return {string}
    * @private
    */
   getAddThirdPartyVpnA11yString_: function(vpnState) {
-    return this.i18n('internetAddThirdPartyVPN', vpnState.ProviderName || '');
+    return this.i18n('internetAddThirdPartyVPN', vpnState.providerName || '');
   },
 
   /**
@@ -462,13 +461,12 @@ Polymer({
   },
 
   /**
-   * @param {!{model: !{item:
-   *     !chrome.networkingPrivate.ThirdPartyVPNProperties}}} event
+   * @param {!{model: !{item: !settings.ThirdPartyVPNProperties}}} event
    * @private
    */
   onAddThirdPartyVpnTap_: function(event) {
     const provider = event.model.item;
-    this.browserProxy_.addThirdPartyVpn(provider.ExtensionID);
+    this.browserProxy_.addThirdPartyVpn(provider.extensionId);
   },
 
   /**
@@ -513,17 +511,17 @@ Polymer({
 
   /**
    * @param {!Object<!Array<!OncMojo.NetworkStateProperties>>} thirdPartyVpns
-   * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} vpnState
+   * @param {!settings.ThirdPartyVPNProperties} vpnState
    * @return {!Array<!OncMojo.NetworkStateProperties>}
    * @private
    */
   getThirdPartyVpnNetworks_: function(thirdPartyVpns, vpnState) {
-    return thirdPartyVpns[vpnState.ProviderName] || [];
+    return thirdPartyVpns[vpnState.providerName] || [];
   },
 
   /**
    * @param {!Object<!Array<!OncMojo.NetworkStateProperties>>} thirdPartyVpns
-   * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} vpnState
+   * @param {!settings.ThirdPartyVPNProperties} vpnState
    * @return {boolean}
    * @private
    */

ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.html

@@ -3,6 +3,11 @@
 <link rel="import" href="../hidden_style_css.html">
 <link rel="import" href="cr_policy_indicator_behavior.html">
 <link rel="import" href="cr_policy_network_behavior.html">
+<!-- Currently cr_policy_network_behavior_mojo.html is included only for testing
+     in cr_policy_network_behavior_mojo_tests.js which requires the behavior to
+     be loaded from an html file that the browser knows about.
+     TODO(853953): Convert this class to use the mojo API. -->
+<link rel="import" href="cr_policy_network_behavior.html">
 <link rel="import" href="cr_tooltip_icon.html">
 
 <dom-module id="cr-policy-network-indicator">