Revert of MD Settings: make chrome://[md-]settings/clearBrowserData URL work

chrome/browser/resources/settings/settings_page/settings_router.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @typedef {{
  *   url: string,
  *   page: string,
  *   section: string,
  *   subpage: !Array<string>,
- *   dialog: (string|undefined),
  * }}
  */
 var SettingsRoute;
 
 /**
  * @fileoverview
  * 'settings-router' is a simple router for settings. Its responsibilities:
  *  - Update the URL when the routing state changes.
  *  - Initialize the routing state with the initial URL.
  *  - Process and validate all routing state changes.
@@ skipping 30 matching lines @@
         // Take the current URL, find a matching pre-defined route, and
         // initialize the currentRoute to that pre-defined route.
         for (var i = 0; i < this.routes_.length; ++i) {
           var route = this.routes_[i];
           if (route.url == window.location.pathname) {
             return {
               url: route.url,
               page: route.page,
               section: route.section,
               subpage: route.subpage,
-              dialog: route.dialog,
             };
           }
         }
 
         // As a fallback return the default route.
         return this.routes_[0];
       },
     },
 
     /**
@@ skipping 347 matching lines @@
       url: '/siteSettings/unsandboxedPlugins/details',
       page: 'advanced',
       section: 'privacy',
       subpage: ['site-settings', 'site-settings-category-unsandsboxed-plugins',
           'site-details'],
     },
     {
       url: '/clearBrowserData',
       page: 'advanced',
       section: 'privacy',
-      subpage: [],
-      dialog: 'clear-browsing-data',
+      subpage: ['clear-browsing-data'],
     },
 <if expr="chromeos">
     {
       url: '/dateTime',
       page: 'advanced',
       section: 'dateTime',
       subpage: [],
     },
     {
       url: '/bluetooth',
@@ skipping 138 matching lines @@
    * Is called when another element modifies the route. This observer validates
    * the route change against the pre-defined list of routes, and updates the
    * URL appropriately.
    * @param {!SettingsRoute} newRoute Where we're headed.
    * @param {!SettingsRoute|undefined} oldRoute Where we've been.
    * @private
    */
   currentRouteChanged_: function(newRoute, oldRoute) {
     for (var i = 0; i < this.routes_.length; ++i) {
       var route = this.routes_[i];
-      if (route.page == newRoute.page &&
-          route.section == newRoute.section &&
-          route.dialog == newRoute.dialog &&
+      if (route.page == newRoute.page && route.section == newRoute.section &&
           route.subpage.length == newRoute.subpage.length &&
           newRoute.subpage.every(function(value, index) {
             return value == route.subpage[index];
           })) {
+
         // Update the property containing the titles for the current route.
         this.currentRouteTitles = {
           pageTitle: loadTimeData.getString(route.page + 'PageTitle'),
         };
 
         // If we are restoring a state from history, don't push it again.
         if (newRoute.inHistory)
           return;
 
         // Mark routes persisted in history as already stored in history.
         var historicState = {
           inHistory: true,
           page: newRoute.page,
           section: newRoute.section,
           subpage: newRoute.subpage,
-          dialog: newRoute.dialog,
         };
 
         // Push the current route to the history state, so when the user
         // navigates with the browser back button, we can recall the route.
         if (oldRoute) {
           window.history.pushState(historicState, document.title, route.url);
         } else {
           // For the very first route (oldRoute will be undefined), we replace
           // the existing state instead of pushing a new one. This is to allow
           // the user to use the browser back button to exit Settings entirely.
           window.history.replaceState(historicState, document.title);
         }
 
         return;
       }
     }
 
     assertNotReached('Route not found: ' + JSON.stringify(newRoute));
   },
 });