Settings Router Refactor: Migrate canonical route list to new-style.

chrome/test/data/webui/settings/route_tests.js

Index: chrome/test/data/webui/settings/route_tests.js
diff --git a/chrome/test/data/webui/settings/route_tests.js b/chrome/test/data/webui/settings/route_tests.js
index 728ddfe9f94f674d388c7614c7aa120f3d791283..b74e293663b5046ce6059a8640b792351852c0b9 100644
--- a/chrome/test/data/webui/settings/route_tests.js
+++ b/chrome/test/data/webui/settings/route_tests.js
@@ -23,7 +23,8 @@ suite('route', function() {
 
     // Test a subpage route.
     var SITE_SETTINGS = PRIVACY.createChild('/siteSettings', 'site-settings');
-    assertFalse(SITE_SETTINGS.dialog);
+    assertEquals('/siteSettings', SITE_SETTINGS.url);
+    assertFalse(!!SITE_SETTINGS.dialog);
     assertDeepEquals(['site-settings'], SITE_SETTINGS.subpage);
     assertEquals('advanced', SITE_SETTINGS.page);
     assertEquals('privacy', SITE_SETTINGS.section);
@@ -33,12 +34,14 @@ suite('route', function() {
 
     // Test a sub-subpage route.
     var SITE_SETTINGS_ALL =
-        SITE_SETTINGS.createChild('/siteSettings/all', 'all-sites');
+        SITE_SETTINGS.createChild('all', 'all-sites');
+    assertEquals('/siteSettings/all', SITE_SETTINGS_ALL.url);
     assertDeepEquals(['site-settings', 'all-sites'], SITE_SETTINGS_ALL.subpage);
 
     // Test a dialog route.
-    var CLEAR_BROWSING_DATA = PRIVACY.createDialog('/clearBrowsingData');
-    assertTrue(CLEAR_BROWSING_DATA.dialog);
+    var CLEAR_BROWSING_DATA =
+        PRIVACY.createDialog('/clearBrowsingData', 'clear-browsing-data');
+    assertEquals('clear-browsing-data', CLEAR_BROWSING_DATA.dialog);
     assertEquals('privacy', CLEAR_BROWSING_DATA.section);
     assertEquals('advanced', CLEAR_BROWSING_DATA.page);
     assertEquals('privacy', CLEAR_BROWSING_DATA.section);
@@ -46,4 +49,14 @@ suite('route', function() {
     assertTrue(CLEAR_BROWSING_DATA.isDescendantOf(ADVANCED));
     assertTrue(CLEAR_BROWSING_DATA.isDescendantOf(PRIVACY));
   });
+
+  test('no duplicate routes', function() {
+    var urls = new Set();
+    Object.keys(settings.Route).forEach(
+        function(key) {
+          var route = settings.Route[key];
+          assertFalse(urls.has(route.url), route.url);
+          urls.add(route.url);
+        });

[Dan Beam, 2016/07/15 23:28:27]

Object.values(settings.Route).forEach(function(route) {
  assertFalse(urls.has(route.url), route.url);
  urls.add(route.url);
});

[tommycli, 2016/07/15 23:47:51]

Done. It works. Thanks. I'm living on the bleeding edge now.

+  });
 });