Settings Router Refactor: Replace route.subpage usage with route.path

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

 // Copyright 2016 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.
 
 /**
  * Calls |readyTest| repeatedly until it returns true, then calls
  * |readyCallback|.
  * @param {function():boolean} readyTest
  * @param {!Function} readyCallback
  */
@@ skipping 21 matching lines @@
   /** @override */
   attached: function() {
     if (this.domHost && this.domHost.parentNode.tagName == 'PAPER-HEADER-PANEL')
       this.scroller = this.domHost.parentNode.scroller;
     else
       this.scroller = document.body; // Used in unit tests.
   },
 
   /**
    * @param {!settings.Route} newRoute
-   * @param {!settings.Route} oldRoute
+   * @param {settings.Route} oldRoute
    */
   currentRouteChanged: function(newRoute, oldRoute) {
     // Allow the page to load before expanding the section. TODO(michaelpg):
     // Time this better when refactoring settings-animated-pages.
-    if (!oldRoute && newRoute.subpage.length)
+    if (!oldRoute && newRoute.isSubpage())
       setTimeout(this.tryTransitionToSection_.bind(this));
     else
       this.tryTransitionToSection_();
   },
 
   /**
    * If possible, transitions to the current route's section (by expanding or
    * scrolling to it). If another transition is running, finishes or cancels
    * that one, then schedules this function again. This ensures the current
    * section is quickly shown, without getting the page into a broken state --
@@ skipping 10 matching lines @@
       // Either way, this function will be called again once the current
       // animation ends.
       return;
     }
 
     var promise;
     var expandedSection = /** @type {?SettingsSectionElement} */(
         this.$$('settings-section.expanded'));
     if (expandedSection) {
       // If the section shouldn't be expanded, collapse it.
-      if (!currentRoute.subpage.length || expandedSection != currentSection) {
+      if (!currentRoute.isSubpage() || expandedSection != currentSection) {
         promise = this.collapseSection_(expandedSection);
         // Scroll to the collapsed section. TODO(michaelpg): This can look weird
         // because the collapse we just scheduled calculated its end target
         // based on the current scroll position. This bug existed before, and is
         // fixed in the next patch by making the card position: absolute.
         if (currentSection)
           this.scrollToSection_();
       }
     } else if (currentSection) {
       // Expand the section into a subpage or scroll to it on the main page.
-      if (currentRoute.subpage.length)
+      if (currentRoute.isSubpage())
         promise = this.expandSection_(currentSection);
       else
         this.scrollToSection_();
     }
 
     // When this animation ends, another may be necessary. Call this function
     // again after the promise resolves.
     if (promise)
       promise.then(this.tryTransitionToSection_.bind(this));
   },
 
   /**
    * If the current animation is inconsistent with the current route, stops the
    * animation by finishing or canceling it so the new route can be animated to.
    * @private
    */
   maybeStopCurrentAnimation_: function() {
     var currentRoute = settings.getCurrentRoute();
     var animatingSection = /** @type {?SettingsSectionElement} */(
         this.$$('settings-section.expanding, settings-section.collapsing'));
     assert(animatingSection);
 
     if (animatingSection.classList.contains('expanding')) {
       // Cancel the animation to go back to the main page if the animating
       // section shouldn't be expanded.
       if (animatingSection.section != currentRoute.section ||
-          !currentRoute.subpage.length) {
+          !currentRoute.isSubpage()) {
         this.currentAnimation_.cancel();
       }
       // Otherwise, let the expand animation continue.
       return;
     }
 
     assert(animatingSection.classList.contains('collapsing'));
-    if (!currentRoute.subpage.length)
+    if (!currentRoute.isSubpage())
       return;
 
     // If the collapsing section actually matches the current route's section,
     // we can just cancel the animation to re-expand the section.
     if (animatingSection.section == currentRoute.section) {
       this.currentAnimation_.cancel();
       return;
     }
 
     // The current route is a subpage, so that section needs to expand.
@@ skipping 127 matching lines @@
       this.scroller.style.width = 'calc(100% - ' + scrollbarWidth + 'px)';
     }
   }
 };
 
 /** @polymerBehavior */
 var MainPageBehavior = [
   settings.RouteObserverBehavior,
   MainPageBehaviorImpl,
 ];