MD Settings: Fix endless recursion when exiting CBD dialog.

chrome/test/data/webui/settings/route_tests.js

 // Copyright 2016 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.
 
 suite('route', function() {
   /**
    * Returns a new promise that resolves after a window 'popstate' event.
    * @return {!Promise}
    */
   function whenPopState(causeEvent) {
@@ skipping 88 matching lines @@
     return testNavigateBackUsesHistory(
         settings.Route.BASIC,
         settings.Route.PEOPLE,
         settings.Route.BASIC);
   });
 
   test('navigate back to non-ancestor shallower route', function() {
     return testNavigateBackUsesHistory(
         settings.Route.ADVANCED,
         settings.Route.PEOPLE,
-        settings.Route.ADVANCED);
+        settings.Route.BASIC);

[dpapad, 2017/03/22 20:18:11]

I had to update this test too, since it assumed that after going back user
should be on chrome://md-settings/advanced. Let me know if you think this
behavior will cause any problems.

   });
 
   test('navigate back to sibling route', function() {
     return testNavigateBackUsesHistory(
         settings.Route.APPEARANCE,
         settings.Route.PEOPLE,
         settings.Route.APPEARANCE);
   });
 
   test('navigate back to parent when previous route is deeper', function() {
@@ skipping 17 matching lines @@
 
     settings.navigateTo(
         settings.Route.SITE_SETTINGS, null, /* removeSearch */ false);
     assertEquals(params.toString(), settings.getQueryParameters().toString());
 
     settings.navigateTo(
         settings.Route.SEARCH_ENGINES, null, /* removeSearch */ true);
     assertEquals('', settings.getQueryParameters().toString());
   });
 
+  test('navigateTo ADVANCED forwards to BASIC', function() {
+    settings.navigateTo(settings.Route.ADVANCED);
+    assertEquals(settings.Route.BASIC, settings.getCurrentRoute());
+  });
+
   test('popstate flag works', function() {
     settings.navigateTo(settings.Route.BASIC);
     assertFalse(settings.lastRouteChangeWasPopstate());
 
     settings.navigateTo(settings.Route.PEOPLE);
     assertFalse(settings.lastRouteChangeWasPopstate());
 
     return whenPopState(function() {
       window.history.back();
     }).then(function() {
@@ skipping 36 matching lines @@
     assertTrue(settings.Route.CLEAR_BROWSER_DATA.isNavigableDialog);
     assertTrue(settings.Route.IMPORT_DATA.isNavigableDialog);
     assertTrue(settings.Route.RESET_DIALOG.isNavigableDialog);
     assertTrue(settings.Route.SIGN_OUT.isNavigableDialog);
     assertTrue(settings.Route.TRIGGERED_RESET_DIALOG.isNavigableDialog);
 
     assertFalse(settings.Route.PRIVACY.isNavigableDialog);
     assertFalse(settings.Route.DEFAULT_BROWSER.isNavigableDialog);
   });
 });