MD Settings: Allow search within settings to track multiple requests separately.

chrome/browser/resources/settings/basic_page/basic_page.js

Index: chrome/browser/resources/settings/basic_page/basic_page.js
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.js b/chrome/browser/resources/settings/basic_page/basic_page.js
index 395996069a8aea4feb5bae7a690a8a48d2e43175..b7718b15b8876067977a6785458e1591a3f3aa98 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.js
+++ b/chrome/browser/resources/settings/basic_page/basic_page.js
@@ -105,19 +105,21 @@ Polymer({
    * Queues a task to search the basic sections, then another for the advanced
    * sections.
    * @param {string} query The text to search for.
-   * @return {!Promise<!settings.SearchRequest>} A signal indicating that
-   *     searching finished.
+   * @return {!Promise<!Array<!settings.SearchRequest>>} A signal indicating
+   *     that searching finished.
    */
   searchContents: function(query) {
-    var whenSearchDone = settings.getSearchManager().search(
-        query, assert(this.$$('#basicPage')));
+    var whenSearchDone = [
+        settings.getSearchManager().search(

[Dan Beam, 2017/03/14 00:44:27]

wrong indent, when you add less indent dare you to unwrap as well ;)

[dpapad, 2017/03/14 03:28:11]

Done.

+            query, assert(this.$$('#basicPage'))),
+    ];
 
     if (this.pageVisibility.advancedSettings !== false) {
-      assert(whenSearchDone === settings.getSearchManager().search(
+      whenSearchDone.push(settings.getSearchManager().search(
           query, assert(this.$$('#advancedPageTemplate').get())));
     }
 
-    return whenSearchDone;
+    return Promise.all(whenSearchDone);
   },
 
 // <if expr="chromeos">