Bug 1473513 - Backed out changeset 80c51a6e896e for failures on mobile/android/tests/browser/chrome/test_debugger_server.html CLOSED TREE

Summary:
MozReview-Commit-ID: 3TCiKetO6fn

Depends on D6804

Bug #: 1473513

Differential Revision: https://phabricator.services.mozilla.com/D6805

devtools/server/actor-registry.js

@@ -251,7 +251,7 @@ const ActorRegistry = {
       constructor: "AccessibilityActor",
       type: { target: true }
     });
-    this.registerModule("devtools/server/actors/screenshot", {
+      this.registerModule("devtools/server/actors/screenshot", {
       prefix: "screenshot",
       constructor: "ScreenshotActor",
       type: { target: true }

devtools/server/actors/targets/browsing-context.js

@@ -495,8 +495,8 @@ const browsingContextTargetPrototype = {
    * Called when the actor is removed from the connection.
    */
   destroy() {
-    this.exit();
     Actor.prototype.destroy.call(this);
+    this.exit();
   },
 
   /**

devtools/server/actors/targets/worker.js

@@ -90,10 +90,10 @@ const WorkerTargetActor = protocol.ActorClassWithSpec(workerTargetSpec, {
   },
 
   destroy() {
+    protocol.Actor.prototype.destroy.call(this);
     if (this._attached) {
       this._detach();
     }
-    protocol.Actor.prototype.destroy.call(this);
   },
 
   connect(options) {

devtools/server/actors/worker/service-worker.js

@@ -50,8 +50,8 @@ const PushSubscriptionActor = protocol.ActorClassWithSpec(pushSubscriptionSpec,
   },
 
   destroy() {
-    this._subscription = null;
     protocol.Actor.prototype.destroy.call(this);
+    this._subscription = null;
   },
 });
 

devtools/shared/transport/tests/unit/testactors.js

@@ -7,6 +7,7 @@ const { RootActor } = require("devtools/server/actors/root");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { DebuggerServer } = require("devtools/server/main");
 const { ActorRegistry } = require("devtools/server/actor-registry");
+const promise = require("promise");
 
 var gTestGlobals = [];
 DebuggerServer.addTestGlobal = function(global) {