Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

3 files changed, 90 insertions, 0 deletions

diff --git a/application/basilisk/components/selfsupport/SelfSupportService.js b/application/basilisk/components/selfsupport/SelfSupportService.js
new file mode 100644
index 000000000..26148c6ff
--- /dev/null
+++ b/application/basilisk/components/selfsupport/SelfSupportService.js
@@ -0,0 +1,78 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+
+const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
+
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryArchive",
+                                  "resource://gre/modules/TelemetryArchive.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment",
+                                  "resource://gre/modules/TelemetryEnvironment.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryController",
+                                  "resource://gre/modules/TelemetryController.jsm");
+
+function MozSelfSupportInterface() {
+}
+
+MozSelfSupportInterface.prototype = {
+  classDescription: "MozSelfSupport",
+  classID: Components.ID("{d30aae8b-f352-4de3-b936-bb9d875df0bb}"),
+  contractID: "@mozilla.org/mozselfsupport;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer]),
+
+  _window: null,
+
+  init: function (window) {
+    this._window = window;
+  },
+
+  get healthReportDataSubmissionEnabled() {
+    return Preferences.get(PREF_FHR_UPLOAD_ENABLED, false);
+  },
+
+  set healthReportDataSubmissionEnabled(enabled) {
+    Preferences.set(PREF_FHR_UPLOAD_ENABLED, enabled);
+  },
+
+  resetPref: function(name) {
+    Services.prefs.clearUserPref(name);
+  },
+
+  resetSearchEngines: function() {
+    Services.search.restoreDefaultEngines();
+    Services.search.resetToOriginalDefaultEngine();
+  },
+
+  getTelemetryPingList: function() {
+    return this._wrapPromise(TelemetryArchive.promiseArchivedPingList());
+  },
+
+  getTelemetryPing: function(pingId) {
+    return this._wrapPromise(TelemetryArchive.promiseArchivedPingById(pingId));
+  },
+
+  getCurrentTelemetryEnvironment: function() {
+    const current = TelemetryEnvironment.currentEnvironment;
+    return new this._window.Promise(resolve => resolve(current));
+  },
+
+  getCurrentTelemetrySubsessionPing: function() {
+    const current = TelemetryController.getCurrentPingData(true);
+    return new this._window.Promise(resolve => resolve(current));
+  },
+
+  _wrapPromise: function(promise) {
+    return new this._window.Promise(
+      (resolve, reject) => promise.then(resolve, reject));
+  },
+}
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MozSelfSupportInterface]);
diff --git a/application/basilisk/components/selfsupport/SelfSupportService.manifest b/application/basilisk/components/selfsupport/SelfSupportService.manifest
new file mode 100644
index 000000000..0e87857e7
--- /dev/null
+++ b/application/basilisk/components/selfsupport/SelfSupportService.manifest
@@ -0,0 +1,2 @@
+component {d30aae8b-f352-4de3-b936-bb9d875df0bb} SelfSupportService.js
+contract @mozilla.org/mozselfsupport;1 {d30aae8b-f352-4de3-b936-bb9d875df0bb}
diff --git a/application/basilisk/components/selfsupport/moz.build b/application/basilisk/components/selfsupport/moz.build
new file mode 100644
index 000000000..f8923b081
--- /dev/null
+++ b/application/basilisk/components/selfsupport/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXTRA_COMPONENTS += [
+    'SelfSupportService.js',
+    'SelfSupportService.manifest',
+]