--- a/toolkit/components/extensions/parent/ext-telemetry.js
+++ b/toolkit/components/extensions/parent/ext-telemetry.js
@@ -15,110 +15,84 @@ const SCALAR_TYPES = {
boolean: Ci.nsITelemetry.SCALAR_TYPE_BOOLEAN,
};
this.telemetry = class extends ExtensionAPI {
getAPI(context) {
return {
telemetry: {
submitPing(type, payload, options) {
- return new Promise((resolve, reject) => {
- try {
- TelemetryController.submitExternalPing(type, payload, options);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ TelemetryController.submitExternalPing(type, payload, options);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
canUpload() {
- return new Promise((resolve, reject) => {
- // Note: remove the ternary and direct pref check when
- // TelemetryController.canUpload() is implemented (bug 1440089).
- try {
- const result = ("canUpload" in TelemetryController) ?
- TelemetryController.canUpload() :
- Services.prefs.getBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, false);
- resolve(result);
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ // Note: remove the ternary and direct pref check when
+ // TelemetryController.canUpload() is implemented (bug 1440089).
+ try {
+ const result = ("canUpload" in TelemetryController) ?
+ TelemetryController.canUpload() :
+ Services.prefs.getBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, false);
+ return result;
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
scalarAdd(name, value) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.scalarAdd(name, value);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.scalarAdd(name, value);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
scalarSet(name, value) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.scalarSet(name, value);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.scalarSet(name, value);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
scalarSetMaximum(name, value) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.scalarSetMaximum(name, value);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.scalarSetMaximum(name, value);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
recordEvent(category, method, object, value, extra) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.recordEvent(category, method, object, value, extra);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.recordEvent(category, method, object, value, extra);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
registerScalars(category, data) {
- return new Promise((resolve, reject) => {
- try {
- // For each scalar in `data`, replace scalar.kind with
- // the appropriate nsITelemetry constant.
- Object.keys(data).forEach(scalar => {
- data[scalar].kind = SCALAR_TYPES[data[scalar].kind];
- });
- Services.telemetry.registerScalars(category, data);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ // For each scalar in `data`, replace scalar.kind with
+ // the appropriate nsITelemetry constant.
+ Object.keys(data).forEach(scalar => {
+ data[scalar].kind = SCALAR_TYPES[data[scalar].kind];
+ });
+ Services.telemetry.registerScalars(category, data);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
setEventRecordingEnabled(category, enabled) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.setEventRecordingEnabled(category, enabled);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.setEventRecordingEnabled(category, enabled);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
registerEvents(category, data) {
- return new Promise((resolve, reject) => {
- try {
- Services.telemetry.registerEvents(category, data);
- resolve();
- } catch (ex) {
- reject(new ExtensionUtils.ExtensionError(ex));
- }
- });
+ try {
+ Services.telemetry.registerEvents(category, data);
+ } catch (ex) {
+ throw new ExtensionUtils.ExtensionError(ex);
+ }
},
},
};
}
};