Bug 1434855 - Refactor HAR builder options; r=ochameau

MozReview-Commit-ID: FRcxp4XPFdf

--HG--
extra : rebase_source : 4b88ddf3b5c14b0d9f1cb8f71018cd556ebbe353

devtools/client/netmonitor/initializer.js

@@ -105,21 +105,11 @@ window.Netmonitor = {
    */
   getHar() {
     let { HarExporter } = require("devtools/client/netmonitor/src/har/har-exporter");
-    let {
-      getLongString,
-      getTabTarget,
-      getTimingMarker,
-      requestData,
-    } = connector;
-    let { form: { title, url } } = getTabTarget();
     let state = store.getState();
 
     let options = {
-      getString: getLongString,
+      connector,
       items: getSortedRequests(state),
-      requestData,
-      getTimingMarker,
-      title: title || url,
     };
 
     return HarExporter.getHar(options);
@@ -136,13 +126,8 @@ window.Netmonitor = {
     }
 
     let { HarExporter } = require("devtools/client/netmonitor/src/har/har-exporter");
-    let { getLongString, getTabTarget, requestData } = connector;
-    let { form: { title, url } } = getTabTarget();
-
     let options = {
-      getString: getLongString,
-      requestData,
-      title: title || url,
+      connector,
       includeResponseBodies: false,
       items: [getDisplayedRequestById(store.getState(), requestId)],
     };

devtools/client/netmonitor/src/har/har-exporter.js

@@ -186,10 +186,28 @@ const HarExporter = {
    * since it can involve additional RDP communication (e.g. resolving
    * long strings).
    */
-  buildHarData: function (options) {
+  buildHarData: async function (options) {
+    let { connector } = options;
+    let {
+      getTabTarget,
+    } = connector;
+    let {
+      form: { title, url }
+    } = getTabTarget();
+
+    options = {
+      ...options,
+      title: title || url,
+      getString: connector.getLongString,
+      getTimingMarker: connector.getTimingMarker,
+      requestData: connector.requestData,
+    };
+
     // Build HAR object from collected data.
     let builder = new HarBuilder(options);
-    return builder.build();
+    let result = await builder.build();
+
+    return result;
   },
 
   /**

devtools/client/netmonitor/src/widgets/RequestListContextMenu.js

@@ -409,20 +409,9 @@ class RequestListContextMenu {
   }
 
   getDefaultHarOptions(sortedRequests) {
-    let {
-      getLongString,
-      getTabTarget,
-      requestData,
-      getTimingMarker,
-    } = this.props.connector;
-    let { form: { title, url } } = getTabTarget();
-
     return {
-      getString: getLongString,
+      connector: this.props.connector,
       items: sortedRequests,
-      requestData,
-      getTimingMarker,
-      title: title || url,
     };
   }
 }