[CrOS cellular] Move enable sim lock to advanced section

Screenshot: https://screenshot.googleplex.com/W2Ko9uaQrXotXvJ.png

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

chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.html

@@ -261,10 +261,13 @@
         </settings-toggle-button>
       </template>
       <!-- SIM Info (Cellular only). -->
+      <!-- TODO(crbug/1093185): Remove when updatedCellularActivationUi
+           flag launches -->
       <template is="dom-if" if="[[showCellularSim_(managedProperties_)]]"
           restamp>
         <div class="settings-box single-column stretch">
-          <network-siminfo device-state="[[deviceState_]]">
+          <network-siminfo id="cellularSimInfo"
+              device-state="[[deviceState_]]">
           </network-siminfo>
         </div>
       </template>
@@ -299,6 +302,14 @@
         <!-- Advanced section -->
         <iron-collapse opened="[[advancedExpanded_]]">
           <div class="settings-box single-column stretch indented first">
+             <!-- SIM Info (Cellular only). -->
+            <template is="dom-if"
+                if="[[showCellularSimUpdatedUi_(managedProperties_)]]" restamp>
+              <div class="single-column stretch">
+                <network-siminfo device-state="[[deviceState_]]">
+                </network-siminfo>
+              </div>
+            </template>
             <!-- Metered (WiFi and Cellular only). -->
             <template is="dom-if"
                 if="[[showMetered_(managedProperties_, showMeteredToggle_)]]">

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

@@ -190,6 +190,14 @@ Polymer({
       }
     },
 
+    /** @private */
+    isUpdatedCellularUiEnabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('updatedCellularActivationUi');
+      }
+    },
+
     /** @private */
     advancedExpanded_: Boolean,
 
@@ -2114,12 +2122,25 @@ Polymer({
    * @private
    */
   showCellularSim_(managedProperties) {
-    return !!managedProperties &&
+    return !!managedProperties && !this.isUpdatedCellularUiEnabled_ &&
+        managedProperties.type ===
+        chromeos.networkConfig.mojom.NetworkType.kCellular &&
+        managedProperties.typeProperties.cellular.family !== 'CDMA';
+  },
+
+  /**
+   * @param {!chromeos.networkConfig.mojom.ManagedProperties} managedProperties
+   * @return {boolean}
+   * @private
+   */
+  showCellularSimUpdatedUi_(managedProperties) {
+    return !!managedProperties && this.isUpdatedCellularUiEnabled_ &&
         managedProperties.type ===
         chromeos.networkConfig.mojom.NetworkType.kCellular &&
         managedProperties.typeProperties.cellular.family !== 'CDMA';
   },
 
+
   /**
    * @param {!chromeos.networkConfig.mojom.ManagedProperties|undefined}
    *     managedProperties

chrome/test/data/webui/settings/chromeos/internet_detail_page_tests.js

@@ -50,6 +50,7 @@ suite('InternetDetailPage', function() {
       internetAddWiFi: 'internetAddWiFi',
       internetDetailPageTitle: 'internetDetailPageTitle',
       internetKnownNetworksPageTitle: 'internetKnownNetworksPageTitle',
+      updatedCellularActivationUi: false,
     });
 
     mojoApi_ = new FakeNetworkConfig();
@@ -414,7 +415,7 @@ suite('InternetDetailPage', function() {
       Polymer.dom.flush();
 
       const deepLinkElement =
-          internetDetailPage.$$('network-siminfo').$$('#simLockButton');
+          internetDetailPage.$$('#cellularSimInfo').$$('#simLockButton');
 
       // In this rare case, wait after next render twice due to focus behavior
       // of the siminfo component.