Revert "[CrOS setting] Move OS routes into os_settings_routes.js"

This reverts commit e3e24fb5.

Reason for revert: <INSERT REASONING HERE>
Tree is close because of this CL:
https://ci.chromium.org/p/chromium/builders/ci/linux-archive-rel/24482?blamelist=1#blamelist-tab

Original change's description:
> [CrOS setting] Move OS routes into os_settings_routes.js
> 
> Before this CL, routes for both browser and OS where in routes.js file.
> This CL removes routes for chromeOS to a new file os_settings_routes.js
> also updates references to SettingsRoutes to OSSettingsRoutes in all
> chromeOS files.
> 
> Fixed:967861
> 
> Change-Id: Ib3aea093fad90188699e7325632dc93610336f99
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090794
> Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
> Cr-Commit-Position: refs/heads/master@{#751587}

TBR=khorimoto@chromium.org,rbpotter@chromium.org,hsuregan@chromium.org,tjohnsonkanu@google.com

Change-Id: I58359fa710ace42d2dc3c184d080263df8de1f51
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108452Reviewed-by: Nancy Wang <nancylingwang@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751591}

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -71,7 +71,6 @@ group("closure_compile") {
     ":metrics_recorder",
     ":os_page_visibility",
     ":os_route",
-    ":os_settings_routes",
     ":route_origin_behavior",
     "bluetooth_page:closure_compile",
     "crostini_page:closure_compile",
@@ -110,15 +109,8 @@ js_library("os_page_visibility") {
 
 js_library("os_route") {
   deps = [
-    ":os_settings_routes",
     "..:router",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
-js_library("os_settings_routes") {
-  deps = [
+    "..:settings_routes",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:load_time_data",
   ]

chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn

@@ -83,7 +83,7 @@ js_library("multidevice_smartlock_subpage") {
     ":multidevice_feature_behavior",
     "..:metrics_recorder",
     "..:os_route",
-    "..:os_settings_routes",
+    "../..:settings_routes",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
     "//ui/webui/resources/js:cr",
@@ -95,7 +95,7 @@ js_library("multidevice_subpage") {
     ":multidevice_constants",
     ":multidevice_feature_behavior",
     "..:os_route",
-    "..:os_settings_routes",
+    "../..:settings_routes",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
   ]
   externs_list = [ "$externs_path/networking_private.js" ]
@@ -106,7 +106,7 @@ js_library("multidevice_tether_item") {
   deps = [
     ":multidevice_feature_behavior",
     "..:os_route",
-    "..:os_settings_routes",
+    "../..:settings_routes",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
   ]

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_subpage.js

@@ -27,7 +27,7 @@ Polymer({
   ],
 
   properties: {
-    /** @type {?OsSettingsRoutes} */
+    /** @type {?SettingsRoutes} */
     routes: {
       type: Object,
       value: settings.routes,

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js

@@ -15,7 +15,7 @@ Polymer({
   properties: {
     /**
      * Alias for allowing Polymer bindings to settings.routes.
-     * @type {?OsSettingsRoutes}
+     * @type {?SettingsRoutes}
      */
     routes: {
       type: Object,

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js

@@ -36,7 +36,7 @@ Polymer({
 
     /**
      * Alias for allowing Polymer bindings to settings.routes.
-     * @type {?OsSettingsRoutes}
+     * @type {?SettingsRoutes}
      */
     routes: {
       type: Object,

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js

@@ -202,6 +202,7 @@ Polymer({
     this.addFocusConfig_(
         r.MANAGE_SWITCH_ACCESS_SETTINGS, '#switchAccessSubpageButton');
     this.addFocusConfig_(r.DISPLAY, '#displaySubpageButton');
+    this.addFocusConfig_(r.APPEARANCE, '#appearanceSubpageButton');
     this.addFocusConfig_(r.KEYBOARD, '#keyboardSubpageButton');
     this.addFocusConfig_(r.POINTERS, '#pointerSubpageButton');
   },

chrome/browser/resources/settings/chromeos/os_route.js

@@ -5,10 +5,10 @@
 cr.define('settings', function() {
   /**
    * Creates Route objects for each path corresponding to CrOS settings content.
-   * @return {!OsSettingsRoutes}
+   * @return {!SettingsRoutes}
    */
   function createOSSettingsRoutes() {
-    const r = /** @type {!OsSettingsRoutes} */ ({});
+    const r = /** @type {!SettingsRoutes} */ ({});
 
     // Root pages.
     r.BASIC = new settings.Route('/');
@@ -189,7 +189,7 @@ cr.define('settings', function() {
 
   // TODO(dpapad): Change to 'get routes() {}' in export when we fix a bug in
   // ChromePass that limits the syntax of what can be returned from cr.define().
-  const routes = /** @type {!OsSettingsRoutes} */ (
+  const routes = /** @type {!SettingsRoutes} */ (
       settings.Router.getInstance().getRoutes());
 
   return {

chrome/browser/resources/settings/chromeos/os_settings_routes.js

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * Specifies all possible os routes in settings.
- *
- * @typedef {{
- *   ABOUT: !settings.Route,
- *   ABOUT_ABOUT: !settings.Route,
- *   ACCESSIBILITY: !settings.Route,
- *   ACCOUNTS: !settings.Route,
- *   ACCOUNT_MANAGER: !settings.Route,
- *   ADVANCED: !settings.Route,
- *   APP_MANAGEMENT: !settings.Route,
- *   APP_MANAGEMENT_DETAIL: !settings.Route,
- *   APPS: !settings.Route,
- *   ANDROID_APPS_DETAILS: !settings.Route,
- *   CROSTINI: !settings.Route,
- *   CROSTINI_ANDROID_ADB: !settings.Route,
- *   CROSTINI_DETAILS: !settings.Route,
- *   CROSTINI_DISK_RESIZE: !settings.Route,
- *   CROSTINI_EXPORT_IMPORT: !settings.Route,
- *   CROSTINI_SHARED_PATHS: !settings.Route,
- *   CROSTINI_SHARED_USB_DEVICES: !settings.Route,
- *   BASIC: !settings.Route,
- *   BLUETOOTH: !settings.Route,
- *   BLUETOOTH_DEVICES: !settings.Route,
- *   CHANGE_PICTURE: !settings.Route,
- *   CUPS_PRINTERS: !settings.Route,
- *   DATETIME: !settings.Route,
- *   DATETIME_TIMEZONE_SUBPAGE: !settings.Route,
- *   DETAILED_BUILD_INFO: !settings.Route,
- *   DEVICE: !settings.Route,
- *   DISPLAY: !settings.Route,
- *   EXTERNAL_STORAGE_PREFERENCES: !settings.Route,
- *   FINGERPRINT: !settings.Route,
- *   FILES: !settings.Route,
- *   GOOGLE_ASSISTANT: !settings.Route,
- *   INPUT_METHODS: !settings.Route,
- *   INTERNET: !settings.Route,
- *   INTERNET_NETWORKS: !settings.Route,
- *   KERBEROS_ACCOUNTS: !settings.Route,
- *   KEYBOARD: !settings.Route,
- *   KNOWN_NETWORKS: !settings.Route,
- *   LANGUAGES: !settings.Route,
- *   LANGUAGES_DETAILS: !settings.Route,
- *   LOCK_SCREEN: !settings.Route,
- *   MANAGE_ACCESSIBILITY: !settings.Route,
- *   MANAGE_CAPTION_SETTINGS: !settings.Route,
- *   MANAGE_SWITCH_ACCESS_SETTINGS: !settings.Route,
- *   MANAGE_TTS_SETTINGS: !settings.Route,
- *   MULTIDEVICE: !settings.Route,
- *   MULTIDEVICE_FEATURES: !settings.Route,
- *   NETWORK_DETAIL: !settings.Route,
- *   OS_SYNC: !settings.Route,
- *   PEOPLE: !settings.Route,
- *   PERSONALIZATION: !settings.Route,
- *   PLUGIN_VM: !settings.Route,
- *   PLUGIN_VM_DETAILS: !settings.Route,
- *   PLUGIN_VM_SHARED_PATHS: !settings.Route,
- *   POINTERS: !settings.Route,
- *   POWER: !settings.Route,
- *   PRINTING: !settings.Route,
- *   PRIVACY: !settings.Route,
- *   RESET: !settings.Route,
- *   SEARCH: !settings.Route,
- *   SIGN_OUT: !settings.Route,
- *   SMART_LOCK: !settings.Route,
- *   SMB_SHARES: !settings.Route,
- *   STORAGE: !settings.Route,
- *   STYLUS: !settings.Route,
- *   SYNC: !settings.Route,
- *   SYNC_ADVANCED: !settings.Route,
- * }}
- */
-/* #export */ let OsSettingsRoutes;
\ No newline at end of file

chrome/browser/resources/settings/router.js

@@ -11,7 +11,6 @@ cr.define('settings', function() {
    * @typedef {{
    *   BASIC: !settings.Route,
    *   ADVANCED: !settings.Route,
-   *   ABOUT: !settings.Route,
    * }}
    */
   /* #export */ let MinimumRoutes;

chrome/browser/resources/settings/settings_page/BUILD.gn

@@ -20,6 +20,7 @@ js_library("main_page_behavior") {
   deps = [
     ":settings_section",
     "..:router",
+    "..:settings_routes",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:util",
   ]
@@ -66,6 +67,7 @@ js_library("main_page_behavior.m") {
   deps = [
     ":settings_section.m",
     "..:router.m",
+    "..:settings_routes.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:util.m",

chrome/browser/resources/settings/settings_page/main_page_behavior.js

@@ -6,7 +6,8 @@
 // #import {assert} from 'chrome://resources/js/assert.m.js';
 // #import {beforeNextRender} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {ensureLazyLoaded} from '../ensure_lazy_loaded.m.js';
-// #import {Route, Router, MinimumRoutes} from '../router.m.js';
+// #import {Route, Router} from '../router.m.js';
+// #import {SettingsRoutes} from '../settings_routes.m.js';
 // clang-format on
 
 cr.define('settings', function() {
@@ -37,7 +38,7 @@ cr.define('settings', function() {
     if (!route) {
       return RouteState.INITIAL;
     }
-    const routes = /** @type {!settings.MinimumRoutes} */ (
+    const routes = /** @type {!SettingsRoutes} */ (
         settings.Router.getInstance().getRoutes());
     if (route === routes.BASIC || route === routes.ABOUT) {
       return RouteState.TOP_LEVEL;
@@ -145,7 +146,7 @@ cr.define('settings', function() {
      * @private
      */
     shouldExpandAdvanced_(route) {
-      const routes = /** @type {!settings.MinimumRoutes} */ (
+      const routes = /** @type {!SettingsRoutes} */ (
           settings.Router.getInstance().getRoutes());
       return (
                  this.tagName == 'SETTINGS-BASIC-PAGE'

chrome/browser/resources/settings/settings_routes.js

@@ -9,29 +9,80 @@
  *
  * @typedef {{
  *   ABOUT: !settings.Route,
+ *   ABOUT_ABOUT: !settings.Route,
  *   ACCESSIBILITY: !settings.Route,
+ *   ACCOUNTS: !settings.Route,
+ *   ACCOUNT_MANAGER: !settings.Route,
  *   ADVANCED: !settings.Route,
  *   ADDRESSES: !settings.Route,
+ *   APP_MANAGEMENT: !settings.Route,
+ *   APP_MANAGEMENT_DETAIL: !settings.Route,
+ *   APPS: !settings.Route,
+ *   ANDROID_APPS: !settings.Route,
+ *   ANDROID_APPS_DETAILS: !settings.Route,
+ *   CROSTINI: !settings.Route,
+ *   CROSTINI_ANDROID_ADB: !settings.Route,
+ *   CROSTINI_DETAILS: !settings.Route,
+ *   CROSTINI_DISK_RESIZE: !settings.Route,
+ *   CROSTINI_EXPORT_IMPORT: !settings.Route,
+ *   CROSTINI_SHARED_PATHS: !settings.Route,
+ *   CROSTINI_SHARED_USB_DEVICES: !settings.Route,
  *   APPEARANCE: !settings.Route,
  *   AUTOFILL: !settings.Route,
  *   BASIC: !settings.Route,
+ *   BLUETOOTH: !settings.Route,
+ *   BLUETOOTH_DEVICES: !settings.Route,
  *   CAPTIONS: !settings.Route,
  *   CERTIFICATES: !settings.Route,
+ *   CHANGE_PICTURE: !settings.Route,
  *   CHECK_PASSWORDS: !settings.Route,
  *   CHROME_CLEANUP: !settings.Route,
  *   CLEAR_BROWSER_DATA: !settings.Route,
  *   CLOUD_PRINTERS: !settings.Route,
+ *   CUPS_PRINTERS: !settings.Route,
+ *   DATETIME: !settings.Route,
+ *   DATETIME_TIMEZONE_SUBPAGE: !settings.Route,
  *   DEFAULT_BROWSER: !settings.Route,
+ *   DETAILED_BUILD_INFO: !settings.Route,
+ *   DEVICE: !settings.Route,
+ *   DISPLAY: !settings.Route,
  *   DOWNLOADS: !settings.Route,
  *   EDIT_DICTIONARY: !settings.Route,
+ *   EXTERNAL_STORAGE_PREFERENCES: !settings.Route,
+ *   FINGERPRINT: !settings.Route,
+ *   FILES: !settings.Route,
  *   FONTS: !settings.Route,
+ *   GOOGLE_ASSISTANT: !settings.Route,
  *   IMPORT_DATA: !settings.Route,
  *   INCOMPATIBLE_APPLICATIONS: !settings.Route,
+ *   INPUT_METHODS: !settings.Route,
+ *   INTERNET: !settings.Route,
+ *   INTERNET_NETWORKS: !settings.Route,
+ *   KERBEROS_ACCOUNTS: !settings.Route,
+ *   KEYBOARD: !settings.Route,
+ *   KNOWN_NETWORKS: !settings.Route,
  *   LANGUAGES: !settings.Route,
+ *   LANGUAGES_DETAILS: !settings.Route,
+ *   LOCK_SCREEN: !settings.Route,
+ *   MANAGE_ACCESSIBILITY: !settings.Route,
+ *   MANAGE_CAPTION_SETTINGS: !settings.Route,
+ *   MANAGE_PROFILE: !settings.Route,
+ *   MANAGE_SWITCH_ACCESS_SETTINGS: !settings.Route,
+ *   MANAGE_TTS_SETTINGS: !settings.Route,
+ *   MULTIDEVICE: !settings.Route,
+ *   MULTIDEVICE_FEATURES: !settings.Route,
+ *   NETWORK_DETAIL: !settings.Route,
  *   ON_STARTUP: !settings.Route,
+ *   OS_SYNC: !settings.Route,
  *   PASSWORDS: !settings.Route,
  *   PAYMENTS: !settings.Route,
  *   PEOPLE: !settings.Route,
+ *   PERSONALIZATION: !settings.Route,
+ *   PLUGIN_VM: !settings.Route,
+ *   PLUGIN_VM_DETAILS: !settings.Route,
+ *   PLUGIN_VM_SHARED_PATHS: !settings.Route,
+ *   POINTERS: !settings.Route,
+ *   POWER: !settings.Route,
  *   PRINTING: !settings.Route,
  *   PRIVACY: !settings.Route,
  *   RESET: !settings.Route,
@@ -75,6 +126,10 @@
  *   SITE_SETTINGS_USB_DEVICES: !settings.Route,
  *   SITE_SETTINGS_SERIAL_PORTS: !settings.Route,
  *   SITE_SETTINGS_ZOOM_LEVELS: !settings.Route,
+ *   SMART_LOCK: !settings.Route,
+ *   SMB_SHARES: !settings.Route,
+ *   STORAGE: !settings.Route,
+ *   STYLUS: !settings.Route,
  *   SYNC: !settings.Route,
  *   SYNC_ADVANCED: !settings.Route,
  *   SYSTEM: !settings.Route,