Settings Router Refactor: Kill settings-router.

chrome/browser/resources/settings/advanced_page/advanced_page.html

Index: chrome/browser/resources/settings/advanced_page/advanced_page.html
diff --git a/chrome/browser/resources/settings/advanced_page/advanced_page.html b/chrome/browser/resources/settings/advanced_page/advanced_page.html
index c65c24a3b4049752fa3eccae7d16e706368e49c5..d1c9a1890c7815f57ea9419611760686e628000f 100644
--- a/chrome/browser/resources/settings/advanced_page/advanced_page.html
+++ b/chrome/browser/resources/settings/advanced_page/advanced_page.html
@@ -8,7 +8,6 @@
 <link rel="import" href="/reset_page/reset_page.html">
 <link rel="import" href="/settings_page/main_page_behavior.html">
 <link rel="import" href="/settings_page/settings_page_visibility.html">
-<link rel="import" href="/settings_page/settings_router.html">
 <link rel="import" href="/settings_page/settings_section.html">
 <link rel="import" href="/settings_page_css.html">
 <link rel="import" href="/site_settings/constants.html">
@@ -30,7 +29,7 @@
 <if expr="chromeos">
       <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" restamp>
         <settings-section page-title="$i18n{dateTimePageTitle}"
-            current-route="[[currentRoute]]" section="dateTime">
+            section="dateTime">
           <settings-date-time-page prefs="{{prefs}}"
               page-visibility="[[pageVisibility.dateTime]]">
           </settings-date-time-page>
@@ -39,9 +38,8 @@
 </if>
       <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]" restamp>
         <settings-section page-title="$i18n{privacyPageTitle}"
-            current-route="[[currentRoute]]" section="privacy">
+            section="privacy">
           <settings-privacy-page prefs="{{prefs}}"
-              current-route="{{currentRoute}}"
               page-visibility="[[pageVisibility.privacy]]">
           </settings-privacy-page>
         </settings-section>
@@ -49,10 +47,8 @@
 <if expr="chromeos">
       <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" restamp>
         <settings-section page-title="$i18n{bluetoothPageTitle}"
-            current-route="[[currentRoute]]" section="bluetooth">
-          <settings-bluetooth-page prefs="{{prefs}}"
-              current-route="{{currentRoute}}">
-          </settings-bluetooth-page>
+            section="bluetooth">
+          <settings-bluetooth-page prefs="{{prefs}}"></settings-bluetooth-page>
         </settings-section>
       </template>
 </if>
@@ -60,23 +56,20 @@
           restamp>
         <settings-section
             page-title="$i18n{passwordsAndAutofillPageTitle}"
-            current-route="[[currentRoute]]" section="passwordsAndForms">
-          <settings-passwords-and-forms-page prefs="{{prefs}}"
-              current-route="{{currentRoute}}">
+            section="passwordsAndForms">
+          <settings-passwords-and-forms-page prefs="{{prefs}}">
           </settings-passwords-and-forms-page>
         </settings-section>
       </template>
       <template is="dom-if" if="[[showPage(pageVisibility.languages)]]" restamp>
         <settings-section page-title="$i18n{languagesPageTitle}"
-            current-route="[[currentRoute]]" section="languages">
-          <settings-languages-page prefs="{{prefs}}"
-              current-route="{{currentRoute}}">
-          </settings-languages-page>
+            section="languages">
+          <settings-languages-page prefs="{{prefs}}"></settings-languages-page>
         </settings-section>
       </template>
       <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]" restamp>
         <settings-section page-title="$i18n{downloadsPageTitle}"
-            current-route="[[currentRoute]]" section="downloads">
+            section="downloads">
           <settings-downloads-page prefs="{{prefs}}"
               page-visibility="[[pageVisibility.downloads]]">
           </settings-downloads-page>
@@ -84,15 +77,12 @@
       </template>
       <template is="dom-if" if="[[showPage(pageVisibility.printing)]]" restamp>
         <settings-section page-title="$i18n{printingPageTitle}"
-            current-route="[[currentRoute]]" section="printing">
-          <settings-printing-page prefs="{{prefs}}"
-              current-route="{{currentRoute}}">
-          </settings-printing-page>
+            section="printing">
+          <settings-printing-page prefs="{{prefs}}"></settings-printing-page>
         </settings-section>
       </template>
       <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp>
-        <settings-section page-title="$i18n{a11yPageTitle}"
-            current-route="[[currentRoute]]" section="a11y">
+        <settings-section page-title="$i18n{a11yPageTitle}" section="a11y">
           <settings-a11y-page prefs="{{prefs}}"
               current-route="{{currentRoute}}">
           </settings-a11y-page>
@@ -100,15 +90,13 @@
       </template>
 <if expr="not chromeos">
       <template is="dom-if" if="[[showPage(pageVisibility.system)]]" restamp>
-        <settings-section page-title="$i18n{systemPageTitle}"
-            current-route="[[currentRoute]]" section="system">
+        <settings-section page-title="$i18n{systemPageTitle}" section="system">
           <settings-system-page prefs="{{prefs}}"></settings-system-page>
         </settings-section>
       </template>
 </if>
       <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" restamp>
-        <settings-section page-title="$i18n{resetPageTitle}"
-            current-route="[[currentRoute]]" section="reset">
+        <settings-section page-title="$i18n{resetPageTitle}" section="reset">
           <settings-reset-page></settings-reset-page>
         </settings-section>
       </template>