Backed out 2 changesets (bug 1544976) for causing xpcshell failures in devtools/client/memory/test/unit/test_action_diffing_02.js. a=backout

Backed out changeset 30b551b1a212 (bug 1544976)
Backed out changeset 1ebc89e3ad97 (bug 1544976)

--HG--
extra : source : 618d85aa18ee8402d69354e4980939fb89521436
extra : histedit_source : 1dab80aecf02d2cbc98cb97064a42cce16bb0511

devtools/client/debugger/src/client/firefox/workers.js

@@ -26,32 +26,26 @@ export async function updateWorkerClients({
 
   const { workers } = await tabTarget.listWorkers();
   for (const workerTargetFront of workers) {
-    try {
-      await workerTargetFront.attach();
-      const [, workerThread] = await workerTargetFront.attachThread(options);
+    await workerTargetFront.attach();
+    const [, workerThread] = await workerTargetFront.attachThread(options);
 
-      const actor = workerThread.actor;
-      if (workerClients[actor]) {
-        if (workerClients[actor].thread != workerThread) {
-          console.error(`Multiple clients for actor ID: ${workerThread.actor}`);
-        }
-        newWorkerClients[actor] = workerClients[actor];
-      } else {
-        addThreadEventListeners(workerThread);
-        workerThread.resume();
-
-        const consoleFront = await workerTargetFront.getFront("console");
-        await consoleFront.startListeners([]);
-
-        newWorkerClients[actor] = {
-          url: workerTargetFront.url,
-          thread: workerThread,
-          console: consoleFront
-        };
+    if (workerClients[workerThread.actor]) {
+      if (workerClients[workerThread.actor].thread != workerThread) {
+        throw new Error(`Multiple clients for actor ID: ${workerThread.actor}`);
       }
-    } catch (e) {
-      // If any of the workers have terminated since the list command initiated
-      // then we will get errors. Ignore these.
+      newWorkerClients[workerThread.actor] = workerClients[workerThread.actor];
+    } else {
+      addThreadEventListeners(workerThread);
+      workerThread.resume();
+
+      const consoleFront = await workerTargetFront.getFront("console");
+      await consoleFront.startListeners([]);
+
+      newWorkerClients[workerThread.actor] = {
+        url: workerTargetFront.url,
+        thread: workerThread,
+        console: consoleFront
+      };
     }
   }
 

devtools/shared/ThreadSafeDevToolsUtils.js

@@ -9,8 +9,6 @@
  * workers.
  */
 
-var flags = require("./flags");
-
 /**
  * Immutably reduce the given `...objs` into one object. The reduction is
  * applied from left to right, so `immutableUpdate({ a: 1 }, { a: 2 })` will
@@ -114,9 +112,7 @@ exports.makeInfallible = function(handler, name = handler.name) {
       if (name) {
         who += " " + name;
       }
-      if (!flags.quiet) {
-        exports.reportException(who, ex);
-      }
+      exports.reportException(who, ex);
       return undefined;
     }
   };

devtools/shared/flags.js

@@ -57,13 +57,6 @@ makePrefTrackedFlag(exports, "wantLogging", "devtools.debugger.log");
  */
 makePrefTrackedFlag(exports, "wantVerbose", "devtools.debugger.log.verbose");
 
-/**
- * Setting the "devtools.debugger.quiet" preference to true will turn off
- * logging for protocol errors that were caught and handled. These errors can
- * happen in normal operation when threads shut down.
- */
-makePrefTrackedFlag(exports, "quiet", "devtools.debugger.quiet");
-
 /**
  * Setting the "devtools.testing" preference to true will toggle on certain
  * behaviors that can differ from the production version of the code. These

devtools/shared/fronts/targets/target-mixin.js

@@ -12,8 +12,6 @@ loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools"
 loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true);
 loader.lazyRequireGetter(this, "getFront", "devtools/shared/protocol", true);
 
-const flags = require("../../flags");
-
 /**
  * A Target represents a debuggable context. It can be a browser tab, a tab on
  * a remote device, like a tab on Firefox for Android. But it can also be an add-on,
@@ -553,9 +551,7 @@ function TargetMixin(parentClass) {
           try {
             await this.detach();
           } catch (e) {
-            if (!flags.quiet) {
-              console.warn(`Error while detaching target: ${e.message}`);
-            }
+            console.warn(`Error while detaching target: ${e.message}`);
           }
         }
 
@@ -563,9 +559,7 @@ function TargetMixin(parentClass) {
           try {
             await this.threadClient.detach();
           } catch (e) {
-            if (!flags.quiet) {
-              console.warn(`Error while detaching the thread front: ${e.message}`);
-            }
+            console.warn(`Error while detaching the thread front: ${e.message}`);
           }
         }
 

devtools/shared/preferences/devtools-shared.js

@@ -32,7 +32,6 @@ pref("devtools.debugger.remote-enabled", true, sticky);
 // Disable remote debugging protocol logging
 pref("devtools.debugger.log", false);
 pref("devtools.debugger.log.verbose", false);
-pref("devtools.debugger.quiet", false);
 
 pref("devtools.debugger.remote-port", 6000);
 pref("devtools.debugger.remote-websocket", false);