984809 - Remove deprecated promise.js usage in B2G

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[:Paolo Amadini]

Attachment: The patch

The Add-on SDK Promises module is being deprecated in favor of Promise.jsm, so we're removing all references to it from mozilla-central.

Alexandre, do you think you can review this patch?

It doesn't seem to cause test failures on the B2G Emulator:

https://tbpl.mozilla.org/?tree=Try&rev=4c5112c67bb2

Comment 1

[Alexandre Poirot [:ochameau]]

Comment on attachment 8392790 [details] [diff] [review]
The patch

Review of attachment 8392790 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with the two changes mentioned.

::: b2g/simulator/lib/main.js
@@ +5,5 @@
>  
>  const { Cc, Ci, Cu } = require("chrome");
>  
>  const { SimulatorProcess } = require("./simulator-process");
> +const Promise = Cu.import("resource://gre/modules/Promise.jsm", {});

The require() was returning the Promise object, whereas Cu.import() returns an object with a Promise attribute. So that end up breaking this file.
That line should be:
  const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});

::: b2g/simulator/lib/simulator-process.js
@@ +16,5 @@
>  const Runtime = require("sdk/system/runtime");
>  const Self = require("sdk/self");
>  const URL = require("sdk/url");
>  const Subprocess = require("subprocess");
> +const Promise = Cu.import("resource://gre/modules/Promise.jsm", {});

Same thing here:
  const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});

Comment 2

[:Paolo Amadini]

Attachment: The patch

(In reply to Alexandre Poirot (:ochameau) from comment #1)
> So that end up breaking this file.

Strange that it wasn't caught, thanks for the correction!

Another tryserver run before push:

https://tbpl.mozilla.org/?tree=Try&rev=75d1899f9078

Comment 3

[:Paolo Amadini]

https://hg.mozilla.org/integration/fx-team/rev/d0f486cca94e

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d0f486cca94e