Properly clean up also the HAR collector

Author: janodvarko

lib/trigger-toolbox-overlay.js

@@ -72,6 +72,14 @@ const TriggerToolboxOverlay = Class(
 
     Trace.sysout("TriggerToolboxOverlay.onReady;", options);
 
+    // Platform support is needed here.
+    // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1184889
+    if (typeof getHarOverlay != "function") {
+      Cu.reportError("Platform support needed, see Bug: " +
+        "https://bugzilla.mozilla.org/show_bug.cgi?id=1184889");
+      return;
+    }
+
     let autoExportToFile = Services.prefs.getBoolPref(
       "devtools.netmonitor.har.enableAutoExportToFile");
 
@@ -150,21 +158,7 @@ const TriggerToolboxOverlay = Class(
   triggerExport: function(data) {
     Trace.sysout("TriggerToolboxOverlay.triggerExport;", data);
 
-    // Platform support is needed here.
-    // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1184889
-    if (typeof getHarOverlay != "function") {
-      Cu.reportError("Platform support needed, see Bug: " +
-        "https://bugzilla.mozilla.org/show_bug.cgi?id=1184889");
-      return;
-    }
-
     var harOverlay = getHarOverlay(this.toolbox);
-    if (!harOverlay) {
-      Trace.sysout("TriggerToolboxOverlay.triggerExport; ERROR " +
-        "no HAR overlay!", data);
-      return;
-    }
-
     if (!harOverlay.automation) {
       let pref1 = "devtools.netmonitor.har.enableAutoExportToFile";
       let pref2 = "extensions.netmonitor.har.enableAutomation";
@@ -208,7 +202,12 @@ const TriggerToolboxOverlay = Class(
   clear: function() {
     let panel = this.toolbox.getPanel("netmonitor");
 
-    // Clear the Network panel content if it exists.
+    // Clean up also the HAR collector.
+    var harOverlay = getHarOverlay(this.toolbox);
+    harOverlay.automation.resetCollector();
+
+    // Clear the Network panel content. The panel doesn't
+    // have to exist if the user doesn't select it yet.
     if (panel) {
       let view = panel.panelWin.NetMonitorView;
       view.RequestsMenu.clear();