Settings: Network: Merge Tether networks into Mobile subpage

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

Index: chrome/browser/resources/settings/internet_page/internet_page.js
diff --git a/chrome/browser/resources/settings/internet_page/internet_page.js b/chrome/browser/resources/settings/internet_page/internet_page.js
index 45d9bee30c5bdc2b46ba047f3fecf19d756f7b6d..7a96a04df9de3029e46f5654cf6b4bebe6c8fd94 100644
--- a/chrome/browser/resources/settings/internet_page/internet_page.js
+++ b/chrome/browser/resources/settings/internet_page/internet_page.js
@@ -275,6 +275,22 @@ Polymer({
     return this.i18n('OncType' + this.subpageType_);
   },
 
+  /**
+   * @param {string} subpageType
+   * @param {!Object<!CrOnc.DeviceStateProperties>|undefined} deviceStates
+   * @return {!CrOnc.DeviceStateProperties|undefined}
+   * @private
+   */
+  getDeviceState_: function(subpageType, deviceStates) {
+    // If both Tether and Cellular are enabled, use the Cellular device state
+    // when directly navigating to the Tether page.
+    if (subpageType == CrOnc.Type.TETHER &&
+        this.deviceStates[CrOnc.Type.CELLULAR]) {
+      subpageType = CrOnc.Type.CELLULAR;
+    }
+    return deviceStates[subpageType];
+  },
+
   /**
    * @param {!{detail: {type: string}}} event
    * @private