[CrOS cellular] Fix carrier name being displayed twice

Before this CL psim networks and tether networks provider names
are displayed. This CL restricts this functionality to esim networks

Bug: 1154407
Change-Id: Ife86112bb08422d172289294f6e09e2bbfe51be4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575210Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/master@{#834315}

chrome/test/data/webui/cr_components/chromeos/network/network_list_item_test.js

@@ -16,9 +16,10 @@
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {FakeNetworkConfig} from 'chrome://test/chromeos/fake_network_config_mojom.m.js';
 // #import {MojoInterfaceProviderImpl} from 'chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js';
+// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 // clang-format on
 
-suite('NetworkListTest', function() {
+suite('NetworkListItemTest', function() {
   /** @type {!NetworkListItem|undefined} */
   let listItem;
 
@@ -27,6 +28,10 @@ suite('NetworkListTest', function() {
   let mojoApi_ = null;
 
   setup(function() {
+    loadTimeData.overrideValues({
+      updatedCellularActivationUi: true,
+    });
+
     mojom = chromeos.networkConfig.mojom;
     mojoApi_ = new FakeNetworkConfig();
     network_config.MojoInterfaceProviderImpl.getInstance().remote_ = mojoApi_;
@@ -69,19 +74,21 @@ suite('NetworkListTest', function() {
     let providerName = listItem.$$('#networkProviderName');
     assertFalse(!!providerName.textContent.trim());
 
-    const tether = OncMojo.getDefaultManagedProperties(
-        chromeos.networkConfig.mojom.NetworkType.kTether, 'tether1_guid', '');
-    tether.name = OncMojo.createManagedString('tether1');
-    tether.typeProperties.tether.carrier = 'Google Fi';
-    initProperties(tether);
+    const cellular = OncMojo.getDefaultManagedProperties(
+        chromeos.networkConfig.mojom.NetworkType.kCellular, 'cellular1_guid',
+        '');
+    cellular.name = OncMojo.createManagedString('cellular1');
+    cellular.typeProperties.cellular.homeProvider = {name: 'Verizon Wireless'};
+    cellular.typeProperties.cellular.eid = '10000';
+    initProperties(cellular);
 
-    listItem.item =
-        OncMojo.getDefaultNetworkState(mojom.NetworkType.kTether, 'tether1');
+    listItem.item = OncMojo.getDefaultNetworkState(
+        mojom.NetworkType.kCellular, 'cellular1');
 
     await flushAsync();
 
     providerName = listItem.$$('#networkProviderName');
     assertTrue(!!providerName);
-    assertEquals('Google Fi', providerName.textContent.trim());
+    assertEquals('Verizon Wireless', providerName.textContent.trim());
   });
 });

ui/webui/resources/cr_components/chromeos/network/network_list_item.js

@@ -104,6 +104,14 @@ Polymer({
       type: String,
       value: '',
     },
+
+    /** @private */
+    isUpdatedCellularUiEnabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('updatedCellularActivationUi');
+      }
+    },
   },
 
   /** @private {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */
@@ -140,25 +148,20 @@ Polymer({
   setProviderName_() {
     const mojom = chromeos.networkConfig.mojom;
 
-    if (this.networkState.type !== mojom.NetworkType.kTether &&
-        this.networkState.type !== mojom.NetworkType.kCellular) {
+    if (this.networkState.type !== mojom.NetworkType.kCellular ||
+        !this.isUpdatedCellularUiEnabled_) {
       return;
     }
 
     this.networkConfig_.getManagedProperties(this.networkState.guid)
         .then(response => {
-          if (!response || !response.result) {
+          if (!response || !response.result ||
+              !response.result.typeProperties.cellular.eid) {
             return;
           }
           const managedProperty = response.result;
 
-          if (managedProperty.type === mojom.NetworkType.kTether &&
-              managedProperty.typeProperties.tether) {
-            this.providerName_ = managedProperty.typeProperties.tether.carrier;
-          }
-
-          if (managedProperty.type === mojom.NetworkType.kCellular &&
-              managedProperty.typeProperties.cellular.homeProvider) {
+          if (managedProperty.typeProperties.cellular.homeProvider) {
             this.providerName_ =
                 managedProperty.typeProperties.cellular.homeProvider.name;
           }