Backed out changeset 30c2b38c4a0f (bug 1366853) for frequently failin…

…g browser_source_map-no-race.js at line 39 with: newLoc is null. r=backout

devtools/client/framework/source-map-url-service.js

@@ -11,12 +11,10 @@
  *
  * @param {object} target
  *        The object the toolbox is debugging.
- * @param {object} threadClient
- *        The toolbox's thread client
  * @param {SourceMapService} sourceMapService
  *        The devtools-source-map functions
  */
-function SourceMapURLService(target, threadClient, sourceMapService) {
+function SourceMapURLService(target, sourceMapService) {
   this._target = target;
   this._sourceMapService = sourceMapService;
   this._urls = new Map();
@@ -26,14 +24,6 @@ function SourceMapURLService(target, threadClient, sourceMapService) {
 
   target.on("source-updated", this._onSourceUpdated);
   target.on("will-navigate", this.reset);
-
-  // Start fetching the sources now.
-  this._loadingPromise = new Promise(resolve => {
-    threadClient.getSources(({sources}) => {
-      // Just ignore errors.
-      resolve(sources);
-    });
-  });
 }
 
 /**
@@ -85,14 +75,6 @@ SourceMapURLService.prototype._onSourceUpdated = function (_, sourceEvent) {
  *        A promise resolving either to the original location, or null.
  */
 SourceMapURLService.prototype.originalPositionFor = async function (url, line, column) {
-  // Ensure the sources are loaded before replying.
-  await this._loadingPromise;
-
-  // Maybe we were shut down while waiting.
-  if (!this._urls) {
-    return null;
-  }
-
   const urlInfo = this._urls.get(url);
   if (!urlInfo) {
     return null;

devtools/client/framework/test/browser.ini

@@ -13,16 +13,13 @@ support-files =
   code_binary_search.map
   code_binary_search_absolute.js
   code_binary_search_absolute.map
-  code_bundle_no_race.js
-  code_bundle_no_race.js.map
   code_bundle_reload_1.js
   code_bundle_reload_1.js.map
   code_bundle_reload_2.js
   code_bundle_reload_2.js.map
   code_inline_bundle.js
   code_inline_original.js
   code_math.js
-  code_no_race.js
   code_reload_1.js
   code_reload_2.js
   doc_empty-tab-01.html
@@ -55,7 +52,6 @@ support-files =
 [browser_source_map-01.js]
 [browser_source_map-absolute.js]
 [browser_source_map-inline.js]
-[browser_source_map-no-race.js]
 [browser_source_map-reload.js]
 [browser_target_from_url.js]
 [browser_target_events.js]

devtools/client/framework/toolbox.js

@@ -560,8 +560,7 @@ Toolbox.prototype = {
     if (!sourceMaps) {
       return null;
     }
-    this._sourceMapURLService = new SourceMapURLService(this._target, this.threadClient,
-                                                        sourceMaps);
+    this._sourceMapURLService = new SourceMapURLService(this._target, sourceMaps);
     return this._sourceMapURLService;
   },