Bug 984788 converted several legacy uses of promise.js to Promise.jsm, but still missed some easy conversions for code that was already present or was added later. This patch converts those instances that resulted in a green tryserver build: https://tbpl.mozilla.org/?tree=Try&rev=61c2cfa29c4a Requesting a rubber-stamp from David like we did in bug 984788.

Comment on attachment 8401367 [details] [diff] [review] The patch Review of attachment 8401367 [details] [diff] [review]: ----------------------------------------------------------------- ::: toolkit/components/satchel/test/unit/test_history_api.js @@ +4,5 @@ > > var testnum = 0; > let dbConnection; // used for deleted table tests > > +Cu.import("resource://gre/modules/Promise.jsm"); It probably doesn't change anything, but I'd import to |this|. ::: toolkit/components/search/nsSearchService.js @@ +8,5 @@ > const Cu = Components.utils; > > Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); > Components.utils.import("resource://gre/modules/Services.jsm"); > +Components.utils.import("resource://gre/modules/Promise.jsm"); Tempting to ask you to import to |this|, here, too. Your call.

I was about to convert to import to "this", but while doing that I figured out that the situation was already inconsistent across Toolkit modules, and went for keeping the style of surrounding code and saving some tryserver resources. I pushed the originally tested patch: https://hg.mozilla.org/integration/fx-team/rev/caefab985a51