Revert of MD Settings: Elim SettingsSubpageBrowsertest and SettingsPageVisibility

chrome/browser/resources/settings/basic_page/basic_page.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'settings-basic-page' is the settings page containing the actual settings.
  */
 Polymer({
   is: 'settings-basic-page',
 
-  behaviors: [MainPageBehavior],
+  behaviors: [SettingsPageVisibility, MainPageBehavior],
 
   properties: {
     /** Preferences state. */
     prefs: {
       type: Object,
       notify: true,
     },
 
+    showAndroidApps: Boolean,
+
     /**
-     * Dictionary defining page visibility. Controlled by settings-ui.
-     * @type {!PageVisibility|undefined}
+     * Dictionary defining page visibility.
+     * @type {!GuestModePageVisibility}
      */
     pageVisibility: Object,
 
     advancedToggleExpanded: {
       type: Boolean,
       notify: true,
       observer: 'advancedToggleExpandedChanged_',
     },
 
     /**
@@ skipping 91 matching lines @@
         didFindMatches: requests.every(function(r) {
           return !r.didFindMatches();
         }),
         // All requests correspond to the same user query, so only need to check
         // one of them.
         wasClearSearch: requests[0].isSame(''),
       };
     });
   },
 
-  /**
-   * @param {boolean|undefined} visibility
-   * @return {boolean}
-   * @private
-   */
-  showPage_: function(visibility) {
-    return visibility !== false;
-  },
-
-  /**
-   * @param {string} subpage
-   * @return {!Object}
-   */
-  getPageVisibility_: function(subpage) {
-    return /** @type {Object} */ (this.get(subpage, this.pageVisibility)) || {};
-  },
-
 // <if expr="chromeos">
   /**
    * @return {boolean}
    * @private
    */
   computeShowSecondaryUserBanner_: function() {
     return !this.hasExpandedSection_ &&
         loadTimeData.getBoolean('isSecondaryUser');
   },
 // </if>
 
   /** @private */
   onResetProfileBannerClosed_: function() {
     this.showResetProfileBanner_ = false;
   },
 
   /**
+   * @return {boolean}
+   * @private
+   */
+  shouldShowAndroidApps_: function() {
+    var visibility = /** @type {boolean|undefined} */ (
+        this.get('pageVisibility.androidApps'));
+    return this.showAndroidApps && this.showPage(visibility);
+  },
+
+  /**
    * Hides everything but the newly expanded subpage.
    * @private
    */
   onSubpageExpanded_: function() {
     this.hasExpandedSection_ = true;
   },
 
   /**
    * Render the advanced page now (don't wait for idle).
    * @private
@@ skipping 38 matching lines @@
    * @private
    */
   showAdvancedPage_: function(
       currentRoute, inSearchMode, hasExpandedSection, advancedToggleExpanded) {
     return hasExpandedSection ?
         settings.Route.ADVANCED.contains(currentRoute) :
         advancedToggleExpanded || inSearchMode;
   },
 
   /**
+   * @param {(boolean|undefined)} visibility
+   * @return {boolean} True unless visibility is false.
+   * @private
+   */
+  showAdvancedSettings_: function(visibility) {
+    return visibility !== false;
+  },
+
+  /**
    * @param {boolean} opened Whether the menu is expanded.
    * @return {string} Icon name.
    * @private
    */
   getArrowIcon_: function(opened) {
     return opened ? 'cr:arrow-drop-up' : 'cr:arrow-drop-down';
   },
 });