Safety check UI: clear search term on navigation

* When navigating to a Settings subpage from safety check, clear the
  search term so that content on the subpage is not hidden by it.

Bug: 1085422
Change-Id: I8caf29cc417e7af69fa2981d444e580c0963bac0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230483
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775789}

chrome/browser/resources/settings/safety_check_page/safety_check_chrome_cleaner_child.js

@@ -182,7 +182,7 @@ Polymer({
       case SafetyCheckChromeCleanerStatus.CLEANING:
         Router.getInstance().navigateTo(
             routes.CHROME_CLEANUP,
-            /* dynamicParams */ null, /* removeSearch */ true);
+            /* dynamicParams= */ null, /* removeSearch= */ true);
         break;
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
         // TODO(crbug.com/1087263): Implement CCT-based reboot here.

chrome/browser/resources/settings/safety_check_page/safety_check_passwords_child.js

@@ -122,7 +122,9 @@ Polymer({
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.ManagePasswords');
 
-    Router.getInstance().navigateTo(routes.CHECK_PASSWORDS);
+    Router.getInstance().navigateTo(
+        routes.CHECK_PASSWORDS,
+        /* dynamicParams= */ null, /* removeSearch= */ true);
     PasswordManagerImpl.getInstance().recordPasswordCheckReferrer(
         PasswordManagerProxy.PasswordCheckReferrer.SAFETY_CHECK);
   },

chrome/browser/resources/settings/safety_check_page/safety_check_safe_browsing_child.js

@@ -120,7 +120,9 @@ Polymer({
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.ManageSafeBrowsing');
 
-    Router.getInstance().navigateTo(routes.SECURITY);
+    Router.getInstance().navigateTo(
+        routes.SECURITY, /* dynamicParams= */ null,
+        /* removeSearch= */ true);
   },
 
   /**

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

@@ -63,15 +63,19 @@ function assertSafetyCheckChild({
 suite('SafetyCheckChromeCleanerUiTests', function() {
   /** @type {?TestMetricsBrowserProxy} */
   let metricsBrowserProxy = null;
-
   /** @type {!SettingsSafetyCheckExtensionsChildElement} */
   let page;
+  /** @type {!SettingsUiElement} */
+  let ui;
 
   setup(function() {
     metricsBrowserProxy = new TestMetricsBrowserProxy();
     MetricsBrowserProxyImpl.instance_ = metricsBrowserProxy;
 
     document.body.innerHTML = '';
+    ui = /** @type {!SettingsUiElement} */ (
+        document.createElement('settings-ui'));
+    document.body.appendChild(ui);
     page = /** @type {!SettingsSafetyCheckExtensionsChildElement} */ (
         document.createElement('settings-safety-check-chrome-cleaner-child'));
     document.body.appendChild(page);
@@ -84,11 +88,19 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
 
   /** @return {!Promise} */
   async function expectChromeCleanerRouteButtonClickActions() {
+    // Put some search term into the Settings search.
+    const toolbar = /** @type {!CrToolbarElement} */ (ui.$$('cr-toolbar'));
+    const searchField =
+        /** @type {CrToolbarSearchFieldElement} */ (toolbar.getSearchField());
+    searchField.setValue('GOOG');
+
     // User clicks review extensions button.
     page.$$('#safetyCheckChild').$$('#button').click();
     // // TODO(crbug.com/1087263): Ensure UMA is logged.
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
+    // Ensure the search term got cleared
+    assertEquals('', searchField.getSearchInput().value);
   }
 
   test('chromeCleanerCheckingUiTest', function() {

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

@@ -473,15 +473,19 @@ suite('SafetyCheckUpdatesChildUiTests', function() {
 suite('SafetyCheckPasswordsChildUiTests', function() {
   /** @type {?TestMetricsBrowserProxy} */
   let metricsBrowserProxy = null;
-
   /** @type {!SettingsSafetyCheckPasswordsChildElement} */
   let page;
+  /** @type {!SettingsUiElement} */
+  let ui;
 
   setup(function() {
     metricsBrowserProxy = new TestMetricsBrowserProxy();
     MetricsBrowserProxyImpl.instance_ = metricsBrowserProxy;
 
     document.body.innerHTML = '';
+    ui = /** @type {!SettingsUiElement} */ (
+        document.createElement('settings-ui'));
+    document.body.appendChild(ui);
     page = /** @type {!SettingsSafetyCheckPasswordsChildElement} */ (
         document.createElement('settings-safety-check-passwords-child'));
     document.body.appendChild(page);
@@ -528,6 +532,12 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
     const passwordManager = new TestPasswordManagerProxy();
     PasswordManagerImpl.instance_ = passwordManager;
 
+    // Put some search term into the Settings search.
+    const toolbar = /** @type {!CrToolbarElement} */ (ui.$$('cr-toolbar'));
+    const searchField =
+        /** @type {CrToolbarSearchFieldElement} */ (toolbar.getSearchField());
+    searchField.setValue('GOOG');
+
     // User clicks the manage passwords button.
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
@@ -541,6 +551,8 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
     // Ensure the correct Settings page is shown.
     assertEquals(
         routes.CHECK_PASSWORDS, Router.getInstance().getCurrentRoute());
+    // Ensure the search term got cleared.
+    assertEquals('', searchField.getSearchInput().value);
 
     // Ensure correct referrer sent to password check.
     const referrer =
@@ -580,15 +592,19 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
 suite('SafetyCheckSafeBrowsingChildUiTests', function() {
   /** @type {?TestMetricsBrowserProxy} */
   let metricsBrowserProxy = null;
-
   /** @type {!SettingsSafetyCheckSafeBrowsingChildElement} */
   let page;
+  /** @type {!SettingsUiElement} */
+  let ui;
 
   setup(function() {
     metricsBrowserProxy = new TestMetricsBrowserProxy();
     MetricsBrowserProxyImpl.instance_ = metricsBrowserProxy;
 
     document.body.innerHTML = '';
+    ui = /** @type {!SettingsUiElement} */ (
+        document.createElement('settings-ui'));
+    document.body.appendChild(ui);
     page = /** @type {!SettingsSafetyCheckSafeBrowsingChildElement} */ (
         document.createElement('settings-safety-check-safe-browsing-child'));
     document.body.appendChild(page);
@@ -643,6 +659,12 @@ suite('SafetyCheckSafeBrowsingChildUiTests', function() {
       buttonClass: 'action-button',
     });
 
+    // Put some search term into the Settings search.
+    const toolbar = /** @type {!CrToolbarElement} */ (ui.$$('cr-toolbar'));
+    const searchField =
+        /** @type {CrToolbarSearchFieldElement} */ (toolbar.getSearchField());
+    searchField.setValue('GOOG');
+
     // User clicks the manage safe browsing button.
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
@@ -655,6 +677,8 @@ suite('SafetyCheckSafeBrowsingChildUiTests', function() {
         await metricsBrowserProxy.whenCalled('recordAction'));
     // Ensure the correct Settings page is shown.
     assertEquals(routes.SECURITY, Router.getInstance().getCurrentRoute());
+    // Ensure the search term got cleared.
+    assertEquals('', searchField.getSearchInput().value);
   });
 
   test('safeBrowsingDisabledByAdminUiTest', function() {