Backed out changeset 258cff340229 (bug 1200798) for new intermittent test failures in browser_dbg_breakpoints-button-02.js

devtools/client/debugger/debugger-commands.js

@@ -537,15 +537,17 @@ exports.items.push({
       const blackBoxed = [];
 
       for (let source of toBlackBox) {
-        dbg.blackbox(source, cmd.clientMethod === "blackBox").then(() => {
-          blackBoxed.push(source.url);
-        }, err => {
-          blackBoxed.push(lookup("ErrorDesc") + " " + source.url);
-        }).then(() => {
+        activeThread.source(source)[cmd.clientMethod](function({ error }) {
+          if (error) {
+            blackBoxed.push(lookup("ErrorDesc") + " " + source.url);
+          } else {
+            blackBoxed.push(source.url);
+          }
+
           if (toBlackBox.length === blackBoxed.length) {
             displayResults();
           }
-        })
+        });
       }
 
       // List the results for the user.