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

chrome/browser/resources/settings/privacy_page/privacy_page.html

Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index c65111dd8a20ffd6363b686f8fd08b3e412e5b44..0e00c2a6c07293c94deaf2ed20e671f9c799c76e 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -31,7 +31,7 @@
       </settings-clear-browsing-data-dialog>
     </template>
     <settings-animated-pages id="pages" section="privacy">
-      <neon-animatable id="main">
+      <neon-animatable route-path="default">
         <div class="settings-box block first">
           <p class="privacy-explanation">
             $i18nRaw{improveBrowsingExperience}
@@ -104,7 +104,7 @@
         </div>
       </neon-animatable>
 <if expr="use_nss_certs">
-      <template is="dom-if" name="manage-certificates">
+      <template is="dom-if" route-path="/certificates">
         <settings-subpage
             associated-control="[[$$('#manageCertificates')]]"
             page-title="$i18n{manageCertificates}">
@@ -113,7 +113,7 @@
         </settings-subpage>
       </template>
 </if>
-      <template is="dom-if" name="site-settings">
+      <template is="dom-if" route-path="/siteSettings">
         <settings-subpage
             associated-control="[[$$('#site-settings-subpage-trigger')]]"
             id="site-settings"
@@ -123,12 +123,12 @@
         </settings-subpage>
       </template>
 
-      <template is="dom-if" name="all-sites" no-search>
+      <template is="dom-if" route-path="/siteSettings/all" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
           <all-sites selected-site="{{selectedSite}}"></all-sites>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-automatic-downloads"
+      <template is="dom-if" route-path="/siteSettings/automaticDownloads" no-search>
           no-search>
         <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
           <site-settings-category
@@ -137,7 +137,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-background-sync"
+      <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search>
           no-search>
         <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
           <site-settings-category
@@ -146,7 +146,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-camera" no-search>
+      <template is="dom-if" route-path="/siteSettings/camera" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -155,7 +155,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-cookies" no-search>
+      <template is="dom-if" route-path="/siteSettings/cookies" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -171,7 +171,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-images" no-search>
+      <template is="dom-if" route-path="/siteSettings/images" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -179,7 +179,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-location" no-search>
+      <template is="dom-if" route-path="/siteSettings/location" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -192,7 +192,7 @@
           <protocol-handlers></protocol-handlers>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-javascript" no-search>
+      <template is="dom-if" route-path="/siteSettings/javascript" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -200,7 +200,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-keygen" no-search>
+      <template is="dom-if" route-path="/siteSettings/keygen" no-search>
         <settings-subpage page-title="$i18n{siteSettingsKeygen}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -208,7 +208,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-microphone" no-search>
+      <template is="dom-if" route-path="/siteSettings/microphone" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -217,8 +217,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-notifications"
-            no-search>
+      <template is="dom-if" route-path="/siteSettings/notifications" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -226,7 +225,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-plugins" no-search>
+      <template is="dom-if" route-path="/siteSettings/plugins" no-search>
         <settings-subpage page-title="$i18n{siteSettingsPlugins}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -234,7 +233,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-popups" no-search>
+      <template is="dom-if" route-path="/siteSettings/popups" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
           <site-settings-category
               selected-site="{{selectedSite}}"
@@ -242,8 +241,7 @@
           </site-settings-category>
         </settings-subpage>
       </template>
-      <template is="dom-if" name="site-settings-category-unsandboxed-plugins"
-            no-search>
+      <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" no-search>
         <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
           <site-settings-category
               selected-site="{{selectedSite}}"