Issue 1571 - Unit tests reference non-existing timeline.js file

chrome/content/common.js

Index: chrome/content/common.js
===================================================================
--- a/chrome/content/common.js
+++ b/chrome/content/common.js
@@ -78,57 +78,30 @@ function prepareFilterComponents(keepLis
   Filter.knownFilters = {__proto__: null};
   if (!keepListeners)
   {
     FilterNotifierGlobal.listeners = [];
   }
 
   defaultMatcher.clear();
   ElemHide.clear();
-
-  try
-  {
-    // Disable timeline functions, they slow down tests otherwise
-    let {TimeLine} = require("timeline");
-
-    this._backup.timelineLog = TimeLine.log;
-    this._backup.timelineEnter = TimeLine.enter;
-    this._backup.timelineLeave = TimeLine.leave;
-
-    TimeLine.log = function(){};
-    TimeLine.enter = function(){};
-    TimeLine.leave = function(){};
-  }
-  catch(e)
-  {
-    // TimeLine module might not be present, catch exceptions
-  }
 }
 
 function restoreFilterComponents()
 {
   let FilterNotifierGlobal = getModuleGlobal("filterNotifier");
 
   FilterStorage.subscriptions = this._backup.subscriptions;
   FilterStorage.knownSubscriptions = this._backup.storageKnown;
   Subscription.knownSubscriptions = this._backup.subscriptionsKnown;
   Filter.knownFilters = this._backup.filtersKnown;
   FilterNotifierGlobal.listeners = this._backup.listeners;
   Object.defineProperty(FilterStorage, "sourceFile", {value: this._backup.sourceFile, configurable: true});
 
   scheduleReinit();
-
-  if ("timelineLeave" in this._backup)
-  {
-    let {TimeLine} = require("timeline");
-
-    TimeLine.log = this._backup.timelineLog;
-    TimeLine.enter = this._backup.timelineEnter;
-    TimeLine.leave = this._backup.timelineLeave;
-  }
 }
 
 // Only reinit our data structures when all the tests are done to prevent
 // slowing down text execution
 let reinitScheduled = false;
 function scheduleReinit()
 {
   if (reinitScheduled)