Backed out changeset 6790d8962ad9 to make ESlint happy. r=backout

toolkit/components/extensions/Extension.jsm

@@ -79,7 +79,6 @@ var {
 const {
   EventEmitter,
   LocaleData,
-  getUniqueId,
 } = ExtensionUtils;
 
 XPCOMUtils.defineLazyGetter(this, "console", ExtensionUtils.getConsole);
@@ -565,6 +564,8 @@ this.ExtensionData = class {
 
 let _browserUpdated = false;
 
+let nextId = 0;
+
 const PROXIED_EVENTS = new Set(["test-harness-message"]);
 
 // We create one instance of this class per extension. |addonData|
@@ -574,7 +575,7 @@ this.Extension = class extends ExtensionData {
     super(addonData.resourceURI);
 
     this.uuid = UUIDMap.get(addonData.id);
-    this.instanceId = getUniqueId();
+    this.instanceId = nextId++;
 
     this.MESSAGE_EMIT_EVENT = `Extension:EmitEvent:${this.instanceId}`;
     Services.ppmm.addMessageListener(this.MESSAGE_EMIT_EVENT, this);

toolkit/components/extensions/ExtensionChild.jsm

@@ -49,7 +49,6 @@ const {
   findPathInObject,
   getInnerWindowID,
   getMessageManager,
-  getUniqueId,
   injectAPI,
 } = ExtensionUtils;
 
@@ -62,6 +61,8 @@ const {
 
 var ExtensionChild;
 
+let gNextPortId = 1;
+
 /**
  * Abstraction for a Port object in the extension API.
  *
@@ -105,6 +106,10 @@ class Port {
     this.context.callOnClose(this);
   }
 
+  static getNextID() {
+    return `${gNextPortId++}-${Services.appinfo.uniqueProcessID}`;
+  }
+
   api() {
     let portObj = Cu.createObjectIn(this.context.cloneScope);
 
@@ -397,7 +402,7 @@ class Messenger {
   }
 
   connect(messageManager, name, recipient) {
-    let portId = getUniqueId();
+    let portId = Port.getNextID();
 
     let port = new Port(this.context, messageManager, this.messageManagers, name, portId, null, recipient);
 
@@ -405,7 +410,7 @@ class Messenger {
   }
 
   connectNative(messageManager, name, recipient) {
-    let portId = getUniqueId();
+    let portId = Port.getNextID();
 
     let port = new NativePort(this.context, messageManager, this.messageManagers, name, portId, null, recipient);
 
@@ -613,7 +618,7 @@ class ChildAPIManagerBase {
    *     promise otherwise. The promise is resolved when the function completes.
    */
   callParentAsyncFunction(path, args, callback) {
-    let callId = getUniqueId();
+    let callId = nextId++;
     let deferred = PromiseUtils.defer();
     this.callPromises.set(callId, deferred);
 

toolkit/components/extensions/ExtensionCommon.jsm

@@ -33,7 +33,6 @@ var {
   SpreadArgs,
   getConsole,
   getInnerWindowID,
-  getUniqueId,
   runSafeSync,
   runSafeSyncWithoutClone,
   instanceOf,
@@ -41,13 +40,15 @@ var {
 
 XPCOMUtils.defineLazyGetter(this, "console", getConsole);
 
+let gContextId = 0;
+
 class BaseContext {
   constructor(envType, extension) {
     this.envType = envType;
     this.onClose = new Set();
     this.checkedLastError = false;
     this._lastError = null;
-    this.contextId = getUniqueId();
+    this.contextId = `${++gContextId}-${Services.appinfo.uniqueProcessID}`;
     this.unloaded = false;
     this.extension = extension;
     this.jsonSandbox = null;

toolkit/components/extensions/ExtensionUtils.jsm

@@ -48,13 +48,6 @@ function getConsole() {
 
 XPCOMUtils.defineLazyGetter(this, "console", getConsole);
 
-let nextId = 0;
-const {uniqueProcessID} = Services.appinfo;
-
-function getUniqueId() {
-  return `${nextId++}-${uniqueProcessID}`;
-}
-
 /**
  * An Error subclass for which complete error messages are always passed
  * to extensions, rather than being interpreted as an unknown error.
@@ -1183,7 +1176,6 @@ this.ExtensionUtils = {
   getConsole,
   getInnerWindowID,
   getMessageManager,
-  getUniqueId,
   ignoreEvent,
   injectAPI,
   instanceOf,

toolkit/components/extensions/MessageChannel.jsm

@@ -278,6 +278,8 @@ class FilteringMessageManagerMap extends Map {
 const MESSAGE_MESSAGE = "MessageChannel:Message";
 const MESSAGE_RESPONSE = "MessageChannel:Response";
 
+let gChannelId = 0;
+
 this.MessageChannel = {
   init() {
     Services.obs.addObserver(this, "message-manager-close", false);
@@ -512,7 +514,7 @@ this.MessageChannel = {
     let recipient = options.recipient || {};
     let responseType = options.responseType || this.RESPONSE_SINGLE;
 
-    let channelId = ExtensionUtils.getUniqueId();
+    let channelId = `${gChannelId++}-${Services.appinfo.uniqueProcessID}`;
     let message = {messageName, channelId, sender, recipient, data, responseType};
 
     if (responseType == this.RESPONSE_NONE) {