Bug 1362882 - hand cleanup after applying the previous script-generated patch, r=Mossop.

browser/components/downloads/test/browser/browser_overflow_anchor.js

@@ -98,11 +98,11 @@ function unlockWidth(aItemIDs) {
  * @param aIsOverflowed if we're waiting for the item to be overflowed.
  */
 function waitForOverflowed(aItem, aIsOverflowed) {
-  return new Promise(resolve => {
-    if (aItem.overflowed == aIsOverflowed) {
-      return resolve();
-    }
+  if (aItem.overflowed == aIsOverflowed) {
+    return Promise.resolve();
+  }
 
+  return new Promise(resolve => {
     let observer = new MutationObserver(function(aMutations) {
       if (aItem.overflowed == aIsOverflowed) {
         observer.disconnect();
@@ -110,6 +110,5 @@ function waitForOverflowed(aItem, aIsOverflowed) {
       }
     });
     observer.observe(aItem.node, {attributes: true});
-
   });
 }

browser/components/downloads/test/browser/head.js

@@ -113,11 +113,11 @@ function promiseFocus() {
 }
 
 function promisePanelOpened() {
-  return new Promise(resolve => {
+  if (DownloadsPanel.panel && DownloadsPanel.panel.state == "open") {
+    return Promise.resolve();
+  }
 
-    if (DownloadsPanel.panel && DownloadsPanel.panel.state == "open") {
-      return resolve();
-    }
+  return new Promise(resolve => {
 
     // Hook to wait until the panel is shown.
     let originalOnPopupShown = DownloadsPanel.onPopupShown;

browser/experiments/Experiments.jsm

@@ -969,7 +969,7 @@ Experiments.Experiments.prototype = {
         xhr.send(null);
       } catch (e) {
         this._log.error("httpGetRequest() - Error opening request to " + url + ": " + e);
-        return Promise.reject(new Error("Experiments - Error opening XHR for " + url));
+        reject(new Error("Experiments - Error opening XHR for " + url));
       }
     });
   },

browser/modules/ContentSearch.jsm

@@ -533,7 +533,7 @@ this.ContentSearch = {
         // This throws if the URI is erroneously encoded.
         xhr.send();
       } catch (err) {
-        return Promise.resolve(null);
+        resolve(null);
       }
     });
   },

browser/modules/test/browser/browser_ContentSearch.js

@@ -410,7 +410,7 @@ function arrayBufferFromDataURI(uri) {
     try {
       xhr.send();
     } catch (err) {
-      return Promise.resolve(null);
+      resolve(null);
     }
   });
 }