Revert of MD Settings: Elim SettingsSubpageBrowsertest and SettingsPageVisibility

chrome/browser/resources/settings/settings_menu/settings_menu.html

Index: chrome/browser/resources/settings/settings_menu/settings_menu.html
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
index b0fa5179e9278b4f3e96b11c376121f9457b81b8..cc6fb7cedb56c965324d9427e6b873859f4c31ad 100644
--- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -91,12 +91,11 @@
         $i18n{bluetoothPageTitle}
       </a>
 </if>
-      <a id="people" href="/people"
-          hidden="[[!showPage_(pageVisibility.people)]]">
+      <a id="people" href="/people" hidden="[[!pageVisibility.people]]">
         <iron-icon icon="cr:person"></iron-icon>
         $i18n{peoplePageTitle}
       </a>
-      <a href="/appearance" hidden="[[!showPage_(pageVisibility.appearance)]]">
+      <a href="/appearance" hidden="[[!pageVisibility.appearance]]">
         <iron-icon icon="settings:palette"></iron-icon>
         $i18n{appearancePageTitle}
       </a>
@@ -111,31 +110,29 @@
         $i18n{searchPageTitle}
       </a>
 <if expr="chromeos">
-      <a href="/androidApps"
-          hidden="[[!showPage_(pageVisibility.androidApps)]]">
+      <a href="/androidApps" hidden="[[!showAndroidApps]]">
         <iron-icon icon="settings:android"></iron-icon>
         $i18n{androidAppsPageTitle}
       </a>
 </if>
 <if expr="not chromeos">
-      <a href="/defaultBrowser"
-          hidden="[[!showPage_(pageVisibility.defaultBrowser)]]">
+      <a href="/defaultBrowser" hidden="[[!pageVisibility.defaultBrowser]]">
         <iron-icon icon="settings:web"></iron-icon>
         $i18n{defaultBrowser}
       </a>
 </if>
-      <a href="/onStartup" hidden="[[!showPage_(pageVisibility.onStartup)]]">
+      <a href="/onStartup" hidden="[[!pageVisibility.onStartup]]">
         <iron-icon icon="settings:power-settings-new"></iron-icon>
         $i18n{onStartup}
       </a>
       <paper-button toggles id="advancedButton"
           aria-active-attribute="aria-expanded" active="{{advancedOpened}}"
-          hidden="[[!showPage_(pageVisibility.advancedSettings)]]">
+          hidden="[[!pageVisibility.advancedSettings]]">
         <span>$i18n{advancedPageTitle}</span>
         <iron-icon icon="[[arrowState_(advancedOpened)]]">
         </iron-icon></paper-button>
       <iron-collapse id="advancedSubmenu" opened="[[advancedOpened]]"
-          hidden="[[!showPage_(pageVisibility.advancedSettings)]]">
+          hidden="[[!pageVisibility.advancedSettings]]">
         <iron-selector id="subMenu" selectable="a" attr-for-selected="href">
 <if expr="chromeos">
           <a href="/dateTime">
@@ -148,7 +145,7 @@
             $i18n{privacyPageTitle}
           </a>
           <a href="/passwordsAndForms"
-              hidden="[[!showPage_(pageVisibility.passwordsAndForms)]]">
+              hidden="[[!pageVisibility.passwordsAndForms]]">
             <iron-icon icon="settings:assignment"></iron-icon>
             $i18n{passwordsAndAutofillPageTitle}
           </a>
@@ -174,7 +171,7 @@
             $i18n{systemPageTitle}
           </a>
 </if>
-          <a href="/reset" hidden="[[!showPage_(pageVisibility.reset)]]">
+          <a href="/reset" hidden="[[!pageVisibility.reset]]">
             <iron-icon icon="settings:restore"></iron-icon>
             $i18n{resetPageTitle}
           </a>