MD Settings: Elim SettingsSubpageBrowsertest and SettingsPageVisibility

chrome/browser/resources/settings/basic_page/basic_page.html

Index: chrome/browser/resources/settings/basic_page/basic_page.html
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
index 206c4b053f0ee2745705d5bab10062497592dc8b..fa5328f5e3b7d4956045d9a150a623f58301737c 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -6,7 +6,6 @@
 <link rel="import" href="../reset_page/reset_profile_banner.html">
 <link rel="import" href="../search_page/search_page.html">
 <link rel="import" href="../settings_page/main_page_behavior.html">
-<link rel="import" href="../settings_page/settings_page_visibility.html">
 <link rel="import" href="../settings_page/settings_section.html">
 <link rel="import" href="../settings_page_css.html">
 <link rel="import" href="../settings_vars_css.html">
@@ -97,7 +96,7 @@
         </div>
 </if>
 <if expr="chromeos">
-        <template is="dom-if" if="[[showPage(pageVisibility.internet)]]"
+        <template is="dom-if" if="[[showPage_(pageVisibility.internet)]]"
             restamp>
           <settings-section page-title="$i18n{internetPageTitle}"
               section="internet">
@@ -105,7 +104,7 @@
             </settings-internet-page>
           </settings-section>
         </template>
-        <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]"
+        <template is="dom-if" if="[[showPage_(pageVisibility.bluetooth)]]"
             restamp>
           <settings-section page-title="$i18n{bluetoothPageTitle}"
               section="bluetooth">
@@ -114,38 +113,37 @@
           </settings-section>
         </template>
 </if>
-        <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
+        <template is="dom-if" if="[[showPage_(pageVisibility.people)]]" restamp>
           <settings-section page-title="$i18n{peoplePageTitle}"
               section="people">
             <settings-people-page prefs="{{prefs}}"></settings-people-page>
           </settings-section>
         </template>
-        <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]"
+        <template is="dom-if" if="[[showPage_(pageVisibility.appearance)]]"
             restamp>
           <settings-section page-title="$i18n{appearancePageTitle}"
               section="appearance">
             <settings-appearance-page prefs="{{prefs}}"
-                page-visibility="[[pageVisibility.appearance]]">
+                page-visibility="[[getPageVisibility_('appearance')]]">
             </settings-appearance-page>
           </settings-section>
         </template>
 <if expr="chromeos">
-        <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
+        <template is="dom-if" if="[[showPage_(pageVisibility.device)]]" restamp>
           <settings-section page-title="$i18n{devicePageTitle}"
               section="device">
             <settings-device-page prefs="{{prefs}}"></settings-device-page>
           </settings-section>
         </template>
 </if>
-        <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
+        <template is="dom-if" if="[[showPage_(pageVisibility.search)]]" restamp>
           <settings-section page-title="$i18n{searchPageTitle}"
               section="search">
             <settings-search-page prefs="{{prefs}}"></settings-search-page>
           </settings-section>
         </template>
 <if expr="chromeos">
-        <template is="dom-if"
-            if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]"
+         <template is="dom-if" if="[[showPage_(pageVisibility.androidApps)]]"
             restamp>
           <settings-section page-title="$i18n{androidAppsPageTitle}"
               section="androidApps">
@@ -155,7 +153,7 @@
         </template>
 </if>
 <if expr="not chromeos">
-        <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
+        <template is="dom-if" if="[[showPage_(pageVisibility.defaultBrowser)]]"
             restamp>
           <settings-section page-title="$i18n{defaultBrowser}"
               section="defaultBrowser">
@@ -163,7 +161,7 @@
           </settings-section>
         </template>
 </if>
-        <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]"
+        <template is="dom-if" if="[[showPage_(pageVisibility.onStartup)]]"
             restamp>
           <settings-section page-title="$i18n{onStartup}" section="onStartup">
             <settings-on-startup-page prefs="{{prefs}}">
@@ -173,7 +171,7 @@
       </div>
     </template>
 
-    <template is="dom-if" if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
+    <template is="dom-if" if="[[showPage_(pageVisibility.advancedSettings)]]">
       <template is="dom-if" if="[[showAdvancedToggle_(
           inSearchMode, hasExpandedSection_)]]">
         <div id="toggleSpacer"></div>
@@ -193,7 +191,7 @@
             currentRoute_, inSearchMode, hasExpandedSection_,
             advancedToggleExpanded)]]">
 <if expr="chromeos">
-          <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.dateTime)]]"
               restamp>
             <settings-section page-title="$i18n{dateTimePageTitle}"
                 section="dateTime">
@@ -203,17 +201,17 @@
             </settings-section>
           </template>
 </if>
-          <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.privacy)]]"
               restamp>
             <settings-section page-title="$i18n{privacyPageTitle}"
                 section="privacy">
               <settings-privacy-page prefs="{{prefs}}"
-                  page-visibility="[[pageVisibility.privacy]]">
+                  page-visibility="[[getPageVisibility_('privacy')]]">
               </settings-privacy-page>
             </settings-section>
           </template>
           <template is="dom-if"
-              if="[[showPage(pageVisibility.passwordsAndForms)]]" restamp>
+              if="[[showPage_(pageVisibility.passwordsAndForms)]]" restamp>
             <settings-section
                 page-title="$i18n{passwordsAndAutofillPageTitle}"
                 section="passwordsAndForms">
@@ -221,7 +219,7 @@
               </settings-passwords-and-forms-page>
             </settings-section>
           </template>
-          <template is="dom-if" if="[[showPage(pageVisibility.languages)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.languages)]]"
               restamp>
             <settings-section page-title="$i18n{languagesPageTitle}"
                 section="languages">
@@ -229,16 +227,16 @@
               </settings-languages-page>
             </settings-section>
           </template>
-          <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]"
               restamp>
             <settings-section page-title="$i18n{downloadsPageTitle}"
                 section="downloads">
               <settings-downloads-page prefs="{{prefs}}"
-                  page-visibility="[[pageVisibility.downloads]]">
+                  page-visibility="[[getPageVisibility_('downloads')]]">
               </settings-downloads-page>
             </settings-section>
           </template>
-          <template is="dom-if" if="[[showPage(pageVisibility.printing)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.printing)]]"
               restamp>
             <settings-section page-title="$i18n{printingPageTitle}"
                 section="printing">
@@ -246,13 +244,13 @@
               </settings-printing-page>
             </settings-section>
           </template>
-          <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp>
+          <template is="dom-if" if="[[showPage_(pageVisibility.a11y)]]" restamp>
             <settings-section page-title="$i18n{a11yPageTitle}" section="a11y">
               <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page>
             </settings-section>
           </template>
 <if expr="not chromeos">
-          <template is="dom-if" if="[[showPage(pageVisibility.system)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.system)]]"
               restamp>
             <settings-section page-title="$i18n{systemPageTitle}"
                 section="system">
@@ -260,7 +258,7 @@
             </settings-section>
           </template>
 </if>
-          <template is="dom-if" if="[[showPage(pageVisibility.reset)]]"
+          <template is="dom-if" if="[[showPage_(pageVisibility.reset)]]"
               restamp>
             <settings-section page-title="$i18n{resetPageTitle}"
                 section="reset">