Bug 1323628 - Fix test_TelemetrySend.js failing and enable it again. r=chutten

MozReview-Commit-ID: AGRh5GCuHEK

toolkit/components/telemetry/TelemetrySend.jsm

@@ -919,7 +919,7 @@ var TelemetrySendImpl = {
     // Prevent the request channel from running though URLClassifier (bug 1296802)
     request.channel.loadFlags &= ~Ci.nsIChannel.LOAD_CLASSIFY_URI;
 
-    let startTime = monotonicNow();
+    const monotonicStartTime = monotonicNow();
     let deferred = PromiseUtils.defer();
 
     let onRequestFinished = (success, event) => {
@@ -932,7 +932,7 @@ var TelemetrySendImpl = {
       };
 
       this._pendingPingRequests.delete(id);
-      this._onPingRequestFinished(success, startTime, id, isPersisted)
+      this._onPingRequestFinished(success, monotonicStartTime, id, isPersisted)
         .then(() => onCompletion(),
               (error) => {
                 this._log.error("_doPing - request success: " + success + ", error: " + error);
@@ -984,7 +984,7 @@ var TelemetrySendImpl = {
     let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
                     .createInstance(Ci.nsIScriptableUnicodeConverter);
     converter.charset = "UTF-8";
-    startTime = new Date();
+    let startTime = new Date();
     let utf8Payload = converter.ConvertFromUnicode(JSON.stringify(networkPayload));
     utf8Payload += converter.Finish();
     Telemetry.getHistogramById("TELEMETRY_STRINGIFY").add(new Date() - startTime);

toolkit/components/telemetry/tests/unit/xpcshell.ini

@@ -52,7 +52,6 @@ tags = addons
 [test_ThreadHangStats.js]
 run-sequentially = Bug 1046307, test can fail intermittently when CPU load is high
 [test_TelemetrySend.js]
-skip-if = true # Bug 1323628
 [test_ChildHistograms.js]
 skip-if = os == "android"
 tags = addons