5 files changed, 0 insertions, 108 deletions
diff --git a/components/nsBrowserGlue.js b/components/nsBrowserGlue.js
index c0e42fb..b49b05b 100644
--- a/components/nsBrowserGlue.js
+++ b/components/nsBrowserGlue.js
@@ -46,7 +46,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s
   ["NewTabUtils", "resource://gre/modules/NewTabUtils.jsm"],
   ["OS", "resource://gre/modules/osfile.jsm"],
   ["PageThumbs", "resource://gre/modules/PageThumbs.jsm"],
-  ["PdfJs", "resource://pdf.js/PdfJs.jsm"],
   ["PermissionUI", "resource:///modules/PermissionUI.jsm"],
   ["PlacesBackups", "resource://gre/modules/PlacesBackups.jsm"],
   ["PlacesUtils", "resource://gre/modules/PlacesUtils.jsm"],
@@ -919,19 +918,6 @@ BrowserGlue.prototype = {
 
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
-    // Initialize PdfJs when running in-process and remote. This only
-    // happens once since PdfJs registers global hooks. If the PdfJs
-    // extension is installed the init method below will be overridden
-    // leaving initialization to the extension.
-    // parent only: configure default prefs, set up pref observers, register
-    // pdf content handler, and initializes parent side message manager
-    // shim for privileged api access.
-    PdfJs.init(true);
-    // child only: similar to the call above for parent - register content
-    // handler and init message manager child shim for privileged api access.
-    // With older versions of the extension installed, this load will fail
-    // passively.
-    Services.ppmm.loadProcessScript("resource://pdf.js/pdfjschildbootstrap.js", true);
 
     if (AppConstants.platform == "win") {
       // For Windows 7, initialize the jump list module.
diff --git a/components/selfsupport/SelfSupportService.js b/components/selfsupport/SelfSupportService.js
deleted file mode 100644
index 26148c6..0000000
--- a/components/selfsupport/SelfSupportService.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 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/components/selfsupport/SelfSupportService.manifest b/components/selfsupport/SelfSupportService.manifest
deleted file mode 100644
index 0e87857..0000000
--- a/components/selfsupport/SelfSupportService.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {d30aae8b-f352-4de3-b936-bb9d875df0bb} SelfSupportService.js
-contract @mozilla.org/mozselfsupport;1 {d30aae8b-f352-4de3-b936-bb9d875df0bb}
diff --git a/components/selfsupport/moz.build b/components/selfsupport/moz.build
deleted file mode 100644
index f8923b0..0000000
--- a/components/selfsupport/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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',
-]
diff --git a/installer/allowed-dupes.mn b/installer/allowed-dupes.mn
index 7baa6eb..63a98f9 100644
--- a/installer/allowed-dupes.mn
+++ b/installer/allowed-dupes.mn
@@ -228,7 +228,3 @@ res/table-remove-column.gif
 res/table-remove-row-active.gif
 res/table-remove-row-hover.gif
 res/table-remove-row.gif
-# Aurora branding
-browser/chrome/browser/content/browser/defaultthemes/devedition.icon.png
-browser/chrome/browser/content/branding/icon64.png
-browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png