Revert "[CrOS Cellular] Close APN subpage when device is inhibited"

This reverts commit 71e2c6f.

Reason for revert: Causing test failures: https://buganizer.corp.google.com/issues/328201974

Original change's description:
> [CrOS Cellular] Close APN subpage when device is inhibited
>
> Update <apn-subpage> to close if the cellular device becomes inhibited.
>
> Bug: b:318561207
> Test: *ApnSubpage*
> Change-Id: I44f125880227c6dd989ce4341e851124cb9aaf52
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5368744
> Commit-Queue: Regan Hsu <hsuregan@chromium.org>
> Auto-Submit: Gordon Seto <gordonseto@google.com>
> Reviewed-by: Regan Hsu <hsuregan@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1272319}

(cherry picked from commit 4444582)

Bug: b:318561207
Change-Id: Ie5633759319b1f4b30011a4475ca2bba2050a560
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384280
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Regan Hsu <hsuregan@chromium.org>
Commit-Queue: Gordon Seto <gordonseto@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1276516}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5386746
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Gordon Seto <gordonseto@google.com>
Cr-Commit-Position: refs/branch-heads/6367@{#103}
Cr-Branched-From: d158c6d-refs/heads/main@{#1274542}

chrome/browser/resources/ash/settings/internet_page/apn_subpage.ts

@@ -11,12 +11,11 @@ import './internet_shared.css.js';
 import 'chrome://resources/ash/common/network/apn_list.js';
 
 import {ApnList} from 'chrome://resources/ash/common/network/apn_list.js';
-import {processDeviceState, shouldDisallowNetworkModifications} from 'chrome://resources/ash/common/network/cellular_utils.js';
+import {processDeviceState} from 'chrome://resources/ash/common/network/cellular_utils.js';
 import {MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
 import {NetworkListenerBehavior, NetworkListenerBehaviorInterface} from 'chrome://resources/ash/common/network/network_listener_behavior.js';
 import {OncMojo} from 'chrome://resources/ash/common/network/onc_mojo.js';
 import {assert} from 'chrome://resources/js/assert.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {CrosNetworkConfigInterface, ManagedProperties, MAX_NUM_CUSTOM_APNS, NetworkStateProperties} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js';
 import {NetworkType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
@@ -64,21 +63,11 @@ export class ApnSubpageElement extends ApnSubpageElementBase {
 
       managedProperties_: {
         type: Object,
-        observer: 'closePageIfNetworkModificationsDisallowed_',
       },
 
       deviceState_: {
         type: Object,
         value: null,
-        observer: 'closePageIfNetworkModificationsDisallowed_',
-      },
-
-      isCellularCarrierLockEnabled_: {
-        type: Boolean,
-        value() {
-          return loadTimeData.valueExists('isCellularCarrierLockEnabled') &&
-              loadTimeData.getBoolean('isCellularCarrierLockEnabled');
-        },
       },
     };
   }
@@ -88,7 +77,6 @@ export class ApnSubpageElement extends ApnSubpageElementBase {
   private guid_: string;
   private managedProperties_: ManagedProperties|undefined;
   private networkConfig_: CrosNetworkConfigInterface;
-  private isCellularCarrierLockEnabled_: boolean;
 
   constructor() {
     super();
@@ -170,9 +158,7 @@ export class ApnSubpageElement extends ApnSubpageElementBase {
   }
 
   private async getNetworkDetails_(): Promise<void> {
-    if (!this.guid_) {
-      return;
-    }
+    assert(this.guid_);
 
     const response = await this.networkConfig_.getManagedProperties(this.guid_);
     // Details page was closed while request was in progress, ignore the
@@ -228,14 +214,6 @@ export class ApnSubpageElement extends ApnSubpageElementBase {
         managedProperties.type === NetworkType.kCellular;
   }
 
-  private closePageIfNetworkModificationsDisallowed_(): void {
-    if (shouldDisallowNetworkModifications(
-            this.isCellularCarrierLockEnabled_, this.deviceState_,
-            this.managedProperties_)) {
-      this.close();
-    }
-  }
-
   private computeIsNumCustomApnsLimitReached_(): boolean {
     return this.isCellular_(this.managedProperties_) &&
         !!this.managedProperties_!.typeProperties.cellular!.customApnList &&

chrome/test/data/webui/settings/chromeos/apn_subpage_test.ts

@@ -258,26 +258,6 @@ suite('ApnSubpageTest', () => {
     Router.getInstance().navigateToPreviousRoute = navigateToPreviousRoute;
   });
 
-  test('Device becomes inhibited while on subpage', async () => {
-    let counter = 0;
-    const navigateToPreviousRoute =
-        Router.getInstance().navigateToPreviousRoute;
-    Router.getInstance().navigateToPreviousRoute = () => {
-      counter++;
-    };
-
-    // Simulate the device becoming inhibited.
-    mojoApi_.setDeviceStateForTest({
-      ...getDefaultDeviceStateProps(),
-      deviceState: DeviceStateType.kEnabled,
-      inhibitReason: InhibitReason.kInstallingProfile,
-    });
-    await flushTasks();
-
-    assertEquals(1, counter);
-    Router.getInstance().navigateToPreviousRoute = navigateToPreviousRoute;
-  });
-
   test('Portal state is propagated to <apn-list>', async () => {
     let props: ManagedProperties = OncMojo.getDefaultManagedProperties(
         NetworkType.kCellular, 'cellular_guid', 'cellular');