[Extensions] Use promises in Search API test.

References: crrev.com/c/2368147 & testing_api.md#use-promises.

Bug: 1119846

Change-Id: Id7e603c415f8d2c6fee00a615b97078e486fe6f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382888
Commit-Queue: Solomon Kinard <solomonkinard@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805595}

chrome/test/data/extensions/api_test/search/query/normal/background.js

@@ -21,9 +21,10 @@ chrome.test.runTests([
     });
   },
 
+  // Display results in current tab if no disposition is provided.
   function QueryPopulatedDispositionEmpty() {
     chrome.tabs.create({}, (tab) => {
-      addTabListener(tab.id);
+      waitForTabAndPass(tab.id);
       chrome.search.query({search: SEARCH_WORDS}, () => {});
     });
   },
@@ -31,7 +32,7 @@ chrome.test.runTests([
   // Display results in current tab if said disposition is provided.
   function QueryPopulatedDispositionCurrentTab() {
     chrome.tabs.create({}, (tab) => {
-      addTabListener(tab.id);
+      waitForTabAndPass(tab.id);
       chrome.search.query({search: SEARCH_WORDS, disposition: 'CURRENT_TAB'});
     });
   },
@@ -40,14 +41,24 @@ chrome.test.runTests([
   function QueryPopulatedDispositionNewTab() {
     chrome.tabs.query({}, (initialTabs) => {
       let initialTabIds = initialTabs.map(tab => tab.id);
-      addAnyTabListener();
-      chrome.search.query(
-          {search: SEARCH_WORDS, disposition: 'NEW_TAB'}, () => {
-            chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
-              assertEq(1, tabs.length);
-              // A new tab should have been created.
-              assertFalse(initialTabIds.includes(tabs[0].id));
-            });
+      Promise
+          .all([
+            waitForAnyTab(),
+            new Promise(resolve => {
+              chrome.search.query(
+                  {search: SEARCH_WORDS, disposition: 'NEW_TAB'}, () => {
+                    chrome.tabs.query(
+                        {active: true, currentWindow: true}, (tabs) => {
+                          assertEq(1, tabs.length);
+                          // A new tab should have been created.
+                          assertFalse(initialTabIds.includes(tabs[0].id));
+                          resolve();
+                        });
+                  });
+            }),
+          ])
+          .then(() => {
+            succeed();
           });
     });
   },
@@ -56,15 +67,24 @@ chrome.test.runTests([
   function QueryPopulatedDispositionNewWindow() {
     chrome.windows.getAll({}, (initialWindows) => {
       let initialWindowIds = initialWindows.map(window => window.id);
-      addAnyTabListener();
-      chrome.search.query(
-          {search: SEARCH_WORDS, disposition: 'NEW_WINDOW'}, () => {
-            chrome.windows.getAll({}, (windows) => {
-              assertEq(windows.length, initialWindowIds.length + 1);
-              let window =
-                  windows.find(window => !initialWindowIds.includes(window.id));
-              assertTrue(!!window);
-            });
+      Promise
+          .all([
+            waitForAnyTab(),
+            new Promise((resolve) => {
+              chrome.search.query(
+                  {search: SEARCH_WORDS, disposition: 'NEW_WINDOW'}, () => {
+                    chrome.windows.getAll({}, (windows) => {
+                      let window = windows.find(
+                          window => !initialWindowIds.includes(window.id));
+                      assertEq(windows.length, initialWindowIds.length + 1);
+                      assertTrue(!!window);
+                      resolve();
+                    });
+                  });
+            }),
+          ])
+          .then(() => {
+            succeed();
           });
     });
   },
@@ -72,7 +92,7 @@ chrome.test.runTests([
   // Display results in specified tab if said tabId is provided.
   function QueryPopulatedTabIDValid() {
     chrome.tabs.create({}, (tab) => {
-      addTabListener(tab.id);
+      waitForTabAndPass(tab.id);
       chrome.search.query({search: SEARCH_WORDS, tabId: tab.id});
     });
   },
@@ -98,23 +118,29 @@ chrome.test.runTests([
   },
 ]);
 
-let addTabListener = (tabIdExpected) => {
-  chrome.tabs.onUpdated.addListener(function listener(tabId, changeInfo, tab) {
-    if ((tabIdExpected != -1 && tabId != tabIdExpected) ||
-        changeInfo.status !== 'complete') {
-      return;  // Not our tab.
-    }
-    // Note: make sure to stop listening to future events, so that this
-    // doesn't affect future tests.
-    chrome.tabs.onUpdated.removeListener(listener);
-    // The tab finished loading. It should be on google (the default
-    // search engine).
-    const hostname = new URL(tab.url).hostname;
-    assertEq('www.google.com', hostname);
-    succeed();
+function waitForTab(tabIdExpected) {
+  return new Promise((resolve) => {
+    chrome.tabs.onUpdated.addListener(function listener(
+        tabId, changeInfo, tab) {
+      if ((tabIdExpected != -1 && tabId != tabIdExpected) ||
+          changeInfo.status !== 'complete') {
+        return;  // Not our tab.
+      }
+      // Note: make sure to stop listening to future events, so that this
+      // doesn't affect future tests.
+      chrome.tabs.onUpdated.removeListener(listener);
+      // The tab finished loading. It should be on google (the default
+      // search engine).
+      assertEq('www.google.com', new URL(tab.url).hostname);
+      resolve();
+    });
   });
 };
 
-let addAnyTabListener = () => {
-  addTabListener(-1);
+function waitForAnyTab() {
+  return waitForTab(-1);
 };
+
+function waitForTabAndPass(tabId) {
+  waitForTab(tabId).then(succeed);
+}
\ No newline at end of file