MD Settings: Ensure all search results are visible when going back.

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 127 matching lines @@
 
       // 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('', '');
       });
 
+      // Ensure that searching, then entering a subpage, then going back
+      // lands the user in a page where both basic and advanced sections are
+      // visible, because the page is still in search mode.
+      test('returning from subpage to search results', function() {
+        settings.navigateTo(settings.Route.BASIC);
+        Polymer.dom.flush();
+
+        searchManager.setMatchesFound(true);
+        return settingsMain.searchContents('Query1').then(function() {
+          // Simulate navigating into a subpage.
+          settings.navigateTo(settings.Route.SEARCH_ENGINES);
+          settingsMain.$$('settings-basic-page').fire('subpage-expand');
+          Polymer.dom.flush();
+
+          // Simulate clicking the left arrow to go back to the search results.
+          settingsMain.currentRouteChanged(settings.Route.BASIC);
+          Polymer.dom.flush();
+          assertEquals(
+              '', settingsMain.$$('settings-basic-page').style.display);
+          assertEquals(
+              '', settingsMain.$$('settings-advanced-page').style.display);
+        });
+      });
+
       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);
         Polymer.dom.flush();
 
@@ skipping 12 matching lines @@
 
         assertTrue(settingsMain.showPages_.advanced);
       });
     });
   }
 
   return {
     registerTests: registerTests,
   };
 });