Settings Router Refactor: Remove route.page legacy property.

chrome/browser/resources/settings/route.js

Index: chrome/browser/resources/settings/route.js
diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js
index f1c092c41f7f65a0731888d4f9052e401701f3b2..c3a73c0a63491c1b03d935db8dc49e7db4e38b8b 100644
--- a/chrome/browser/resources/settings/route.js
+++ b/chrome/browser/resources/settings/route.js
@@ -17,7 +17,6 @@ cr.define('settings', function() {
 
     // Below are all legacy properties to provide compatibility with the old
     // routing system. TODO(tommycli): Remove once routing refactor complete.
-    this.page = '';
     this.section = '';
     /** @type {!Array<string>} */ this.subpage = [];
   };
@@ -40,7 +39,6 @@ cr.define('settings', function() {
 
       var route = new Route(newUrl);
       route.parent = this;
-      route.page = this.page;
       route.section = this.section;
       route.subpage = this.subpage.slice();  // Shallow copy.
 
@@ -78,11 +76,14 @@ cr.define('settings', function() {
     },
 
     /**
-     * Returns true if this route is a descendant of the parameter.
+     * Returns true if this route matches or is a descendant of the parameter.
      * @param {!settings.Route} route
      * @return {boolean}
      */
-    isDescendantOf: function(route) {
+    inSubtreeOf: function(route) {

[michaelpg, 2016/07/28 23:22:32]

bikeshedding: kind of a confusing name and concept. *generally* subtree means
"strict subtree". combining isDescendantOf and == is kinda awkward, IMO: this
function is used for two entirely different mutually exclusive reasons in the
app (checking the root) and the tests (checking the parent chain). see comments
below about .root.

[tommycli, 2016/07/29 00:03:35]

It's a confusing name. I changed it to isEqualOrInSubtreeOf.

I found it a useful concept since we need to check exactly this in settings_main
and settings_menu. Though for section expansion, we actually need to check
inStrictSubtreeOf, so that's kind of unfortunate...

I didn't want to do .root, because we also need to do this operation for
.section, and I wanted to consolidate those two concepts with the tree
structure.

Still open to more suggestions - I realize this is kind of confusing.

[michaelpg, 2016/07/29 00:21:11]

Like, that's my point: every use in this CL could be replaced by a function
"isRoot()", so why muddle things.
how about isEqualOrDescendantOf? maybe it's just me, but I have to translate
"subtree" in my head to "descendant of" because to me, the subtree of this route
means this route and *its* descendants.

+      if (this == route)
+        return true;
+
       for (var parent = this.parent; parent != null; parent = parent.parent) {
         if (route == parent)
           return true;
@@ -97,11 +98,8 @@ cr.define('settings', function() {
 
   // Root pages.
   r.BASIC = new Route('/');
-  r.BASIC.page = 'basic';
   r.ADVANCED = new Route('/advanced');
-  r.ADVANCED.page = 'advanced';
   r.ABOUT = new Route('/help');
-  r.ABOUT.page = 'about';
 
 <if expr="chromeos">
   r.INTERNET = r.BASIC.createSection('/internet', 'internet');