MD History: Replace app-route with a custom router

chrome/browser/resources/md_history/app.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/cr/ui.html">
 <link rel="import" href="chrome://resources/html/cr/ui/command.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-media-query.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-behavior/iron-scroll-target-behavior.html">
 <link rel="import" href="chrome://history/history_toolbar.html">
 <link rel="import" href="chrome://history/list_container.html">
+<link rel="import" href="chrome://history/router.html">
+<link rel="import" href="chrome://history/shared_style.html">
 <link rel="import" href="chrome://history/side_bar.html">
-<link rel="import" href="chrome://history/shared_style.html">
 <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
 
 <!-- Lazy loaded: history-synced-device-manager, app-drawer. -->
 
 <dom-module id="history-app">
   <template>
     <style no-process>
       history-toolbar {
         background: var(--md-toolbar-color);
       }
@@ skipping 57 matching lines @@
         position: absolute;
         right: 0;
         top: 0;
         transition: opacity 500ms;
       }
 
       :host([toolbar-shadow_]) #drop-shadow {
         opacity: 1;
       }
     </style>
-    <app-location route="{{route_}}"></app-location>
-    <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}"
-        query-params="{{queryParams_}}">
-    </app-route>
+    <history-router selected-page="{{selectedPage_}}"
+        query-state="{{queryState_}}">
+    </history-router>
     <history-toolbar id="toolbar"
         spinner-active="[[shouldShowSpinner_(queryState_.querying,
                                              queryState_.incremental,
                                              queryState_.searchTerm)]]"
         is-grouped-mode="{{grouped_}}"
         grouped-range="{{queryState_.range}}"
         search-term="{{queryState_.searchTerm}}"
         query-start-time="[[queryResult_.info.queryStartTime]]"
         query-end-time="[[queryResult_.info.queryEndTime]]"
         has-drawer="[[hasDrawer_]]"
         show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]">
     </history-toolbar>
 
     <div id="main-container">
-      <history-side-bar id="content-side-bar" selected-page="[[selectedPage_]]"
-          route="[[route_]]" show-footer="[[showSidebarFooter]]"
+      <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}"
+          show-footer="[[showSidebarFooter]]"
           hidden$="[[hasDrawer_]]">
       </history-side-bar>
       <iron-pages id="content" attr-for-selected="path"
           fallback-selection="history"
           selected="[[getSelectedPage_(selectedPage_, items)]]"
           items="{{items}}">
         <history-list-container id="history" query-state="{{queryState_}}"
             query-result="[[queryResult_]]" grouped="[[grouped_]]"
             grouped-range="{{queryState_.range}}" path="history">
         </history-list-container>
         <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
           <history-synced-device-manager id="synced-devices"
               session-list="[[queryResult_.sessionList]]"
               search-term="[[queryState_.searchTerm]]"
               sign-in-state="[[isUserSignedIn_]]"
               path="syncedTabs">
           </history-synced-device-manager>
         </template>
       </iron-pages>
       <div id="drop-shadow"></div>
     </div>
 
     <template is="dom-if" if="[[hasDrawer_]]">
       <app-drawer id="drawer" swipe-open align="start" tabindex="0">
         <div id="drawer-header">
           <h1>$i18n{title}</h1>
         </div>
-        <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]"
-            route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer>
+        <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}"
+            show-footer="[[showSidebarFooter]]" drawer>
         </history-side-bar>
       </app-drawer>
     </template>
 
     <iron-media-query query="(max-width: 1023px)"
         query-matches="{{hasDrawer_}}">
     </iron-media-query>
   </template>
   <script src="chrome://history/app.js"></script>
 </dom-module>