MD Settings: Ensure that after clearing search, the "basic" page is displayed.

chrome/test/data/webui/settings/settings_main_test.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.
 
 cr.define('settings_main_page', function() {
   /**
    * @implements {SearchManager}
    */
   var TestSearchManager = function() {
     /** @private {boolean} */
@@ skipping 87 matching lines @@
 
         searchManager.setMatchesFound(false);
         // Clearing the search box is effectively a search for the empty string.
         return settingsMain.searchContents('').then(function() {
           Polymer.dom.flush();
           assertTrue(noSearchResults.hidden);
           assertNotEquals('none', toggleContainer.style.display);
         });
       });
 
-      test('advanced page restored after search results cleared', function() {
-        // Simulating searching while the advanced page is collapsed.
-        settingsMain.currentRouteChanged(settings.Route.BASIC);
-        Polymer.dom.flush();
-
-        assertFalse(!!settingsMain.$$('settings-advanced-page'));
-
+      /**
+       * Asserts the visibility of the basic and advanced pages after exiting
+       * search mode.
+       * @param {string} Expected 'display' value for the basic page.
+       * @param {string} Expected 'display' value for the advanced page.
+       * @return {!Promise}
+       */
+      function assertPageVisibilityAfterSearch(
+          expectedBasic, expectedAdvanced) {
         searchManager.setMatchesFound(true);
         return settingsMain.searchContents('Query1').then(function() {
           searchManager.setMatchesFound(false);
           return settingsMain.searchContents('');
         }).then(function() {
           Polymer.dom.flush();
-          // Checking that it remains hidden after results are cleared.
           assertEquals(
-              'none', settingsMain.$$('settings-advanced-page').style.display);
+              expectedBasic,
+              settingsMain.$$('settings-basic-page').style.display);
+          assertEquals(
+              expectedAdvanced,
+              settingsMain.$$('settings-advanced-page').style.display);
         });
+      }
+
+      test('exiting search mode, advanced collapsed', function() {
+        // Simulating searching while the advanced page is collapsed.
+        settingsMain.currentRouteChanged(settings.Route.BASIC);
+        Polymer.dom.flush();
+        return assertPageVisibilityAfterSearch('', 'none');
+      });
+
+      // Ensure that clearing the search results restores both "basic" and
+      // "advanced" page, when the search has been initiated from a subpage
+      // whose parent is the "advanced" page.
+      test('exiting search mode, advanced expanded', function() {
+        settings.navigateTo(settings.Route.SITE_SETTINGS);
+        Polymer.dom.flush();
+        return assertPageVisibilityAfterSearch('', '');
       });
 
       test('can collapse advanced on advanced section route', function() {
         settings.navigateTo(settings.Route.PRIVACY);
         Polymer.dom.flush();
 
         var advancedToggle = settingsMain.$$('#advancedToggle');
         assertTrue(!!advancedToggle);
 
         MockInteractions.tap(advancedToggle);
@@ skipping 14 matching lines @@
 
         assertTrue(settingsMain.showPages_.advanced);
       });
     });
   }
 
   return {
     registerTests: registerTests,
   };
 });