MD Settings: Remove subpage animation when landing directly on it.

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() {
   /**
    * Extending TestBrowserProxy even though SearchManager is not a browser proxy
    * itself. Essentially TestBrowserProxy can act as a "proxy" for any external
    * dependency, not just "browser proxies" (and maybe should be renamed to
    * TestProxy).
@@ skipping 175 matching lines @@
       }
 
       // TODO(michaelpg): It would be better not to drill into
       // settings-basic-page. If search should indeed only work in Settings
       // (as opposed to Advanced), perhaps some of this logic should be
       // delegated to settings-basic-page now instead of settings-main.
 
       /**
        * Asserts the visibility of the basic and advanced pages after exiting
        * search mode.
        * @param {string} Expected 'display' value for the basic page.

[dpapad, 2017/05/31 00:40:42]

Obsolete parameter.

[scottchen, 2017/05/31 18:25:28]

Done.

        * @param {string} Expected 'display' value for the advanced page.
        * @return {!Promise}
        */
-      function assertPageVisibilityAfterSearch(
-          expectedBasic, expectedAdvanced) {
+      function assertAdvancedVisibilityAfterSearch(expectedAdvanced) {
         searchManager.setMatchesFound(true);
-        return settingsMain.searchContents('Query1').then(function() {
-          searchManager.setMatchesFound(false);
-          return settingsMain.searchContents('');
-        }).then(function() {
-          return assertPageVisibility(expectedBasic, expectedAdvanced);
-        });
+        return settingsMain.searchContents('Query1')
+            .then(function() {
+              searchManager.setMatchesFound(false);
+              return settingsMain.searchContents('');
+            })
+            .then(function() {
+              settings.navigateTo(
+                  settings.Route.BASIC);  // Imitate clear search.

[dpapad, 2017/05/31 00:40:42]

// Imitate clear search.
settings.navigateTo(settings.Route.BASIC);

[scottchen, 2017/05/31 18:25:28]

Done.

+              Polymer.dom.flush();
+              return assertPageVisibility('block', expectedAdvanced);
+            });
       }
 
       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('block', 'none');
+        return assertAdvancedVisibilityAfterSearch('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('block', 'block');
+        return assertAdvancedVisibilityAfterSearch('block');
       });
 
       // 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);
@@ skipping 46 matching lines @@
 
         return assertPageVisibility('block', 'block');
       });
     });
   }
 
   return {
     registerTests: registerTests,
   };
 });