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

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 cf91efdc6cc62ab08bb0e4691b8e5c0d26545f4b..c84fbdc764b92eebf009b47dfef2923967e541af 100644
--- a/chrome/test/data/webui/settings/route_tests.js
+++ b/chrome/test/data/webui/settings/route_tests.js
@@ -7,45 +7,34 @@ suite('route', function() {
     // Set up root page routes.
     var BASIC = new settings.Route('/');
     var ADVANCED = new settings.Route('/advanced');
-    assertDeepEquals([], ADVANCED.subpage);
+    assertFalse(ADVANCED.isSubpage());
 
     // Test a section route.
     var PRIVACY = ADVANCED.createChild('/privacy');
     PRIVACY.section = 'privacy';
     assertEquals(ADVANCED, PRIVACY.parent);
-    assertDeepEquals([], PRIVACY.subpage);
+    assertFalse(PRIVACY.isSubpage());
     assertFalse(BASIC.contains(PRIVACY));
     assertTrue(ADVANCED.contains(PRIVACY));
     assertTrue(PRIVACY.contains(PRIVACY));
     assertFalse(PRIVACY.contains(ADVANCED));
 
     // Test a subpage route.
-    var SITE_SETTINGS = PRIVACY.createChild('/siteSettings', 'site-settings');
+    var SITE_SETTINGS = PRIVACY.createChild('/siteSettings');
     assertEquals('/siteSettings', SITE_SETTINGS.path);
     assertEquals(PRIVACY, SITE_SETTINGS.parent);
     assertFalse(!!SITE_SETTINGS.dialog);
-    assertDeepEquals(['site-settings'], SITE_SETTINGS.subpage);
+    assertTrue(SITE_SETTINGS.isSubpage());
     assertEquals('privacy', SITE_SETTINGS.section);
     assertFalse(BASIC.contains(SITE_SETTINGS));
     assertTrue(ADVANCED.contains(SITE_SETTINGS));
     assertTrue(PRIVACY.contains(SITE_SETTINGS));
 
     // Test a sub-subpage route.
-    var SITE_SETTINGS_ALL =
-        SITE_SETTINGS.createChild('all', 'all-sites');
+    var SITE_SETTINGS_ALL = SITE_SETTINGS.createChild('all');
     assertEquals('/siteSettings/all', SITE_SETTINGS_ALL.path);
     assertEquals(SITE_SETTINGS, SITE_SETTINGS_ALL.parent);
-    assertDeepEquals(['site-settings', 'all-sites'], SITE_SETTINGS_ALL.subpage);
-
-    // Test a dialog route.
-    var CLEAR_BROWSING_DATA =
-        PRIVACY.createDialog('/clearBrowsingData', 'clear-browsing-data');
-    assertEquals(PRIVACY, CLEAR_BROWSING_DATA.parent);
-    assertEquals('clear-browsing-data', CLEAR_BROWSING_DATA.dialog);
-    assertEquals('privacy', CLEAR_BROWSING_DATA.section);
-    assertFalse(BASIC.contains(CLEAR_BROWSING_DATA));
-    assertTrue(ADVANCED.contains(CLEAR_BROWSING_DATA));
-    assertTrue(PRIVACY.contains(CLEAR_BROWSING_DATA));
+    assertTrue(SITE_SETTINGS_ALL.isSubpage());
   });
 
   test('no duplicate routes', function() {