From 45b716e162b55cd9c3d76d285ed1632d2ff3050c Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Mon, 5 Oct 2015 14:40:15 +0100
Subject: [PATCH 01/35] Bug 1210707 - Feedback view no longer allows closing
 the window and avoiding leaving feedback. r=mikedeboer

---
 .../loop/content/js/conversationAppStore.js         |  3 ++-
 .../test/desktop-local/conversationAppStore_test.js | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/browser/components/loop/content/js/conversationAppStore.js b/browser/components/loop/content/js/conversationAppStore.js
index e6a40d147d5c..bc37f2addec5 100644
--- a/browser/components/loop/content/js/conversationAppStore.js
+++ b/browser/components/loop/content/js/conversationAppStore.js
@@ -147,7 +147,8 @@ loop.store.ConversationAppStore = (function() {
           this._dispatcher.dispatch(new loop.shared.actions.HangupCall());
           break;
         case "room":
-          if (this._activeRoomStore.getStoreState().used) {
+          if (this._activeRoomStore.getStoreState().used &&
+              !this._storeState.showFeedbackForm) {
             this._dispatcher.dispatch(new loop.shared.actions.LeaveRoom());
           } else {
             loop.shared.mixins.WindowCloseMixin.closeWindow();
diff --git a/browser/components/loop/test/desktop-local/conversationAppStore_test.js b/browser/components/loop/test/desktop-local/conversationAppStore_test.js
index 5ed80b061eca..1ad14e01be1f 100644
--- a/browser/components/loop/test/desktop-local/conversationAppStore_test.js
+++ b/browser/components/loop/test/desktop-local/conversationAppStore_test.js
@@ -250,6 +250,19 @@ describe("loop.store.ConversationAppStore", function () {
         sinon.assert.notCalled(loop.shared.mixins.WindowCloseMixin.closeWindow);
       });
 
+      it("should close the window when a room was used and it showed feedback", function() {
+        store.setStoreState({
+          showFeedbackForm: true,
+          windowType: "room"
+        });
+        roomUsed = true;
+
+        store.LoopHangupNowHandler();
+
+        sinon.assert.notCalled(dispatcher.dispatch);
+        sinon.assert.calledOnce(loop.shared.mixins.WindowCloseMixin.closeWindow);
+      });
+
       it("should close the window when a room was not used", function() {
         store.setStoreState({ windowType: "room" });
 

From 8de4febb074cd58db922feac3481669a1414e280 Mon Sep 17 00:00:00 2001
From: Manuel Casas <manuel.casasbarrado@gmail.com>
Date: Mon, 5 Oct 2015 14:40:15 +0100
Subject: [PATCH 02/35] Bug 1172662 - ICE failures occuring in Loop
 conversations should be reported to the user. r=Standard8

---
 .../loop/content/js/conversationViews.js      |  2 +
 .../loop/content/js/conversationViews.jsx     |  2 +
 .../components/loop/content/js/roomViews.js   | 11 ++++-
 .../components/loop/content/js/roomViews.jsx  | 11 ++++-
 .../loop/content/shared/js/otSdkDriver.js     |  7 +++
 .../loop/content/shared/js/utils.js           |  3 +-
 .../content/js/standaloneRoomViews.js         |  2 +
 .../content/js/standaloneRoomViews.jsx        |  2 +
 .../content/l10n/en-US/loop.properties        |  1 +
 .../desktop-local/conversationViews_test.js   | 10 +++++
 .../loop/test/desktop-local/roomViews_test.js | 12 ++++-
 .../loop/test/shared/otSdkDriver_test.js      | 45 +++++++++++++++++++
 .../standalone/standaloneRoomViews_test.js    | 11 +++++
 .../en-US/chrome/browser/loop/loop.properties |  1 +
 14 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/browser/components/loop/content/js/conversationViews.js b/browser/components/loop/content/js/conversationViews.js
index 6c1245dc194f..e5b6d92f2c4d 100644
--- a/browser/components/loop/content/js/conversationViews.js
+++ b/browser/components/loop/content/js/conversationViews.js
@@ -404,6 +404,8 @@ loop.conversationViews = (function(mozL10n) {
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
+        case FAILURE_DETAILS.ICE_FAILED:
+          return mozL10n.get("ice_failure_message");
         default:
           return mozL10n.get("generic_failure_message");
       }
diff --git a/browser/components/loop/content/js/conversationViews.jsx b/browser/components/loop/content/js/conversationViews.jsx
index 642c1282670d..262218453f69 100644
--- a/browser/components/loop/content/js/conversationViews.jsx
+++ b/browser/components/loop/content/js/conversationViews.jsx
@@ -404,6 +404,8 @@ loop.conversationViews = (function(mozL10n) {
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
+        case FAILURE_DETAILS.ICE_FAILED:
+          return mozL10n.get("ice_failure_message");
         default:
           return mozL10n.get("generic_failure_message");
       }
diff --git a/browser/components/loop/content/js/roomViews.js b/browser/components/loop/content/js/roomViews.js
index a14a18a9a7ad..31c2f8215077 100644
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -8,6 +8,7 @@ loop.roomViews = (function(mozL10n) {
 
   var ROOM_STATES = loop.store.ROOM_STATES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
+  var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
   var sharedActions = loop.shared.actions;
   var sharedMixins = loop.shared.mixins;
   var sharedUtils = loop.shared.utils;
@@ -99,6 +100,14 @@ loop.roomViews = (function(mozL10n) {
         { id: "feedback" },
         { id: "help" }
       ];
+
+      var btnTitle;
+      if (this.props.failureReason === FAILURE_DETAILS.ICE_FAILED) {
+        btnTitle = mozL10n.get("retry_call_button");
+      } else {
+        btnTitle = mozL10n.get("rejoin_button");
+      }
+
       return (
         React.createElement("div", {className: "room-failure"}, 
           React.createElement(loop.conversationViews.FailureInfoView, {
@@ -106,7 +115,7 @@ loop.roomViews = (function(mozL10n) {
           React.createElement("div", {className: "btn-group call-action-group"}, 
             React.createElement("button", {className: "btn btn-info btn-rejoin", 
                     onClick: this.handleRejoinCall}, 
-              mozL10n.get("rejoin_button")
+              btnTitle
             )
           ), 
           React.createElement(loop.shared.views.SettingsControlButton, {
diff --git a/browser/components/loop/content/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx
index 49c54a07dd55..627412fb316c 100644
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -8,6 +8,7 @@ loop.roomViews = (function(mozL10n) {
 
   var ROOM_STATES = loop.store.ROOM_STATES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
+  var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
   var sharedActions = loop.shared.actions;
   var sharedMixins = loop.shared.mixins;
   var sharedUtils = loop.shared.utils;
@@ -99,6 +100,14 @@ loop.roomViews = (function(mozL10n) {
         { id: "feedback" },
         { id: "help" }
       ];
+
+      var btnTitle;
+      if (this.props.failureReason === FAILURE_DETAILS.ICE_FAILED) {
+        btnTitle = mozL10n.get("retry_call_button");
+      } else {
+        btnTitle = mozL10n.get("rejoin_button");
+      }
+
       return (
         <div className="room-failure">
           <loop.conversationViews.FailureInfoView
@@ -106,7 +115,7 @@ loop.roomViews = (function(mozL10n) {
           <div className="btn-group call-action-group">
             <button className="btn btn-info btn-rejoin"
                     onClick={this.handleRejoinCall}>
-              {mozL10n.get("rejoin_button")}
+              {btnTitle}
             </button>
           </div>
           <loop.shared.views.SettingsControlButton
diff --git a/browser/components/loop/content/shared/js/otSdkDriver.js b/browser/components/loop/content/shared/js/otSdkDriver.js
index 3640adc7380a..0b7d4833329e 100644
--- a/browser/components/loop/content/shared/js/otSdkDriver.js
+++ b/browser/components/loop/content/shared/js/otSdkDriver.js
@@ -928,6 +928,13 @@ loop.OTSdkDriver = (function() {
 
     _onOTException: function(event) {
       switch (event.code) {
+        case OT.ExceptionCodes.PUBLISHER_ICE_WORKFLOW_FAILED:
+        case OT.ExceptionCodes.SUBSCRIBER_ICE_WORKFLOW_FAILED:
+          this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
+            reason: FAILURE_DETAILS.ICE_FAILED
+          }));
+          this._notifyMetricsEvent("sdk.exception." + event.code);
+          break;
         case OT.ExceptionCodes.UNABLE_TO_PUBLISH:
           if (event.message === "GetUserMedia") {
             // We free up the publisher here in case the store wants to try
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index 35e92ebcc6d5..96a334757a9e 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -84,7 +84,8 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
     // TOS_FAILURE reflects the sdk error code 1026:
     // https://tokbox.com/developer/sdks/js/reference/ExceptionEvent.html
     TOS_FAILURE: "reason-tos-failure",
-    UNKNOWN: "reason-unknown"
+    UNKNOWN: "reason-unknown",
+    ICE_FAILED: "reason-ice-failed"
   };
 
   var ROOM_INFO_FAILURES = {
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 1df6509323ff..4312a107296b 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -158,6 +158,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
+        case FAILURE_DETAILS.ICE_FAILED:
+          return mozL10n.get("rooms_ice_failure_message");
         default:
           return mozL10n.get("status_error");
       }
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index 272ae3f8c366..eaf28c262072 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -158,6 +158,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
+        case FAILURE_DETAILS.ICE_FAILED:
+          return mozL10n.get("rooms_ice_failure_message");
         default:
           return mozL10n.get("status_error");
       }
diff --git a/browser/components/loop/standalone/content/l10n/en-US/loop.properties b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
index d768541644f7..7cca0b704824 100644
--- a/browser/components/loop/standalone/content/l10n/en-US/loop.properties
+++ b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
@@ -72,6 +72,7 @@ rooms_unavailable_notification_message=Sorry, you cannot join this conversation.
 rooms_media_denied_message=We could not get access to your microphone or camera. Please reload the page to try again.
 room_information_failure_not_available=No information about this conversation is available. Please request a new link from the person who sent it to you.
 room_information_failure_unsupported_browser=Your browser cannot access any information about this conversation. Please make sure you're using the latest version.
+rooms_ice_failure_message=Connection failed. Your firewall may be blocking calls.
 
 ## LOCALIZATION_NOTE(rooms_read_while_wait_offer): This string is followed by a
 # tile/offer image and title that are provided by a separate service that has
diff --git a/browser/components/loop/test/desktop-local/conversationViews_test.js b/browser/components/loop/test/desktop-local/conversationViews_test.js
index 31019d3c43a4..e903a88962fa 100644
--- a/browser/components/loop/test/desktop-local/conversationViews_test.js
+++ b/browser/components/loop/test/desktop-local/conversationViews_test.js
@@ -351,6 +351,16 @@ describe("loop.conversationViews", function () {
 
       expect(extraFailureMessage.textContent).eql("Fake failure message");
     });
+
+    it("should display an ICE failure message", function() {
+      view = mountTestComponent({
+        failureReason: FAILURE_DETAILS.ICE_FAILED
+      });
+
+      var message = view.getDOMNode().querySelector(".failure-info-message");
+
+      expect(message.textContent).eql("ice_failure_message");
+    });
   });
 
   describe("DirectCallFailureView", function() {
diff --git a/browser/components/loop/test/desktop-local/roomViews_test.js b/browser/components/loop/test/desktop-local/roomViews_test.js
index 3c16bf304f69..9af034b31665 100644
--- a/browser/components/loop/test/desktop-local/roomViews_test.js
+++ b/browser/components/loop/test/desktop-local/roomViews_test.js
@@ -142,7 +142,7 @@ describe("loop.roomViews", function () {
     function mountTestComponent(props) {
       props = _.extend({
         dispatcher: dispatcher,
-        failureReason: FAILURE_DETAILS.UNKNOWN,
+        failureReason: props && props.failureReason || FAILURE_DETAILS.UNKNOWN,
         mozLoop: fakeMozLoop
       });
       return TestUtils.renderIntoDocument(
@@ -177,6 +177,16 @@ describe("loop.roomViews", function () {
         new sharedActions.JoinRoom());
     });
 
+    it("should render retry button when an ice failure is dispatched", function() {
+      view = mountTestComponent({
+        failureReason: FAILURE_DETAILS.ICE_FAILED
+      });
+
+      var retryBtn = view.getDOMNode().querySelector(".btn-rejoin");
+
+      expect(retryBtn.textContent).eql("retry_call_button");
+    });
+
     it("should play a failure sound, once", function() {
       view = mountTestComponent();
 
diff --git a/browser/components/loop/test/shared/otSdkDriver_test.js b/browser/components/loop/test/shared/otSdkDriver_test.js
index b562b7bb13f5..3d53ab7574df 100644
--- a/browser/components/loop/test/shared/otSdkDriver_test.js
+++ b/browser/components/loop/test/shared/otSdkDriver_test.js
@@ -1661,6 +1661,51 @@ describe("loop.OTSdkDriver", function () {
             }));
         });
       });
+
+      describe("ICE failed", function() {
+        it("should dispatch a ConnectionFailure action (Publisher)", function() {
+          sdk.trigger("exception", {
+            code: OT.ExceptionCodes.PUBLISHER_ICE_WORKFLOW_FAILED,
+            message: "ICE failed"
+          });
+
+          sinon.assert.calledTwice(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.ConnectionFailure({
+              reason: FAILURE_DETAILS.ICE_FAILED
+            }));
+        });
+
+        it("should dispatch a ConnectionFailure action (Subscriber)", function() {
+          sdk.trigger("exception", {
+            code: OT.ExceptionCodes.SUBSCRIBER_ICE_WORKFLOW_FAILED,
+            message: "ICE failed"
+          });
+
+          sinon.assert.calledTwice(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.ConnectionFailure({
+              reason: FAILURE_DETAILS.ICE_FAILED
+            }));
+        });
+
+        it("should notify metrics", function() {
+          sdk.trigger("exception", {
+            code: OT.ExceptionCodes.PUBLISHER_ICE_WORKFLOW_FAILED,
+            message: "ICE failed"
+          });
+
+          sinon.assert.calledTwice(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.ConnectionStatus({
+              event: "sdk.exception." + OT.ExceptionCodes.PUBLISHER_ICE_WORKFLOW_FAILED,
+              state: "starting",
+              connections: 0,
+              sendStreams: 0,
+              recvStreams: 0
+            }));
+        });
+      });
     });
   });
 
diff --git a/browser/components/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
index a73da0f79e56..c2fc73f43f65 100644
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -652,6 +652,17 @@ describe("loop.standaloneRoomViews", function() {
           TestUtils.findRenderedComponentWithType(view,
             loop.standaloneRoomViews.StandaloneRoomFailureView);
         });
+
+        it("should display ICE failure message", function() {
+          activeRoomStore.setStoreState({
+            roomState: ROOM_STATES.FAILED,
+            failureReason: FAILURE_DETAILS.ICE_FAILED
+          });
+
+          var ice_failed_message = view.getDOMNode().querySelector(".failed-room-message").textContent;
+          expect(ice_failed_message).eql("rooms_ice_failure_message");
+          expect(view.getDOMNode().querySelector(".btn-info")).not.eql(null);
+        });
       });
 
       describe("Join button", function() {
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index bb7cb84ab225..0c24eafd83a7 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -298,6 +298,7 @@ cannot_start_call_session_not_ready=Can't start call, session is not ready.
 network_disconnected=The network connection terminated abruptly.
 connection_error_see_console_notification=Call failed; see console for details.
 no_media_failure_message=No camera or microphone found.
+ice_failure_message=Connection failed. Your firewall may be blocking calls.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels

From 62273ce1e4b186654dc27ab369ca7b4de021030a Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 5 Oct 2015 11:59:01 +0200
Subject: [PATCH 03/35] Bug 1197147 - Gradle build: Use version 8.1 of Google
 Play Services. r=nalexander

--HG--
extra : commitid : Cugw33Fj8QG
extra : rebase_source : 404811c62a45b089095af8e4b4e952fdb183bb78
---
 mobile/android/gradle/base/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle
index 73681bd86c09..aa9803412957 100644
--- a/mobile/android/gradle/base/build.gradle
+++ b/mobile/android/gradle/base/build.gradle
@@ -76,8 +76,9 @@ dependencies {
 
     if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
         compile 'com.android.support:mediarouter-v7:22.2.1'
-        compile 'com.google.android.gms:play-services-base:7.8.0'
-        compile 'com.google.android.gms:play-services-cast:7.8.0'
+        compile 'com.google.android.gms:play-services-basement:8.1.0'
+        compile 'com.google.android.gms:play-services-base:8.1.0'
+        compile 'com.google.android.gms:play-services-cast:8.1.0'
     }
 
     compile project(':branding')

From faf41dd8da5d2c841d93f250218b1e140e9033b8 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 5 Oct 2015 14:59:53 +0200
Subject: [PATCH 04/35] Bug 1197147 - Mach build: Use version 8.1 of Google
 Play Services. r=nalexander

This patch also adds the new base (sic) library play-services-basement.

Note that the package names have changed too:
* play-services-base: com.google.gms -> com.google.gms.base
* play-services-basement: * -> com.google.gms

--HG--
extra : commitid : EcmxZA10rzV
extra : rebase_source : f39b361807a0b8227f3fb9a6d73e066241c8e36c
---
 build/autoconf/android.m4       | 5 +++--
 mobile/android/base/Makefile.in | 3 +++
 mobile/android/base/moz.build   | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index c046b8846c88..cb4eb2dbf415 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -295,8 +295,9 @@ AC_DEFUN([MOZ_ANDROID_GOOGLE_PLAY_SERVICES],
 if test -n "$MOZ_NATIVE_DEVICES" ; then
     AC_SUBST(MOZ_NATIVE_DEVICES)
 
-    MOZ_ANDROID_AAR(play-services-base, 7.8.0, google, com/google/android/gms)
-    MOZ_ANDROID_AAR(play-services-cast, 7.8.0, google, com/google/android/gms)
+    MOZ_ANDROID_AAR(play-services-base, 8.1.0, google, com/google/android/gms)
+    MOZ_ANDROID_AAR(play-services-basement, 8.1.0, google, com/google/android/gms)
+    MOZ_ANDROID_AAR(play-services-cast, 8.1.0, google, com/google/android/gms)
     MOZ_ANDROID_AAR(mediarouter-v7, 22.2.1, android, com/android/support, REQUIRED_INTERNAL_IMPL)
 fi
 
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index e19d5cbeaf5e..0ee6c11e1de1 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -66,6 +66,7 @@ JAVA_CLASSPATH += \
 ifdef MOZ_NATIVE_DEVICES
     JAVA_CLASSPATH += \
         $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \
+        $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \
         $(ANDROID_PLAY_SERVICES_CAST_AAR_LIB) \
         $(ANDROID_MEDIAROUTER_V7_AAR_LIB) \
         $(ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB) \
@@ -86,6 +87,7 @@ java_bundled_libs := \
 ifdef MOZ_NATIVE_DEVICES
     java_bundled_libs += \
         $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \
+        $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \
         $(ANDROID_PLAY_SERVICES_CAST_AAR_LIB) \
         $(ANDROID_MEDIAROUTER_V7_AAR_LIB) \
         $(ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB) \
@@ -372,6 +374,7 @@ generated/android/support/v7/appcompat/R.java: .aapt.deps ;
 generated/android/support/v7/mediarouter/R.java: .aapt.deps ;
 generated/android/support/v7/recyclerview/R.java: .aapt.deps ;
 generated/com/google/android/gms/R.java: .aapt.deps ;
+generated/com/google/android/gms/base/R.java: .aapt.deps ;
 generated/com/google/android/gms/cast/R.java: .aapt.deps ;
 
 gecko.ap_: .aapt.deps ;
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index a11fd81f3bab..8a09891e005b 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -654,6 +654,7 @@ moz_native_devices_jars = [
     CONFIG['ANDROID_MEDIAROUTER_V7_AAR_LIB'],
     CONFIG['ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB'],
     CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR_LIB'],
+    CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB'],
     CONFIG['ANDROID_PLAY_SERVICES_CAST_AAR_LIB'],
 ]
 moz_native_devices_sources = [
@@ -672,8 +673,13 @@ if CONFIG['MOZ_NATIVE_DEVICES']:
         resjar.generated_sources += ['android/support/v7/mediarouter/R.java']
 
     if CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR']:
-        ANDROID_EXTRA_PACKAGES += ['com.google.android.gms']
+        ANDROID_EXTRA_PACKAGES += ['com.google.android.gms.base']
         ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR_RES']]
+        resjar.generated_sources += ['com/google/android/gms/base/R.java']
+
+    if CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR']:
+        ANDROID_EXTRA_PACKAGES += ['com.google.android.gms']
+        ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_RES']]
         resjar.generated_sources += ['com/google/android/gms/R.java']
 
     if CONFIG['ANDROID_PLAY_SERVICES_CAST_AAR']:

From 52ef7844e3b00142a7dcc8049721eb4d6f2c1120 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 5 Oct 2015 15:00:21 +0200
Subject: [PATCH 05/35] Bug 1210755 - Gradle build: Compile with SDK version 23
 and use build tools 23.0.1. r=nalexander

--HG--
extra : commitid : 9z7e5mbgX8m
extra : rebase_source : f8c2162458d68ab83d639a0b0b2fc758f627822a
---
 mobile/android/gradle/app/build.gradle                    | 4 ++--
 mobile/android/gradle/base/build.gradle                   | 4 ++--
 mobile/android/gradle/branding/build.gradle               | 4 ++--
 mobile/android/gradle/preprocessed_code/build.gradle      | 4 ++--
 mobile/android/gradle/preprocessed_resources/build.gradle | 4 ++--
 mobile/android/gradle/thirdparty/build.gradle             | 4 ++--
 mobile/android/gradle/thirdparty_adjust_sdk/build.gradle  | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mobile/android/gradle/app/build.gradle b/mobile/android/gradle/app/build.gradle
index 3703438e22cc..a43c76019df9 100644
--- a/mobile/android/gradle/app/build.gradle
+++ b/mobile/android/gradle/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle
index aa9803412957..cbd598140812 100644
--- a/mobile/android/gradle/base/build.gradle
+++ b/mobile/android/gradle/base/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/branding/build.gradle b/mobile/android/gradle/branding/build.gradle
index 6c2e1842e1ec..550de863175d 100644
--- a/mobile/android/gradle/branding/build.gradle
+++ b/mobile/android/gradle/branding/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/preprocessed_code/build.gradle b/mobile/android/gradle/preprocessed_code/build.gradle
index bb8336b15e93..7b1869661541 100644
--- a/mobile/android/gradle/preprocessed_code/build.gradle
+++ b/mobile/android/gradle/preprocessed_code/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/preprocessed_resources/build.gradle b/mobile/android/gradle/preprocessed_resources/build.gradle
index e6080faa2042..c7782be5e6e5 100644
--- a/mobile/android/gradle/preprocessed_resources/build.gradle
+++ b/mobile/android/gradle/preprocessed_resources/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/thirdparty/build.gradle b/mobile/android/gradle/thirdparty/build.gradle
index e85e8ab5e7a1..e11a8079cfbe 100644
--- a/mobile/android/gradle/thirdparty/build.gradle
+++ b/mobile/android/gradle/thirdparty/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22
diff --git a/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle b/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle
index cc9b25fdee37..ebc9b26517e0 100644
--- a/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle
+++ b/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         targetSdkVersion 22

From f95aacebb1fa575dfdf11948b4602d64103feca0 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 5 Oct 2015 15:01:23 +0200
Subject: [PATCH 06/35] Bug 1210755 - Mach build: Compile with SDK version 23
 and use build tools 23.0.1. r=nalexander

--HG--
extra : commitid : KSzxhqJn0iI
extra : rebase_source : ccd59642dc6025fd2fec574ef9502a15670fb43e
---
 configure.in                      | 2 +-
 python/mozboot/mozboot/android.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 69dcd7eacf46..2c86a425ffdb 100644
--- a/configure.in
+++ b/configure.in
@@ -4095,7 +4095,7 @@ if test -z "$gonkdir" ; then
             ;;
         esac
 
-        MOZ_ANDROID_SDK(22, 22.0.1)
+        MOZ_ANDROID_SDK(23, 23.0.1)
         ;;
     esac
 fi
diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py
index aec6ade0737c..e4da0a57b293 100644
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -14,8 +14,8 @@ import subprocess
 # These are the platform and build-tools versions for building
 # mobile/android, respectively. Try to keep these in synch with the
 # build system and Mozilla's automation.
-ANDROID_TARGET_SDK = '22'
-ANDROID_BUILD_TOOLS_VERSION = '22.0.1'
+ANDROID_TARGET_SDK = '23'
+ANDROID_BUILD_TOOLS_VERSION = '23.0.1'
 
 # These are the "Android packages" needed for building Firefox for Android.
 # Use |android list sdk --extended| to see these identifiers.

From f1f8a8717ef10a1fd82a016ac672875ba5518c2e Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 5 Oct 2015 15:01:49 +0200
Subject: [PATCH 07/35] Bug 1210755 - Touch CLOBBER after updating Android
 build. r=trivial

--HG--
extra : commitid : GNAwQQnuLgi
extra : rebase_source : a32ac7f395a4477993b37dfc4d0c75b133768848
---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index e0e8a2acfe89..d7ecd607a4e4 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1182727 - Changed toolchain, needs clobber again :(
+Bug 1210755 - Android build: Switch to Android 6.0 SDK / API 23

From 9932ee4e8ca89f6d4b7170e9a59d1bbe0a2f70f0 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 5 Oct 2015 15:30:01 +0200
Subject: [PATCH 08/35] Bug 1211219: fix invalid CSS declaration that
 accidentally got in with work done in bug 1184921. r=Standard8

---
 browser/themes/shared/social/chat.inc.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/shared/social/chat.inc.css b/browser/themes/shared/social/chat.inc.css
index 38e291bf1213..67db29556478 100644
--- a/browser/themes/shared/social/chat.inc.css
+++ b/browser/themes/shared/social/chat.inc.css
@@ -84,7 +84,7 @@
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover");
 }
 
-:hover,:hover:active) {
+.chat-minimize-button:hover:active {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active");
 }
 

From f2ab0b3ffc2771ea26b2e2347d94fd0eb99dc740 Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Fri, 2 Oct 2015 05:50:00 +0200
Subject: [PATCH 09/35] Bug 1174674 - Clear out all pending pings when FHR is
 deactived. r=gfritzsche

---
 .../telemetry/TelemetryController.jsm         |  22 ++-
 .../components/telemetry/TelemetrySend.jsm    |  58 ++++++-
 .../components/telemetry/TelemetryStorage.jsm | 150 +++++++++++++++---
 3 files changed, 197 insertions(+), 33 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 18a37f46092a..dcfb77ec217d 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -909,9 +909,25 @@ var Impl = {
       // There's nothing we should do if we are enabling upload.
       return;
     }
-    // Send the deletion ping.
-    this._log.trace("_onUploadPrefChange - Sending deletion ping.");
-    this.submitExternalPing(PING_TYPE_DELETION, {}, { addClientId: true });
+
+    let p = Task.spawn(function*() {
+      try {
+        // Clear the current pings.
+        yield TelemetrySend.clearCurrentPings();
+
+        // Remove all the pending pings, but not the deletion ping.
+        yield TelemetryStorage.runRemovePendingPingsTask();
+      } catch (e) {
+        this._log.error("_onUploadPrefChange - error clearing pending pings", e);
+      } finally {
+        // Always send the deletion ping.
+        this._log.trace("_onUploadPrefChange - Sending deletion ping.");
+        this.submitExternalPing(PING_TYPE_DELETION, {}, { addClientId: true });
+      }
+    }.bind(this));
+
+    this._shutdownBarrier.client.addBlocker(
+      "TelemetryController: removing pending pings after data upload was disabled", p);
   },
 
   _attachObservers: function() {
diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm
index 3d4ff99195db..e93ab41178dd 100644
--- a/toolkit/components/telemetry/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/TelemetrySend.jsm
@@ -234,6 +234,13 @@ this.TelemetrySend = {
     return TelemetrySendImpl.setServer(server);
   },
 
+  /**
+   * Clear out unpersisted, yet to be sent, pings and cancel outgoing ping requests.
+   */
+  clearCurrentPings: function() {
+    return TelemetrySendImpl.clearCurrentPings();
+  },
+
   /**
    * Only used in tests to wait on outgoing pending pings.
    */
@@ -326,16 +333,19 @@ var SendScheduler = {
     return Promise.resolve(this._sendTask);
   },
 
+  start: function() {
+    this._log.trace("start");
+    this._sendsFailed = false;
+    this._backoffDelay = SEND_TICK_DELAY;
+    this._shutdown = false;
+  },
+
   /**
    * Only used for testing, resets the state to emulate a restart.
    */
   reset: function() {
     this._log.trace("reset");
-    return this.shutdown().then(() => {
-      this._sendsFailed = false;
-      this._backoffDelay = SEND_TICK_DELAY;
-      this._shutdown = false;
-    });
+    return this.shutdown().then(() => this.start());
   },
 
   /**
@@ -521,6 +531,8 @@ var SendScheduler = {
 
 var TelemetrySendImpl = {
   _sendingEnabled: false,
+  // Tracks the shutdown state.
+  _shutdown: false,
   _logger: null,
   // This tracks all pending ping requests to the server.
   _pendingPingRequests: new Map(),
@@ -616,6 +628,8 @@ var TelemetrySendImpl = {
    }),
 
   shutdown: Task.async(function*() {
+    this._shutdown = true;
+
     for (let topic of this.OBSERVER_TOPICS) {
       try {
         Services.obs.removeObserver(this, topic);
@@ -643,8 +657,8 @@ var TelemetrySendImpl = {
   reset: function() {
     this._log.trace("reset");
 
+    this._shutdown = false;
     this._currentPings = new Map();
-
     this._overduePingCount = 0;
 
     const histograms = [
@@ -706,6 +720,38 @@ var TelemetrySendImpl = {
     this._server = server;
   },
 
+  /**
+   * Clear out unpersisted, yet to be sent, pings and cancel outgoing ping requests.
+   */
+  clearCurrentPings: Task.async(function*() {
+    if (this._shutdown) {
+      this._log.trace("clearCurrentPings - in shutdown, bailing out");
+      return;
+    }
+
+    // Temporarily disable the scheduler. It must not try to reschedule ping sending
+    // while we're deleting them.
+    yield SendScheduler.shutdown();
+
+    // Now that the ping activity has settled, abort outstanding ping requests.
+    this._cancelOutgoingRequests();
+
+    // Also, purge current pings.
+    this._currentPings.clear();
+
+    // We might have been interrupted and shutdown could have been started.
+    // We need to bail out in that case to avoid triggering send activity etc.
+    // at unexpected times.
+    if (this._shutdown) {
+      this._log.trace("clearCurrentPings - in shutdown, not spinning SendScheduler up again");
+      return;
+    }
+
+    // Enable the scheduler again and spin the send task.
+    SendScheduler.start();
+    SendScheduler.triggerSendingPings(true);
+  }),
+
   _cancelOutgoingRequests: function() {
     // Abort any pending ping XHRs.
     for (let [id, request] of this._pendingPingRequests) {
diff --git a/toolkit/components/telemetry/TelemetryStorage.jsm b/toolkit/components/telemetry/TelemetryStorage.jsm
index baf883878e5d..be9c51ec476c 100644
--- a/toolkit/components/telemetry/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/TelemetryStorage.jsm
@@ -116,22 +116,9 @@ var Policy = {
  * always resolves its promise with undefined, and never rejects.
  */
 function waitForAll(it) {
-  let list = Array.from(it);
-  let pending = list.length;
-  if (pending == 0) {
-    return Promise.resolve();
-  }
-  return new Promise(function(resolve, reject) {
-    let rfunc = () => {
-      --pending;
-      if (pending == 0) {
-        resolve();
-      }
-    };
-    for (let p of list) {
-      p.then(rfunc, rfunc);
-    }
-  });
+  let dummy = () => {};
+  let promises = [for (p of it) p.catch(dummy)];
+  return Promise.all(promises);
 }
 
 this.TelemetryStorage = {
@@ -204,6 +191,15 @@ this.TelemetryStorage = {
     return TelemetryStorageImpl.runEnforcePendingPingsQuotaTask();
   },
 
+  /**
+   * Run the task to remove all the pending pings (except the deletion ping).
+   *
+   * @return {Promise} Resolved when the pings are removed.
+   */
+  runRemovePendingPingsTask: function() {
+    return TelemetryStorageImpl.runRemovePendingPingsTask();
+  },
+
   /**
    * Reset the storage state in tests.
    */
@@ -536,6 +532,12 @@ var TelemetryStorageImpl = {
   // Whether we already scanned the archived pings on disk.
   _scannedArchiveDirectory: false,
 
+  // Track the pending ping removal task.
+  _removePendingPingsTask: null,
+
+  // This tracks all the pending async ping save activity.
+  _activePendingPingSaves: new Set(),
+
   // Tracks the pending pings in a Map of (id -> {timestampCreated, type}).
   // We use this to cache info on pending pings to avoid scanning the disk more than once.
   _pendingPings: new Map(),
@@ -561,12 +563,34 @@ var TelemetryStorageImpl = {
    */
   shutdown: Task.async(function*() {
     this._shutdown = true;
-    yield this._abortedSessionSerializer.flushTasks();
-    yield this._deletionPingSerializer.flushTasks();
-    // If the tasks for archive cleaning or pending ping quota are still running, block on
-    // them. They will bail out as soon as possible.
-    yield this._cleanArchiveTask;
-    yield this._enforcePendingPingsQuotaTask;
+
+    // If the following tasks are still running, block on them. They will bail out as soon
+    // as possible.
+    yield this._abortedSessionSerializer.flushTasks().catch(ex => {
+      this._log.error("shutdown - failed to flush aborted-session writes", ex);
+    });
+
+    yield this._deletionPingSerializer.flushTasks().catch(ex => {
+      this._log.error("shutdown - failed to flush deletion ping writes", ex);
+    });
+
+    if (this._cleanArchiveTask) {
+      yield this._cleanArchiveTask.catch(ex => {
+        this._log.error("shutdown - the archive cleaning task failed", ex);
+      });
+    }
+
+    if (this._enforcePendingPingsQuotaTask) {
+      yield this._enforcePendingPingsQuotaTask.catch(ex => {
+        this._log.error("shutdown - the pending pings quota task failed", ex);
+      });
+    }
+
+    if (this._removePendingPingsTask) {
+      yield this._removePendingPingsTask.catch(ex => {
+        this._log.error("shutdown - the pending pings removal task failed", ex);
+      });
+    }
   }),
 
   /**
@@ -1171,13 +1195,15 @@ var TelemetryStorageImpl = {
   },
 
   savePendingPing: function(ping) {
-    return this.savePing(ping, true).then((path) => {
+    let p = this.savePing(ping, true).then((path) => {
       this._pendingPings.set(ping.id, {
         path: path,
         lastModificationDate: Policy.now().getTime(),
       });
       this._log.trace("savePendingPing - saved ping with id " + ping.id);
     });
+    this._trackPendingPingSaveTask(p);
+    return p;
   },
 
   loadPendingPing: Task.async(function*(id) {
@@ -1239,6 +1265,80 @@ var TelemetryStorageImpl = {
       this._log.error("removePendingPing - failed to remove ping", ex));
   },
 
+  /**
+   * Track any pending ping save tasks through the promise passed here.
+   * This is needed to block on any outstanding ping save activity.
+   *
+   * @param {Object<Promise>} The save promise to track.
+   */
+  _trackPendingPingSaveTask: function (promise) {
+    let clear = () => this._activePendingPingSaves.delete(promise);
+    promise.then(clear, clear);
+    this._activePendingPingSaves.add(promise);
+  },
+
+  /**
+   * Return a promise that allows to wait on pending pings being saved.
+   * @return {Object<Promise>} A promise resolved when all the pending pings save promises
+   *         are resolved.
+   */
+  promisePendingPingSaves: function () {
+    // Make sure to wait for all the promises, even if they reject. We don't need to log
+    // the failures here, as they are already logged elsewhere.
+    return waitForAll(this._activePendingPingSaves);
+  },
+
+  /**
+   * Run the task to remove all the pending pings (except the deletion ping).
+   *
+   * @return {Promise} Resolved when the pings are removed.
+   */
+  runRemovePendingPingsTask: Task.async(function*() {
+    // If we already have a pending pings removal task active, return that.
+    if (this._removePendingPingsTask) {
+      return this._removePendingPingsTask;
+    }
+
+    // Start the task to remove all pending pings. Also make sure to clear the task once done.
+    try {
+      this._removePendingPingsTask = this.removePendingPings();
+      yield this._removePendingPingsTask;
+    } finally {
+      this._removePendingPingsTask = null;
+    }
+  }),
+
+  removePendingPings: Task.async(function*() {
+    this._log.trace("removePendingPings - removing all pending pings");
+
+    // Wait on pending pings still being saved, so so we don't miss removing them.
+    yield this.promisePendingPingSaves();
+
+    // Individually remove existing pings, so we don't interfere with operations expecting
+    // the pending pings directory to exist.
+    const directory = TelemetryStorage.pingDirectoryPath;
+    let iter = new OS.File.DirectoryIterator(directory);
+
+    try {
+      if (!(yield iter.exists())) {
+        this._log.trace("removePendingPings - the pending pings directory doesn't exist");
+        return;
+      }
+
+      let files = (yield iter.nextBatch()).filter(e => !e.isDir);
+      for (let file of files) {
+        try {
+          yield OS.File.remove(file.path);
+        } catch (ex) {
+          this._log.error("removePendingPings - failed to remove file " + file.path, ex);
+          continue;
+        }
+      }
+    } finally {
+      yield iter.close();
+    }
+  }),
+
   loadPendingPingList: function() {
     // If we already have a pending scanning task active, return that.
     if (this._scanPendingPingsTask) {
@@ -1490,8 +1590,10 @@ var TelemetryStorageImpl = {
     this._log.trace("saveDeletionPing - ping path: " + gDeletionPingFilePath);
     yield OS.File.makeDir(gDataReportingDir, { ignoreExisting: true });
 
-    return this._deletionPingSerializer.enqueueTask(() =>
+    let p = this._deletionPingSerializer.enqueueTask(() =>
       this.savePingToFile(ping, gDeletionPingFilePath, true));
+    this._trackPendingPingSaveTask(p);
+    return p;
   }),
 
   /**

From 4ad4c62303f725bc2ea500d69214738480fc11aa Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Mon, 5 Oct 2015 09:17:00 +0200
Subject: [PATCH 10/35] Bug 1174674 - Add test coverage. r=gfritzsche

---
 .../tests/unit/test_TelemetryController.js    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
index 673bacfb04cf..28b7fb5b70c7 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -143,7 +143,7 @@ add_task(function* test_simplePing() {
   checkPingFormat(ping, TEST_PING_TYPE, false, false);
 });
 
-add_task(function* test_deletionPing() {
+add_task(function* test_disableDataUpload() {
   const isUnified = Preferences.get(PREF_UNIFIED, false);
   if (!isUnified) {
     // Skipping the test if unified telemetry is off, as no deletion ping will
@@ -166,12 +166,26 @@ add_task(function* test_deletionPing() {
 
   // Simulate a failure in sending the deletion ping by disabling the HTTP server.
   yield PingServer.stop();
+
+  // Try to send a ping. It will be saved as pending  and get deleted when disabling upload.
+  TelemetryController.submitExternalPing(TEST_PING_TYPE, {});
+
   // Disable FHR upload to send a deletion ping again.
   Preferences.set(PREF_FHR_UPLOAD_ENABLED, false);
-  // Wait for the send task to terminate, flagging it to do so at the next opportunity and
-  // cancelling any timeouts.
+
+  // Wait on sending activity to settle, as |TelemetryController.reset()| doesn't do that.
+  yield TelemetrySend.testWaitOnOutgoingPings();
+  // Wait for the pending pings to be deleted. Resetting TelemetryController doesn't
+  // trigger the shutdown, so we need to call it ourselves.
+  yield TelemetryStorage.shutdown();
+  // Simulate a restart, and spin the send task.
   yield TelemetryController.reset();
 
+  // Disabling Telemetry upload must clear out all the pending pings.
+  let pendingPings = yield TelemetryStorage.loadPendingPingList();
+  Assert.equal(pendingPings.length, 1,
+               "All the pending pings but the deletion ping should have been deleted");
+
   // Enable the ping server again.
   PingServer.start();
   // We set the new server using the pref, otherwise it would get reset with

From 47f486d1625f88dce5b806abbfefde2fb185632b Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Fri, 2 Oct 2015 06:35:00 +0200
Subject: [PATCH 11/35] Bug 1174674 - Always block Telemetry shutdown on
 pending ping writes. r=gfritzsche

---
 toolkit/components/telemetry/TelemetryStorage.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/components/telemetry/TelemetryStorage.jsm b/toolkit/components/telemetry/TelemetryStorage.jsm
index be9c51ec476c..c771b5f7400a 100644
--- a/toolkit/components/telemetry/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/TelemetryStorage.jsm
@@ -591,6 +591,12 @@ var TelemetryStorageImpl = {
         this._log.error("shutdown - the pending pings removal task failed", ex);
       });
     }
+
+    // Wait on pending pings still being saved. While OS.File should have shutdown
+    // blockers in place, we a) have seen weird errors being reported that might
+    // indicate a bad shutdown path and b) might have completion handlers hanging
+    // off the save operations that don't expect to be late in shutdown.
+    yield this.promisePendingPingSaves();
   }),
 
   /**

From e887270b9b9e61abb9afb1ea111c92956f610503 Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Thu, 1 Oct 2015 10:35:00 +0200
Subject: [PATCH 12/35] Bug 1174674 - Remove octal value syntax errors from
 Telemetry tests. r=gfritzsche

---
 .../components/telemetry/tests/unit/test_TelemetryController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
index 28b7fb5b70c7..ff68d83c9bc5 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -283,7 +283,7 @@ add_task(function* test_archivePings() {
   Preferences.set(uploadPref, true);
   Preferences.set(PREF_ARCHIVE_ENABLED, true);
 
-  now = new Date(2014, 06, 18, 22, 0, 0);
+  now = new Date(2014, 6, 18, 22, 0, 0);
   fakeNow(now);
   // Restore the non asserting ping handler.
   PingServer.resetPingHandler();

From 2e4069939ea71f91c1e123d440b566fd4635768f Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Mon, 5 Oct 2015 10:52:43 -0400
Subject: [PATCH 13/35] Bug 1204995 - Update FENNEC_OPEN_URLS_IN_PRIVATE
 expires_in_version value to actually collect data. r=mfinkle

--HG--
extra : commitid : LVeC877NIjp
extra : rebase_source : ebde43ab0d72ffba0f62875c30c6f94f82dfc0bd
---
 toolkit/components/telemetry/Histograms.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index feb317381f20..7939703e4300 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9038,7 +9038,7 @@
   },
   "FENNEC_OPEN_URLS_IN_PRIVATE": {
     "alert_emails": ["margaret@mozilla.com"],
-    "expires_in_version": "44",
+    "expires_in_version": "45",
     "kind": "flag",
     "description": "Reports the state of the open external links in private tabs preference"
   },

From 1322b83ce82aa92b49c751eaaaba5097bc26125c Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 17 Jul 2015 16:36:03 -0700
Subject: [PATCH 14/35] Bug 1185163 - Create tri-state tracking protection pref
 (for Nightly only). r=liuche

--HG--
extra : commitid : CZ8A8aeMz9K
extra : rebase_source : e59be369b9f4d99d87063eaf781282a700d58252
---
 .../base/locales/en-US/android_strings.dtd    |  4 ++
 .../base/preferences/GeckoPreferences.java    | 16 ++++++++
 .../android/base/resources/values/arrays.xml  | 10 +++++
 .../resources/xml/preferences_privacy.xml     |  6 +++
 mobile/android/base/strings.xml.in            |  4 ++
 mobile/android/chrome/content/browser.js      | 40 +++++++++++++++++++
 6 files changed, 80 insertions(+)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 3cf5a8487bdb..23ce3fa80573 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -225,6 +225,10 @@
 <!ENTITY pref_donottrack_title "Do not track">
 <!ENTITY pref_donottrack_summary "&brandShortName; will tell sites that you do not want to be tracked">
 
+<!ENTITY pref_tracking_protection_enabled "Enabled">
+<!ENTITY pref_tracking_protection_enabled_pb "Enabled in Private Browsing">
+<!ENTITY pref_tracking_protection_disabled "Disabled">
+
 <!ENTITY tracking_protection_prompt_title "Now with Tracking Protection">
 <!ENTITY tracking_protection_prompt_text "Actively block tracking elements so you don\'t have to worry.">
 <!ENTITY tracking_protection_prompt_tip_text "Visit Privacy settings to learn more">
diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index ae7c78be00f5..68ee9db2fb2c 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -128,6 +128,8 @@ OnSharedPreferenceChangeListener
     private static final String PREFS_DEVTOOLS_REMOTE_WIFI_ENABLED = "devtools.remote.wifi.enabled";
     private static final String PREFS_DISPLAY_TITLEBAR_MODE = "browser.chrome.titlebarMode";
     private static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
+    private static final String PREFS_TRACKING_PROTECTION = "privacy.trackingprotection.state";
+    private static final String PREFS_TRACKING_PROTECTION_PB = "privacy.trackingprotection.pbmode.enabled";
     public static final String PREFS_OPEN_URLS_IN_PRIVATE = NON_PREF_PREFIX + "openExternalURLsPrivately";
     public static final String PREFS_VOICE_INPUT_ENABLED = NON_PREF_PREFIX + "voice_input_enabled";
     public static final String PREFS_QRCODE_ENABLED = NON_PREF_PREFIX + "qrcode_enabled";
@@ -772,6 +774,20 @@ OnSharedPreferenceChangeListener
                         i--;
                         continue;
                     }
+                } else if (PREFS_TRACKING_PROTECTION.equals(key)) {
+                    // Remove UI for global TP pref in non-Nightly builds.
+                    if (!AppConstants.NIGHTLY_BUILD) {
+                        preferences.removePreference(pref);
+                        i--;
+                        continue;
+                    }
+                } else if (PREFS_TRACKING_PROTECTION_PB.equals(key)) {
+                    // Remove UI for private-browsing-only TP pref in Nightly builds.
+                    if (AppConstants.NIGHTLY_BUILD) {
+                        preferences.removePreference(pref);
+                        i--;
+                        continue;
+                    }
                 } else if (PREFS_TELEMETRY_ENABLED.equals(key)) {
                     if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
                         preferences.removePreference(pref);
diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
index 83ee7dfd7c36..81b8fabe2541 100644
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -50,6 +50,16 @@
         <item>@string/pref_cookies_not_accept_foreign</item>
         <item>@string/pref_cookies_disabled</item>
     </string-array>
+    <string-array name="pref_tracking_protection_values">
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+    </string-array>
+    <string-array name="pref_tracking_protection_entries">
+        <item>@string/pref_tracking_protection_enabled</item>
+        <item>@string/pref_tracking_protection_enabled_pb</item>
+        <item>@string/pref_tracking_protection_disabled</item>
+    </string-array>
     <string-array name="pref_cookies_values">
         <item>0</item>
         <item>1</item>
diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml
index ae42d304d1fc..741ef5f9eb99 100644
--- a/mobile/android/base/resources/xml/preferences_privacy.xml
+++ b/mobile/android/base/resources/xml/preferences_privacy.xml
@@ -13,6 +13,12 @@
                         android:summary="@string/pref_tracking_protection_summary"
                         android:persistent="false" />
 
+    <ListPreference android:key="privacy.trackingprotection.state"
+                    android:title="@string/pref_tracking_protection_title"
+                    android:entries="@array/pref_tracking_protection_entries"
+                    android:entryValues="@array/pref_tracking_protection_values"
+                    android:persistent="false" />
+
     <org.mozilla.gecko.preferences.AlignRightLinkPreference
             android:key="android.not_a_preference.trackingprotection.learn_more"
             android:title="@string/pref_learn_more"
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 7189da452efb..1e73bd3649bd 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -216,6 +216,10 @@
   <string name="pref_donottrack_title">&pref_donottrack_title;</string>
   <string name="pref_donottrack_summary">&pref_donottrack_summary;</string>
 
+  <string name="pref_tracking_protection_enabled">&pref_tracking_protection_enabled;</string>
+  <string name="pref_tracking_protection_enabled_pb">&pref_tracking_protection_enabled_pb;</string>
+  <string name="pref_tracking_protection_disabled">&pref_tracking_protection_disabled;</string>
+
   <string name="pref_char_encoding">&pref_char_encoding;</string>
   <string name="pref_char_encoding_on">&pref_char_encoding_on;</string>
   <string name="pref_char_encoding_off">&pref_char_encoding_off;</string>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 9c69e41be5fb..08632090f2d6 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1414,6 +1414,11 @@ var BrowserApp = {
     }, this);
   },
 
+  // These values come from pref_tracking_protection_entries in arrays.xml.
+  PREF_TRACKING_PROTECTION_ENABLED: "2",
+  PREF_TRACKING_PROTECTION_ENABLED_PB: "1",
+  PREF_TRACKING_PROTECTION_DISABLED: "0",
+
   handlePreferencesRequest: function handlePreferencesRequest(aRequestId,
                                                               aPrefNames,
                                                               aListen) {
@@ -1452,6 +1457,18 @@ var BrowserApp = {
           pref.value = MasterPassword.enabled;
           prefs.push(pref);
           continue;
+        case "privacy.trackingprotection.state": {
+          pref.type = "string";
+          if (Services.prefs.getBoolPref("privacy.trackingprotection.enabled")) {
+            pref.value = this.PREF_TRACKING_PROTECTION_ENABLED;
+          } else if (Services.prefs.getBoolPref("privacy.trackingprotection.pbmode.enabled")) {
+            pref.value = this.PREF_TRACKING_PROTECTION_ENABLED_PB;
+          } else {
+            pref.value = this.PREF_TRACKING_PROTECTION_DISABLED;
+          }
+          prefs.push(pref);
+          continue;
+        }
         // Crash reporter submit pref must be fetched from nsICrashReporter service.
         case "datareporting.crashreporter.submitEnabled":
           let crashReporterBuilt = "nsICrashReporter" in Ci && Services.appinfo instanceof Ci.nsICrashReporter;
@@ -1534,6 +1551,29 @@ var BrowserApp = {
           MasterPassword.setPassword(json.value);
         return;
 
+      // "privacy.trackingprotection.state" is not a "real" pref name, but it's used in the setting menu.
+      // By default "privacy.trackingprotection.pbmode.enabled" is true,
+      // and "privacy.trackingprotection.enabled" is false.
+      case "privacy.trackingprotection.state": {
+        switch (json.value) {
+          // Tracking protection disabled.
+          case this.PREF_TRACKING_PROTECTION_DISABLED:
+            Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled", false);
+            Services.prefs.setBoolPref("privacy.trackingprotection.enabled", false);
+            break;
+          // Tracking protection only in private browsing,
+          case this.PREF_TRACKING_PROTECTION_ENABLED_PB:
+            Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled", true);
+            Services.prefs.setBoolPref("privacy.trackingprotection.enabled", false);
+            break;
+          // Tracking protection everywhere.
+          case this.PREF_TRACKING_PROTECTION_ENABLED:
+            Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled", true);
+            Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
+            break;
+        }
+        return;
+      }
       // Enabling or disabling suggestions will prevent future prompts
       case SearchEngines.PREF_SUGGEST_ENABLED:
         Services.prefs.setBoolPref(SearchEngines.PREF_SUGGEST_PROMPTED, true);

From 5de966245381c209b2fa671e090de0cd3a6bdb59 Mon Sep 17 00:00:00 2001
From: vivek <vivekb.balakrishnan@gmail.com>
Date: Thu, 1 Oct 2015 00:20:54 +0300
Subject: [PATCH 15/35] Bug 1137333 Clear history button style changes
 r=margaret

--HG--
extra : commitid : BQPwsGgDeRN
extra : rebase_source : 13f661cb03504ceec7fe85fddb4346b413f5ba2a
---
 .../drawable/home_history_clear_button_bg.xml | 23 +++++++++++++++++++
 .../layout/home_history_clear_button.xml      | 10 ++++++++
 .../resources/layout/home_history_panel.xml   | 12 +---------
 .../layout/home_history_split_pane_panel.xml  |  9 +-------
 .../base/resources/values-v16/styles.xml      |  4 ----
 .../android/base/resources/values/styles.xml  | 21 +++++------------
 6 files changed, 41 insertions(+), 38 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
 create mode 100644 mobile/android/base/resources/layout/home_history_clear_button.xml

diff --git a/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml b/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
new file mode 100644
index 000000000000..f722d8da6ad0
--- /dev/null
+++ b/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  - 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/.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <stroke android:width="1dp"
+                    android:color="@color/divider_light" />
+            <padding android:top="1dp" />
+        </shape>
+    </item>
+    <item>
+        <selector>
+            <item android:state_pressed="true"
+                  android:drawable="@color/toolbar_grey_pressed" />
+            <item android:drawable="@color/toolbar_grey"/>
+        </selector>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/mobile/android/base/resources/layout/home_history_clear_button.xml b/mobile/android/base/resources/layout/home_history_clear_button.xml
new file mode 100644
index 000000000000..c21e6d1fdf50
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_history_clear_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/clear_history_button"
+        style="@style/Widget.Home.ActionButton"
+        android:text="@string/home_clear_history_button"
+        android:visibility="gone" />
diff --git a/mobile/android/base/resources/layout/home_history_panel.xml b/mobile/android/base/resources/layout/home_history_panel.xml
index 3a260b34c4d5..6ca7c89a2024 100644
--- a/mobile/android/base/resources/layout/home_history_panel.xml
+++ b/mobile/android/base/resources/layout/home_history_panel.xml
@@ -10,16 +10,6 @@
 
     <include layout="@layout/home_list"/>
 
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@color/home_button_bar_bg">
-
-        <Button android:id="@+id/clear_history_button"
-                style="@style/Widget.Home.ActionButton"
-                android:text="@string/home_clear_history_button"
-                android:gravity="center"
-                android:visibility="gone"/>
-
-    </LinearLayout>
+    <include layout="@layout/home_history_clear_button"/>
 
 </LinearLayout>
diff --git a/mobile/android/base/resources/layout/home_history_split_pane_panel.xml b/mobile/android/base/resources/layout/home_history_split_pane_panel.xml
index be8fa2a2ffe7..154d0983fad4 100644
--- a/mobile/android/base/resources/layout/home_history_split_pane_panel.xml
+++ b/mobile/android/base/resources/layout/home_history_split_pane_panel.xml
@@ -41,13 +41,6 @@
 
     </LinearLayout>
 
-    <Button android:id="@+id/clear_history_button"
-            style="@style/Widget.Home.ActionButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/home_button_bar_bg"
-            android:text="@string/home_clear_history_button"
-            android:gravity="center"
-            android:visibility="gone"/>
+    <include layout="@layout/home_history_clear_button"/>
 
 </LinearLayout>
diff --git a/mobile/android/base/resources/values-v16/styles.xml b/mobile/android/base/resources/values-v16/styles.xml
index 237e149363c9..15243891e5cd 100644
--- a/mobile/android/base/resources/values-v16/styles.xml
+++ b/mobile/android/base/resources/values-v16/styles.xml
@@ -13,10 +13,6 @@
         <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
-    <style name="TextAppearance.Widget.Home.PageTitle" parent="TextAppearance.Medium">
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-
     <style name="TextAppearance.FirstrunTextLight">
         <item name="android:fontFamily">sans-serif-light</item>
     </style>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index a63de1728b37..81c426cd2a50 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -258,21 +258,18 @@
         <item name="android:paddingRight">10dip</item>
     </style>
 
-    <style name="Widget.Home.PageButton">
+    <style name="Widget.Home.ActionButton">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">40dip</item>
-        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.PageTitle</item>
-        <item name="android:background">@drawable/action_bar_button</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:background">@drawable/home_history_clear_button_bg</item>
         <item name="android:focusable">true</item>
-        <item name="android:gravity">center|left</item>
+        <item name="android:gravity">center</item>
         <item name="android:paddingLeft">10dip</item>
         <item name="android:paddingRight">10dip</item>
     </style>
 
-    <style name="Widget.Home.ActionButton" parent="Widget.Home.PageButton">
-        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.PageAction</item>
-    </style>
-
     <style name="Widget.Home.ActionItem">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">40dip</item>
@@ -401,12 +398,6 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="TextAppearance.Widget.Home.PageTitle" parent="TextAppearance.Medium" />
-
-    <style name="TextAppearance.Widget.Home.PageAction" parent="TextAppearance.Small">
-        <item name="android:textColor">#00ACFF</item>
-    </style>
-
     <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Medium"/>
 
     <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppearance.Micro">

From 7cec3f27cb964f97270fef53ca54559a9e5245b1 Mon Sep 17 00:00:00 2001
From: Manav Batra <batmanav10@gmail.com>
Date: Mon, 5 Oct 2015 13:31:55 -0500
Subject: [PATCH 16/35] Bug 1206426 - Updated WebIDE's unrestricted help URL.
 r=jryans

---
 devtools/client/webide/content/runtimedetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/client/webide/content/runtimedetails.js b/devtools/client/webide/content/runtimedetails.js
index cf7f8c5771c5..73211932a175 100644
--- a/devtools/client/webide/content/runtimedetails.js
+++ b/devtools/client/webide/content/runtimedetails.js
@@ -10,7 +10,7 @@ const {Connection} = require("devtools/shared/client/connection-manager");
 const {RuntimeTypes} = require("devtools/client/webide/modules/runtimes");
 const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties");
 
-const UNRESTRICTED_HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE#Unrestricted_app_debugging_%28including_certified_apps.2C_main_process.2C_etc.%29";
+const UNRESTRICTED_HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Running_and_debugging_apps#Unrestricted_app_debugging_%28including_certified_apps_main_process_etc.%29";
 
 window.addEventListener("load", function onLoad() {
   window.removeEventListener("load", onLoad);

From e1c5e4bbbf9f9804db119c1e563463f502b71cb7 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 17/35] Bug 1208295 - Dispatch notifications-open-settings upon
 receiving alertsettingscallback so UI can open notification settings. r=nsm

alertsettingscallback only goes to the single observer whereas notifications-open-settings goes through the global observer service.

--HG--
extra : commitid : BC7Pj6kNtNN
extra : rebase_source : 95170c48ae4fa852d1a87c82fc486e70a945fc7a
---
 dom/notification/Notification.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 9bf02b2b062b..97ca75c16c76 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -1161,6 +1161,15 @@ NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
     }
     permissionManager->RemoveFromPrincipal(mPrincipal, "desktop-notification");
     return NS_OK;
+  } else if (!strcmp("alertsettingscallback", aTopic)) {
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    if (!obs) {
+      return NS_ERROR_FAILURE;
+    }
+
+    // Notify other observers so they can show settings UI.
+    obs->NotifyObservers(mPrincipal, "notifications-open-settings", nullptr);
+    return NS_OK;
   }
 
   return mObserver->Observe(aSubject, aTopic, aData);

From aba0eefdfd5d6fcfa09348c3ad587e4d5e93d7ae Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 18/35] Bug 1208295 - Show an additional action on OS X
 notifications to open notification settings. r=mstange

--HG--
extra : commitid : AddYnCETrfr
extra : rebase_source : 0d699bfe380cddd1d214af174a3a893beb76bec1
---
 .../locales/en-US/chrome/alerts/alert.properties    |  1 +
 widget/cocoa/OSXNotificationCenter.mm               | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/alerts/alert.properties b/toolkit/locales/en-US/chrome/alerts/alert.properties
index c2d8fdb6cb4c..ed3364161e65 100644
--- a/toolkit/locales/en-US/chrome/alerts/alert.properties
+++ b/toolkit/locales/en-US/chrome/alerts/alert.properties
@@ -9,3 +9,4 @@ closeButton.title = Close
 # LOCALIZATION NOTE(actionButton.label): Used as the button label to provide more actions on OS X notifications. OS X will truncate this if it's too long.
 actionButton.label = …
 webActions.disable.label = Disable notifications from this site
+webActions.settings.label = Notification settings
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
index c6ddb3b0dae9..40a2faf30826 100644
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -139,7 +139,8 @@ enum {
 namespace mozilla {
 
 enum {
-  OSXNotificationActionDisable = 0
+  OSXNotificationActionDisable = 0,
+  OSXNotificationActionSettings = 1,
 };
 
 class OSXNotificationInfo {
@@ -253,13 +254,15 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
     nsCOMPtr<nsIStringBundle> bundle;
     nsresult rv = sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
-      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle;
+      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle;
       bundle->GetStringFromName(NS_LITERAL_STRING("closeButton.title").get(),
                                 getter_Copies(closeButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("actionButton.label").get(),
                                 getter_Copies(actionButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("webActions.disable.label").get(),
                                 getter_Copies(disableButtonTitle));
+      bundle->GetStringFromName(NS_LITERAL_STRING("webActions.settings.label").get(),
+                                getter_Copies(settingsButtonTitle));
 
       notification.hasActionButton = YES;
       notification.otherButtonTitle = nsCocoaUtils::ToNSString(closeButtonTitle);
@@ -267,7 +270,8 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
       [(NSObject*)notification setValue:@(YES) forKey:@"_showsButtons"];
       [(NSObject*)notification setValue:@(YES) forKey:@"_alwaysShowAlternateActionMenu"];
       [(NSObject*)notification setValue:@[
-                                          nsCocoaUtils::ToNSString(disableButtonTitle)
+                                          nsCocoaUtils::ToNSString(disableButtonTitle),
+                                          nsCocoaUtils::ToNSString(settingsButtonTitle)
                                           ]
                                forKey:@"_alternateActionButtonTitles"];
     }
@@ -394,6 +398,9 @@ OSXNotificationCenter::OnActivate(NSString *aAlertName,
               case OSXNotificationActionDisable:
                 osxni->mObserver->Observe(nullptr, "alertdisablecallback", osxni->mCookie.get());
                 break;
+              case OSXNotificationActionSettings:
+                osxni->mObserver->Observe(nullptr, "alertsettingscallback", osxni->mCookie.get());
+                break;
               default:
                 NS_WARNING("Unknown NSUserNotification additional action clicked");
                 break;

From 222595da1da4d1cc07bdae5bb30a2aa4290a5e3f Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 19/35] Bug 1208295 - Open content preferences after receiving
 notifications-open-settings. r=jaws

--HG--
rename : browser/base/content/test/general/browser_notification_tab_switching.js => browser/base/content/test/alerts/browser_notification_tab_switching.js
rename : browser/base/content/test/general/file_dom_notifications.html => browser/base/content/test/alerts/file_dom_notifications.html
extra : commitid : 4I4XjOorZ7y
extra : rebase_source : eb354f4cc181f82f56b54451ec0ac32caef24d8e
---
 .../browser_notification_open_settings.js      | 18 ++++++++++++++++++
 .../browser_notification_tab_switching.js      |  4 ++--
 .../file_dom_notifications.html                |  1 +
 browser/base/content/test/general/browser.ini  |  3 ---
 browser/base/content/test/general/head.js      | 10 ----------
 browser/base/moz.build                         |  1 +
 browser/components/nsBrowserGlue.js            | 18 ++++++++++++++++++
 7 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 browser/base/content/test/alerts/browser_notification_open_settings.js
 rename browser/base/content/test/{general => alerts}/browser_notification_tab_switching.js (95%)
 rename browser/base/content/test/{general => alerts}/file_dom_notifications.html (97%)

diff --git a/browser/base/content/test/alerts/browser_notification_open_settings.js b/browser/base/content/test/alerts/browser_notification_open_settings.js
new file mode 100644
index 000000000000..f339af140fb1
--- /dev/null
+++ b/browser/base/content/test/alerts/browser_notification_open_settings.js
@@ -0,0 +1,18 @@
+"use strict";
+
+add_task(function* test_settingsOpen() {
+  info("Opening a dummy tab so openPreferences=>switchToTabHavingURI doesn't use the blank tab.");
+  yield BrowserTestUtils.withNewTab({
+    gBrowser,
+    url: "about:robots"
+  }, function* dummyTabTask(aBrowser) {
+    let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, "about:preferences#content");
+    info("simulate a notifications-open-settings notification");
+    let uri = NetUtil.newURI("https://example.com");
+    let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
+    Services.obs.notifyObservers(principal, "notifications-open-settings", null);
+    let tab = yield tabPromise;
+    ok(tab, "The notification settings tab opened");
+    BrowserTestUtils.removeTab(tab);
+  });
+});
diff --git a/browser/base/content/test/general/browser_notification_tab_switching.js b/browser/base/content/test/alerts/browser_notification_tab_switching.js
similarity index 95%
rename from browser/base/content/test/general/browser_notification_tab_switching.js
rename to browser/base/content/test/alerts/browser_notification_tab_switching.js
index 161e4e14958d..482b54fbb63a 100644
--- a/browser/base/content/test/general/browser_notification_tab_switching.js
+++ b/browser/base/content/test/alerts/browser_notification_tab_switching.js
@@ -6,7 +6,7 @@
 
 var tab;
 var notification;
-var notificationURL = "http://example.org/browser/browser/base/content/test/general/file_dom_notifications.html";
+var notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
 var newWindowOpenedFromTab;
 
 function test () {
@@ -58,7 +58,7 @@ function onAlertShowing() {
   info("Notification alert showing");
   notification.removeEventListener("show", onAlertShowing);
 
-  let alertWindow = findChromeWindowByURI("chrome://global/content/alerts/alert.xul");
+  let alertWindow = Services.wm.getMostRecentWindow("alert:alert");
   if (!alertWindow) {
     todo(false, "Notifications don't use XUL windows on all platforms.");
     notification.close();
diff --git a/browser/base/content/test/general/file_dom_notifications.html b/browser/base/content/test/alerts/file_dom_notifications.html
similarity index 97%
rename from browser/base/content/test/general/file_dom_notifications.html
rename to browser/base/content/test/alerts/file_dom_notifications.html
index 078c94a42d18..7cbdebdd48e0 100644
--- a/browser/base/content/test/general/file_dom_notifications.html
+++ b/browser/base/content/test/alerts/file_dom_notifications.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<meta charset="utf-8">
 <script>
 "use strict";
 
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 9d308d576cfd..41a5b611273c 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -62,7 +62,6 @@ support-files =
   file_bug970276_favicon1.ico
   file_bug970276_favicon2.ico
   file_documentnavigation_frameset.html
-  file_dom_notifications.html
   file_double_close_tab.html
   file_favicon_change.html
   file_favicon_change_not_in_document.html
@@ -338,8 +337,6 @@ skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (
 skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
 tags = mcb
-[browser_notification_tab_switching.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
 [browser_offlineQuotaNotification.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
 [browser_overflowScroll.js]
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index 1d9b0258024d..47cfa20283fb 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -59,16 +59,6 @@ function whenDelayedStartupFinished(aWindow, aCallback) {
   }, "browser-delayed-startup-finished", false);
 }
 
-function findChromeWindowByURI(aURI) {
-  let windows = Services.wm.getEnumerator(null);
-  while (windows.hasMoreElements()) {
-    let win = windows.getNext();
-    if (win.location.href == aURI)
-      return win;
-  }
-  return null;
-}
-
 function updateTabContextMenu(tab) {
   let menu = document.getElementById("tabContextMenu");
   if (!tab)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 30c7883e2dfd..43e0a78230ad 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -15,6 +15,7 @@ MOCHITEST_CHROME_MANIFESTS += [
 ]
 
 BROWSER_CHROME_MANIFESTS += [
+    'content/test/alerts/browser.ini',
     'content/test/chat/browser.ini',
     'content/test/general/browser.ini',
     'content/test/newtab/browser.ini',
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index a89e97562658..c2eb1a851ca2 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -276,6 +276,9 @@ BrowserGlue.prototype = {
   // nsIObserver implementation
   observe: function BG_observe(subject, topic, data) {
     switch (topic) {
+      case "notifications-open-settings":
+        this._openPreferences("content");
+        break;
       case "prefservice:after-app-defaults":
         this._onAppDefaults();
         break;
@@ -591,6 +594,7 @@ BrowserGlue.prototype = {
   // initialization (called on application startup) 
   _init: function BG__init() {
     let os = Services.obs;
+    os.addObserver(this, "notifications-open-settings", false);
     os.addObserver(this, "prefservice:after-app-defaults", false);
     os.addObserver(this, "final-ui-startup", false);
     os.addObserver(this, "browser-delayed-startup-finished", false);
@@ -639,6 +643,7 @@ BrowserGlue.prototype = {
   // cleanup (called on application shutdown)
   _dispose: function BG__dispose() {
     let os = Services.obs;
+    os.removeObserver(this, "notifications-open-settings");
     os.removeObserver(this, "prefservice:after-app-defaults");
     os.removeObserver(this, "final-ui-startup");
     os.removeObserver(this, "sessionstore-windows-restored");
@@ -2361,6 +2366,19 @@ BrowserGlue.prototype = {
     }
   }),
 
+  /**
+   * Open preferences even if there are no open windows.
+   */
+  _openPreferences(...args) {
+    if (Services.appShell.hiddenDOMWindow.openPreferences) {
+      Services.appShell.hiddenDOMWindow.openPreferences(...args);
+      return;
+    }
+
+    let chromeWindow = RecentWindow.getMostRecentBrowserWindow();
+    chromeWindow.openPreferences(...args);
+  },
+
 #ifdef MOZ_SERVICES_SYNC
   /**
    * Called as an observer when Sync's "display URI" notification is fired.

From 11e1d57e1577ed6902618b5b81197ee5b7bb2938 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 5 Oct 2015 12:20:47 -0700
Subject: [PATCH 20/35] Backed out 3 changesets (bug 1208295) for build bustage
 CLOSED TREE

Backed out changeset ba930740225e (bug 1208295)
Backed out changeset 54f38580e0b8 (bug 1208295)
Backed out changeset a5907e5982a8 (bug 1208295)

--HG--
rename : browser/base/content/test/alerts/browser_notification_tab_switching.js => browser/base/content/test/general/browser_notification_tab_switching.js
rename : browser/base/content/test/alerts/file_dom_notifications.html => browser/base/content/test/general/file_dom_notifications.html
---
 .../browser_notification_open_settings.js      | 18 ------------------
 browser/base/content/test/general/browser.ini  |  3 +++
 .../browser_notification_tab_switching.js      |  4 ++--
 .../file_dom_notifications.html                |  1 -
 browser/base/content/test/general/head.js      | 10 ++++++++++
 browser/base/moz.build                         |  1 -
 browser/components/nsBrowserGlue.js            | 18 ------------------
 dom/notification/Notification.cpp              |  9 ---------
 .../en-US/chrome/alerts/alert.properties       |  1 -
 widget/cocoa/OSXNotificationCenter.mm          | 13 +++----------
 10 files changed, 18 insertions(+), 60 deletions(-)
 delete mode 100644 browser/base/content/test/alerts/browser_notification_open_settings.js
 rename browser/base/content/test/{alerts => general}/browser_notification_tab_switching.js (95%)
 rename browser/base/content/test/{alerts => general}/file_dom_notifications.html (97%)

diff --git a/browser/base/content/test/alerts/browser_notification_open_settings.js b/browser/base/content/test/alerts/browser_notification_open_settings.js
deleted file mode 100644
index f339af140fb1..000000000000
--- a/browser/base/content/test/alerts/browser_notification_open_settings.js
+++ /dev/null
@@ -1,18 +0,0 @@
-"use strict";
-
-add_task(function* test_settingsOpen() {
-  info("Opening a dummy tab so openPreferences=>switchToTabHavingURI doesn't use the blank tab.");
-  yield BrowserTestUtils.withNewTab({
-    gBrowser,
-    url: "about:robots"
-  }, function* dummyTabTask(aBrowser) {
-    let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, "about:preferences#content");
-    info("simulate a notifications-open-settings notification");
-    let uri = NetUtil.newURI("https://example.com");
-    let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
-    Services.obs.notifyObservers(principal, "notifications-open-settings", null);
-    let tab = yield tabPromise;
-    ok(tab, "The notification settings tab opened");
-    BrowserTestUtils.removeTab(tab);
-  });
-});
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 41a5b611273c..9d308d576cfd 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -62,6 +62,7 @@ support-files =
   file_bug970276_favicon1.ico
   file_bug970276_favicon2.ico
   file_documentnavigation_frameset.html
+  file_dom_notifications.html
   file_double_close_tab.html
   file_favicon_change.html
   file_favicon_change_not_in_document.html
@@ -337,6 +338,8 @@ skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (
 skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
 tags = mcb
+[browser_notification_tab_switching.js]
+skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
 [browser_offlineQuotaNotification.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
 [browser_overflowScroll.js]
diff --git a/browser/base/content/test/alerts/browser_notification_tab_switching.js b/browser/base/content/test/general/browser_notification_tab_switching.js
similarity index 95%
rename from browser/base/content/test/alerts/browser_notification_tab_switching.js
rename to browser/base/content/test/general/browser_notification_tab_switching.js
index 482b54fbb63a..161e4e14958d 100644
--- a/browser/base/content/test/alerts/browser_notification_tab_switching.js
+++ b/browser/base/content/test/general/browser_notification_tab_switching.js
@@ -6,7 +6,7 @@
 
 var tab;
 var notification;
-var notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
+var notificationURL = "http://example.org/browser/browser/base/content/test/general/file_dom_notifications.html";
 var newWindowOpenedFromTab;
 
 function test () {
@@ -58,7 +58,7 @@ function onAlertShowing() {
   info("Notification alert showing");
   notification.removeEventListener("show", onAlertShowing);
 
-  let alertWindow = Services.wm.getMostRecentWindow("alert:alert");
+  let alertWindow = findChromeWindowByURI("chrome://global/content/alerts/alert.xul");
   if (!alertWindow) {
     todo(false, "Notifications don't use XUL windows on all platforms.");
     notification.close();
diff --git a/browser/base/content/test/alerts/file_dom_notifications.html b/browser/base/content/test/general/file_dom_notifications.html
similarity index 97%
rename from browser/base/content/test/alerts/file_dom_notifications.html
rename to browser/base/content/test/general/file_dom_notifications.html
index 7cbdebdd48e0..078c94a42d18 100644
--- a/browser/base/content/test/alerts/file_dom_notifications.html
+++ b/browser/base/content/test/general/file_dom_notifications.html
@@ -1,6 +1,5 @@
 <html>
 <head>
-<meta charset="utf-8">
 <script>
 "use strict";
 
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index 47cfa20283fb..1d9b0258024d 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -59,6 +59,16 @@ function whenDelayedStartupFinished(aWindow, aCallback) {
   }, "browser-delayed-startup-finished", false);
 }
 
+function findChromeWindowByURI(aURI) {
+  let windows = Services.wm.getEnumerator(null);
+  while (windows.hasMoreElements()) {
+    let win = windows.getNext();
+    if (win.location.href == aURI)
+      return win;
+  }
+  return null;
+}
+
 function updateTabContextMenu(tab) {
   let menu = document.getElementById("tabContextMenu");
   if (!tab)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 43e0a78230ad..30c7883e2dfd 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -15,7 +15,6 @@ MOCHITEST_CHROME_MANIFESTS += [
 ]
 
 BROWSER_CHROME_MANIFESTS += [
-    'content/test/alerts/browser.ini',
     'content/test/chat/browser.ini',
     'content/test/general/browser.ini',
     'content/test/newtab/browser.ini',
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c2eb1a851ca2..a89e97562658 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -276,9 +276,6 @@ BrowserGlue.prototype = {
   // nsIObserver implementation
   observe: function BG_observe(subject, topic, data) {
     switch (topic) {
-      case "notifications-open-settings":
-        this._openPreferences("content");
-        break;
       case "prefservice:after-app-defaults":
         this._onAppDefaults();
         break;
@@ -594,7 +591,6 @@ BrowserGlue.prototype = {
   // initialization (called on application startup) 
   _init: function BG__init() {
     let os = Services.obs;
-    os.addObserver(this, "notifications-open-settings", false);
     os.addObserver(this, "prefservice:after-app-defaults", false);
     os.addObserver(this, "final-ui-startup", false);
     os.addObserver(this, "browser-delayed-startup-finished", false);
@@ -643,7 +639,6 @@ BrowserGlue.prototype = {
   // cleanup (called on application shutdown)
   _dispose: function BG__dispose() {
     let os = Services.obs;
-    os.removeObserver(this, "notifications-open-settings");
     os.removeObserver(this, "prefservice:after-app-defaults");
     os.removeObserver(this, "final-ui-startup");
     os.removeObserver(this, "sessionstore-windows-restored");
@@ -2366,19 +2361,6 @@ BrowserGlue.prototype = {
     }
   }),
 
-  /**
-   * Open preferences even if there are no open windows.
-   */
-  _openPreferences(...args) {
-    if (Services.appShell.hiddenDOMWindow.openPreferences) {
-      Services.appShell.hiddenDOMWindow.openPreferences(...args);
-      return;
-    }
-
-    let chromeWindow = RecentWindow.getMostRecentBrowserWindow();
-    chromeWindow.openPreferences(...args);
-  },
-
 #ifdef MOZ_SERVICES_SYNC
   /**
    * Called as an observer when Sync's "display URI" notification is fired.
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 97ca75c16c76..9bf02b2b062b 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -1161,15 +1161,6 @@ NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
     }
     permissionManager->RemoveFromPrincipal(mPrincipal, "desktop-notification");
     return NS_OK;
-  } else if (!strcmp("alertsettingscallback", aTopic)) {
-    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-    if (!obs) {
-      return NS_ERROR_FAILURE;
-    }
-
-    // Notify other observers so they can show settings UI.
-    obs->NotifyObservers(mPrincipal, "notifications-open-settings", nullptr);
-    return NS_OK;
   }
 
   return mObserver->Observe(aSubject, aTopic, aData);
diff --git a/toolkit/locales/en-US/chrome/alerts/alert.properties b/toolkit/locales/en-US/chrome/alerts/alert.properties
index ed3364161e65..c2d8fdb6cb4c 100644
--- a/toolkit/locales/en-US/chrome/alerts/alert.properties
+++ b/toolkit/locales/en-US/chrome/alerts/alert.properties
@@ -9,4 +9,3 @@ closeButton.title = Close
 # LOCALIZATION NOTE(actionButton.label): Used as the button label to provide more actions on OS X notifications. OS X will truncate this if it's too long.
 actionButton.label = …
 webActions.disable.label = Disable notifications from this site
-webActions.settings.label = Notification settings
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
index 40a2faf30826..c6ddb3b0dae9 100644
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -139,8 +139,7 @@ enum {
 namespace mozilla {
 
 enum {
-  OSXNotificationActionDisable = 0,
-  OSXNotificationActionSettings = 1,
+  OSXNotificationActionDisable = 0
 };
 
 class OSXNotificationInfo {
@@ -254,15 +253,13 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
     nsCOMPtr<nsIStringBundle> bundle;
     nsresult rv = sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
-      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle;
+      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle;
       bundle->GetStringFromName(NS_LITERAL_STRING("closeButton.title").get(),
                                 getter_Copies(closeButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("actionButton.label").get(),
                                 getter_Copies(actionButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("webActions.disable.label").get(),
                                 getter_Copies(disableButtonTitle));
-      bundle->GetStringFromName(NS_LITERAL_STRING("webActions.settings.label").get(),
-                                getter_Copies(settingsButtonTitle));
 
       notification.hasActionButton = YES;
       notification.otherButtonTitle = nsCocoaUtils::ToNSString(closeButtonTitle);
@@ -270,8 +267,7 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
       [(NSObject*)notification setValue:@(YES) forKey:@"_showsButtons"];
       [(NSObject*)notification setValue:@(YES) forKey:@"_alwaysShowAlternateActionMenu"];
       [(NSObject*)notification setValue:@[
-                                          nsCocoaUtils::ToNSString(disableButtonTitle),
-                                          nsCocoaUtils::ToNSString(settingsButtonTitle)
+                                          nsCocoaUtils::ToNSString(disableButtonTitle)
                                           ]
                                forKey:@"_alternateActionButtonTitles"];
     }
@@ -398,9 +394,6 @@ OSXNotificationCenter::OnActivate(NSString *aAlertName,
               case OSXNotificationActionDisable:
                 osxni->mObserver->Observe(nullptr, "alertdisablecallback", osxni->mCookie.get());
                 break;
-              case OSXNotificationActionSettings:
-                osxni->mObserver->Observe(nullptr, "alertsettingscallback", osxni->mCookie.get());
-                break;
               default:
                 NS_WARNING("Unknown NSUserNotification additional action clicked");
                 break;

From cdd5904379a7151ff03f7d2283b9531a545932a4 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 1 Oct 2015 13:42:44 -0400
Subject: [PATCH 21/35] Bug 1110511 - Use the browser permanentKey to map to
 childIDs in TabCrashReporter. r=felipe

--HG--
extra : commitid : 2McX3L64uiU
extra : rebase_source : 9fffe76b4c8907c79d9b7e481c29a32a7328e1c6
---
 browser/modules/ContentCrashReporters.jsm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/modules/ContentCrashReporters.jsm b/browser/modules/ContentCrashReporters.jsm
index 34a1bd75b74f..badefa513031 100644
--- a/browser/modules/ContentCrashReporters.jsm
+++ b/browser/modules/ContentCrashReporters.jsm
@@ -47,13 +47,13 @@ this.TabCrashReporter = {
         if (!browser)
           return;
 
-        this.browserMap.set(browser, aSubject.childID);
+        this.browserMap.set(browser.permanentKey, aSubject.childID);
         break;
     }
   },
 
   submitCrashReport: function (aBrowser) {
-    let childID = this.browserMap.get(aBrowser);
+    let childID = this.browserMap.get(aBrowser.permanentKey);
     let dumpID = this.childMap.get(childID);
     if (!dumpID)
       return
@@ -79,8 +79,8 @@ this.TabCrashReporter = {
         if (!doc.documentURI.startsWith("about:tabcrashed"))
           continue;
 
-        if (this.browserMap.get(browser) == childID) {
-          this.browserMap.delete(browser);
+        if (this.browserMap.get(browser.permanentKey) == childID) {
+          this.browserMap.delete(browser.permanentKey);
           browser.contentDocument.documentElement.classList.remove("crashDumpAvailable");
           browser.contentDocument.documentElement.classList.add("crashDumpSubmitted");
         }
@@ -97,7 +97,7 @@ this.TabCrashReporter = {
     if (!this.childMap)
       return;
 
-    let dumpID = this.childMap.get(this.browserMap.get(aBrowser));
+    let dumpID = this.childMap.get(this.browserMap.get(aBrowser.permanentKey));
     if (!dumpID)
       return;
 

From d263f9091357e8b8a381eb7474ae0930bc9ebfc8 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 28 Sep 2015 18:39:39 -0400
Subject: [PATCH 22/35] Bug 1110511 - Allow TabCrashReporter to pass
 extraExtraKeyVals. r=felipe

--HG--
extra : commitid : E3lZSGwcmei
extra : rebase_source : d5196a1071da02ef69548c7e3372cbf782496c63
---
 browser/modules/ContentCrashReporters.jsm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/browser/modules/ContentCrashReporters.jsm b/browser/modules/ContentCrashReporters.jsm
index badefa513031..562be1f3aca0 100644
--- a/browser/modules/ContentCrashReporters.jsm
+++ b/browser/modules/ContentCrashReporters.jsm
@@ -52,16 +52,23 @@ this.TabCrashReporter = {
     }
   },
 
-  submitCrashReport: function (aBrowser) {
+  submitCrashReport: function (aBrowser, aFormData) {
     let childID = this.browserMap.get(aBrowser.permanentKey);
     let dumpID = this.childMap.get(childID);
     if (!dumpID)
       return
 
-    if (CrashSubmit.submit(dumpID, { recordSubmission: true })) {
-      this.childMap.set(childID, null); // Avoid resubmission.
-      this.removeSubmitCheckboxesForSameCrash(childID);
-    }
+    CrashSubmit.submit(dumpID, {
+      recordSubmission: true,
+      extraExtraKeyVals: {
+        Comments: aFormData.comments,
+        Email: aFormData.email,
+        URL: aFormData.URL,
+      },
+    }).then(null, Cu.reportError);
+
+    this.childMap.set(childID, null); // Avoid resubmission.
+    this.removeSubmitCheckboxesForSameCrash(childID);
   },
 
   removeSubmitCheckboxesForSameCrash: function(childID) {

From 49478ee2355cd6d05130bbea01b26bef15221ac4 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 1 Oct 2015 14:53:09 -0400
Subject: [PATCH 23/35] Bug 1110511 - Fix erroneous references to html|textbox
 in in-content's common.css. r=ntim

--HG--
extra : commitid : JYp3ddoGbjN
extra : rebase_source : e1314f147019c41aa5270deeb6f9144da9abb074
---
 toolkit/themes/shared/in-content/common.inc.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index c3c77d8995bd..1673aecb439b 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -406,7 +406,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 
 /* textboxes */
 
-*|textbox {
+xul|textbox {
   -moz-appearance: none;
   height: 30px;
   color: var(--in-content-text-color);
@@ -422,12 +422,14 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
   background-color: var(--in-content-box-background);
 }
 
-html|textbox:focus,
+html|input[type="text"]:focus,
+html|textarea:focus,
 xul|textbox[focused] {
   border-color: var(--in-content-border-focus);
 }
 
-html|textbox:disabled,
+html|input[type="text"]:disabled,
+html|textarea:disabled,
 xul|textbox[disabled="true"] {
   opacity: 0.5;
 }

From ed57b12c2fd16da1ed3d819e8b440927ef316c89 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 30 Sep 2015 17:50:48 -0400
Subject: [PATCH 24/35] Bug 1110511 - Add comment and email input to
 about:tabcrashed. r=felipe,ntim

Original patch by Ursula Sarracini

--HG--
extra : commitid : 5oDPYygydFO
extra : rebase_source : 4e1fe56d12bfc019f079ba297f52070ed1b13d5b
---
 browser/app/profile/firefox.js                |  6 ++
 browser/base/content/aboutTabCrashed.js       | 68 ++++++++++++++++---
 browser/base/content/aboutTabCrashed.xhtml    | 16 ++++-
 browser/base/content/browser.js               | 10 ++-
 .../en-US/chrome/browser/aboutTabCrashed.dtd  |  5 ++
 browser/modules/ContentCrashReporters.jsm     | 61 ++++++++++++++++-
 browser/themes/shared/aboutTabCrashed.css     | 31 +++++++++
 .../themes/shared/in-content/common.inc.css   | 19 ++++--
 8 files changed, 200 insertions(+), 16 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index c0e188586d90..052a23c8f02c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1882,6 +1882,12 @@ pref("browser.tabs.remote.autostart.1", false);
 pref("browser.tabs.remote.autostart.2", true);
 #endif
 
+// For the about:tabcrashed page
+pref("browser.tabs.crashReporting.sendReport", true);
+pref("browser.tabs.crashReporting.includeURL", false);
+pref("browser.tabs.crashReporting.emailMe", false);
+pref("browser.tabs.crashReporting.email", "");
+
 #ifdef NIGHTLY_BUILD
 #ifndef MOZ_MULET
 pref("layers.async-pan-zoom.enabled", true);
diff --git a/browser/base/content/aboutTabCrashed.js b/browser/base/content/aboutTabCrashed.js
index a0abedc0e58f..5ff0071a46e2 100644
--- a/browser/base/content/aboutTabCrashed.js
+++ b/browser/base/content/aboutTabCrashed.js
@@ -3,27 +3,66 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function parseQueryString() {
-  let url = document.documentURI;
-  let queryString = url.replace(/^about:tabcrashed?e=tabcrashed/, "");
+  let URL = document.documentURI;
+  let queryString = URL.replace(/^about:tabcrashed?e=tabcrashed/, "");
 
   let titleMatch = queryString.match(/d=([^&]*)/);
-  return titleMatch && titleMatch[1] ? decodeURIComponent(titleMatch[1]) : "";
+  let URLMatch = queryString.match(/u=([^&]*)/);
+  return {
+    title: titleMatch && titleMatch[1] ? decodeURIComponent(titleMatch[1]) : "",
+    URL: URLMatch && URLMatch[1] ? decodeURIComponent(URLMatch[1]) : "",
+  };
 }
 
-document.title = parseQueryString();
+function displayUI() {
+  if (!hasReport()) {
+    return;
+  }
 
-function shouldSendReport() {
-  if (!document.documentElement.classList.contains("crashDumpAvailable"))
-    return false;
-  return document.getElementById("sendReport").checked;
+  let sendCrashReport = document.getElementById("sendReport").checked;
+  let container = document.getElementById("crash-reporter-container");
+  container.hidden = !sendCrashReport;
+}
+
+function hasReport() {
+  return document.documentElement.classList.contains("crashDumpAvailable");
 }
 
 function sendEvent(message) {
+  let comments = "";
+  let email = "";
+  let URL = "";
+  let sendCrashReport = false;
+  let emailMe = false;
+  let includeURL = false;
+
+  if (hasReport()) {
+    sendCrashReport = document.getElementById("sendReport").checked;
+    if (sendCrashReport) {
+      comments = document.getElementById("comments").value.trim();
+
+      includeURL = document.getElementById("includeURL").checked;
+      if (includeURL) {
+        URL = parseQueryString().URL.trim();
+      }
+
+      emailMe = document.getElementById("emailMe").checked;
+      if (emailMe) {
+        email = document.getElementById("email").value.trim();
+      }
+    }
+  }
+
   let event = new CustomEvent("AboutTabCrashedMessage", {
     bubbles: true,
     detail: {
       message,
-      sendCrashReport: shouldSendReport(),
+      sendCrashReport,
+      comments,
+      email,
+      emailMe,
+      includeURL,
+      URL,
     },
   });
 
@@ -42,6 +81,17 @@ function restoreAll() {
   sendEvent("restoreAll");
 }
 
+document.title = parseQueryString().title;
+
 // Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
 var event = new CustomEvent("AboutTabCrashedLoad", {bubbles:true});
 document.dispatchEvent(event);
+
+addEventListener("DOMContentLoaded", function() {
+  let sendReport = document.getElementById("sendReport");
+  sendReport.addEventListener("click", function() {
+    displayUI();
+  });
+
+  displayUI();
+});
diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml
index ec1f37161bf1..9de02cc21029 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -37,8 +37,22 @@
       <p>&tabCrashed.message;</p>
 
       <div id="report-box">
-        <input type="checkbox" id="sendReport" checked="checked"/>
+        <input type="checkbox" id="sendReport"/>
         <label for="sendReport">&tabCrashed.sendReport;</label>
+        <div id="crash-reporter-container" hidden="true">
+          <p id="crash-reporter-title">&tabCrashed.crashReporter;</p>
+          <textarea id="comments" placeholder="&tabCrashed.commentPlaceholder;" rows="4"></textarea>
+
+          <ul id="options">
+            <li><input type="checkbox" id="includeURL"/>
+            <label for="includeURL">&tabCrashed.includeURL;</label></li>
+
+            <li><input type="checkbox" id="emailMe"/>
+            <label for="emailMe">&tabCrashed.emailMe;</label></li>
+          </ul>
+
+          <input type="text" id="email" placeholder="&tabCrashed.emailPlaceholder;"/>
+        </div>
       </div>
 
       <p id="reportSent">&tabCrashed.reportSent;</p>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ed10547395f3..c3e933b338e8 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1166,7 +1166,15 @@ var gBrowserInit = {
       let browser = gBrowser.getBrowserForDocument(ownerDoc);
 #ifdef MOZ_CRASHREPORTER
       if (event.detail.sendCrashReport) {
-        TabCrashReporter.submitCrashReport(browser);
+        TabCrashReporter.submitCrashReport(browser, {
+          comments: event.detail.comments,
+          email: event.detail.email,
+          emailMe: event.detail.emailMe,
+          includeURL: event.detail.includeURL,
+          URL: event.detail.URL,
+        });
+      } else {
+        TabCrashReporter.dontSubmitCrashReport();
       }
 #endif
 
diff --git a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd b/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
index 609e001989e4..eac62d7211f9 100644
--- a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
@@ -5,6 +5,11 @@
 <!ENTITY tabCrashed.header "Bad news first: This tab has crashed">
 <!ENTITY tabCrashed.message "Now for the good news: You can just close this tab, restore it or restore all your crashed tabs.">
 <!ENTITY tabCrashed.sendReport "Submit a crash report to help prevent more bad news">
+<!ENTITY tabCrashed.includeURL "Include the address of the page I was on">
+<!ENTITY tabCrashed.commentPlaceholder "Add a comment (comments are publicly visible)">
+<!ENTITY tabCrashed.emailPlaceholder "Enter your email address here">
+<!ENTITY tabCrashed.emailMe "Email me when more information is available">
+<!ENTITY tabCrashed.crashReporter "Mozilla Crash Reporter">
 <!ENTITY tabCrashed.reportSent "Crash report already submitted; thank you for helping make &brandShortName; better!">
 <!ENTITY tabCrashed.closeTab "Close This Tab">
 <!ENTITY tabCrashed.restoreTab "Restore This Tab">
diff --git a/browser/modules/ContentCrashReporters.jsm b/browser/modules/ContentCrashReporters.jsm
index 562be1f3aca0..7c43d9fbb201 100644
--- a/browser/modules/ContentCrashReporters.jsm
+++ b/browser/modules/ContentCrashReporters.jsm
@@ -17,6 +17,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "CrashSubmit",
   "resource://gre/modules/CrashSubmit.jsm");
 
 this.TabCrashReporter = {
+  get prefs() {
+    delete this.prefs;
+    return this.prefs = Services.prefs.getBranch("browser.tabs.crashReporting.");
+  },
+
   init: function () {
     if (this.initialized)
       return;
@@ -52,6 +57,31 @@ this.TabCrashReporter = {
     }
   },
 
+  /**
+   * Submits a crash report from about:tabcrashed
+   *
+   * @param aBrowser
+   *        The <xul:browser> that the report was sent from.
+   * @param aFormData
+   *        An Object with the following properties:
+   *
+   *        includeURL (bool):
+   *          Whether to include the URL that the user was on
+   *          in the crashed tab before the crash occurred.
+   *        URL (String)
+   *          The URL that the user was on in the crashed tab
+   *          before the crash occurred.
+   *        emailMe (bool):
+   *          Whether or not to include the user's email address
+   *          in the crash report.
+   *        email (String):
+   *          The email address of the user.
+   *        comments (String):
+   *          Any additional comments from the user.
+   *
+   *        Note that it is expected that all properties are set,
+   *        even if they are empty.
+   */
   submitCrashReport: function (aBrowser, aFormData) {
     let childID = this.browserMap.get(aBrowser.permanentKey);
     let dumpID = this.childMap.get(childID);
@@ -67,10 +97,23 @@ this.TabCrashReporter = {
       },
     }).then(null, Cu.reportError);
 
+    this.prefs.setBoolPref("sendReport", true);
+    this.prefs.setBoolPref("includeURL", aFormData.includeURL);
+    this.prefs.setBoolPref("emailMe", aFormData.emailMe);
+    if (aFormData.emailMe) {
+      this.prefs.setCharPref("email", aFormData.email);
+    } else {
+      this.prefs.setCharPref("email", "");
+    }
+
     this.childMap.set(childID, null); // Avoid resubmission.
     this.removeSubmitCheckboxesForSameCrash(childID);
   },
 
+  dontSubmitCrashReport: function() {
+    this.prefs.setBoolPref("sendReport", false);
+  },
+
   removeSubmitCheckboxesForSameCrash: function(childID) {
     let enumerator = Services.wm.getEnumerator("navigator:browser");
     while (enumerator.hasMoreElements()) {
@@ -108,7 +151,23 @@ this.TabCrashReporter = {
     if (!dumpID)
       return;
 
-    aBrowser.contentDocument.documentElement.classList.add("crashDumpAvailable");
+    let doc = aBrowser.contentDocument;
+
+    doc.documentElement.classList.add("crashDumpAvailable");
+
+    let sendReport = this.prefs.getBoolPref("sendReport");
+    doc.getElementById("sendReport").checked = sendReport;
+
+    let includeURL = this.prefs.getBoolPref("includeURL");
+    doc.getElementById("includeURL").checked = includeURL;
+
+    let emailMe = this.prefs.getBoolPref("emailMe");
+    doc.getElementById("emailMe").checked = emailMe;
+
+    if (emailMe) {
+      let email = this.prefs.getCharPref("email", "");
+      doc.getElementById("email").value = email;
+    }
   },
 
   hideRestoreAllButton: function (aBrowser) {
diff --git a/browser/themes/shared/aboutTabCrashed.css b/browser/themes/shared/aboutTabCrashed.css
index 2ef767eb8b24..e42922ac95d6 100644
--- a/browser/themes/shared/aboutTabCrashed.css
+++ b/browser/themes/shared/aboutTabCrashed.css
@@ -9,3 +9,34 @@
 #reportSent {
   font-weight: bold;
 }
+
+#crash-reporter-container {
+  width: 80%;
+  background-color: var(--in-content-box-background-hover);
+  margin: 24px 0;
+  padding: 14px;
+  border: 1px solid var(--in-content-box-border-color);
+  border-radius: 2px;
+}
+
+#crash-reporter-title {
+  font-weight: bold;
+  margin: 0 0 14px 0;
+}
+
+input[type="text"],
+textarea {
+  width: 100%;
+  box-sizing: border-box;
+  resize: none;
+}
+
+#options {
+  list-style: none;
+  margin-inline-start: 0;
+}
+
+input[type="text"],
+#options > li {
+  margin: 14px 0 0 0;
+}
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 1673aecb439b..1b19a93bc217 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -406,13 +406,11 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 
 /* textboxes */
 
+html|input[type="text"],
+html|textarea,
 xul|textbox {
   -moz-appearance: none;
-  height: 30px;
   color: var(--in-content-text-color);
-  line-height: 20px;
-  padding-right: 10px;
-  padding-left: 10px;
   border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -422,6 +420,19 @@ xul|textbox {
   background-color: var(--in-content-box-background);
 }
 
+xul|textbox {
+  min-height: 30px;
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
+html|input[type="text"],
+html|textarea {
+  font-family: inherit;
+  font-size: inherit;
+  padding: 5px 10px;
+}
+
 html|input[type="text"]:focus,
 html|textarea:focus,
 xul|textbox[focused] {

From 8f9fdedf8f9f6980ce7bb992c6936debef1c85bb Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 29 Sep 2015 16:44:50 -0400
Subject: [PATCH 25/35] Bug 1110511 - Move tab-crashing test helper function to
 BrowserTestUtils.jsm r=felipe

--HG--
extra : commitid : 3btc3brhudn
extra : rebase_source : 9e9cdf816b78eeeda4157a428b5d5e7fd1632b04
---
 .../test/browser_async_flushes.js             |   2 +-
 .../sessionstore/test/browser_crashedTabs.js  |  18 +--
 browser/components/sessionstore/test/head.js  | 106 --------------
 .../BrowserTestUtils/BrowserTestUtils.jsm     | 137 +++++++++++++++++-
 .../browser/browser_content_url_annotation.js |  68 +--------
 5 files changed, 147 insertions(+), 184 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_async_flushes.js b/browser/components/sessionstore/test/browser_async_flushes.js
index f5496e9e60e3..fe6e5b639ffd 100644
--- a/browser/components/sessionstore/test/browser_async_flushes.js
+++ b/browser/components/sessionstore/test/browser_async_flushes.js
@@ -69,7 +69,7 @@ add_task(function* test_crash() {
   // the content process. The "crash" message makes it first so that we don't
   // get a chance to process the flush. The TabStateFlusher however should be
   // notified so that the flush still completes.
-  let promise1 = crashBrowser(browser);
+  let promise1 = BrowserTestUtils.crashBrowser(browser);
   let promise2 = TabStateFlusher.flush(browser);
   yield Promise.all([promise1, promise2]);
 
diff --git a/browser/components/sessionstore/test/browser_crashedTabs.js b/browser/components/sessionstore/test/browser_crashedTabs.js
index 71eca9e0baa4..72df2d2a6c45 100644
--- a/browser/components/sessionstore/test/browser_crashedTabs.js
+++ b/browser/components/sessionstore/test/browser_crashedTabs.js
@@ -117,7 +117,7 @@ add_task(function test_crash_page_not_in_history() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   // Check the tab state and make sure the tab crashed page isn't
   // mentioned.
@@ -146,7 +146,7 @@ add_task(function test_revived_history_from_remote() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   // Browse to a new site that will cause the browser to
   // become remote again.
@@ -185,7 +185,7 @@ add_task(function test_revived_history_from_non_remote() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   // Browse to a new site that will not cause the browser to
   // become remote again.
@@ -235,7 +235,7 @@ add_task(function test_revive_tab_from_session_store() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
   is(newTab2.getAttribute("crashed"), "true", "Second tab should be crashed too.");
 
   // Use SessionStore to revive the tab
@@ -286,7 +286,7 @@ add_task(function test_revive_all_tabs_from_session_store() {
   yield TabStateFlusher.flush(browser2);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
   is(newTab2.getAttribute("crashed"), "true", "Second tab should be crashed too.");
 
   // Use SessionStore to revive all the tabs
@@ -331,7 +331,7 @@ add_task(function test_close_tab_after_crash() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   let promise = promiseEvent(gBrowser.tabContainer, "TabClose");
 
@@ -359,7 +359,7 @@ add_task(function* test_hide_restore_all_button() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   let doc = browser.contentDocument;
   let restoreAllButton = doc.getElementById("restoreAll");
@@ -375,7 +375,7 @@ add_task(function* test_hide_restore_all_button() {
   yield promiseBrowserLoaded(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   doc = browser.contentDocument;
   restoreAllButton = doc.getElementById("restoreAll");
@@ -405,7 +405,7 @@ add_task(function* test_aboutcrashedtabzoom() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield crashBrowser(browser);
+  yield BrowserTestUtils.crashBrowser(browser);
 
   ok(ZoomManager.getZoomForBrowser(browser) === 1, "zoom should have reset on crash");
 
diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index da4c0328ee0c..af326cc7c704 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -538,112 +538,6 @@ function promiseRemoveTab(tab) {
   return BrowserTestUtils.removeTab(tab);
 }
 
-/**
- * Returns a Promise that resolves once a remote <xul:browser> has experienced
- * a crash. Also does the job of cleaning up the minidump of the crash.
- *
- * @param browser
- *        The <xul:browser> that will crash
- * @return Promise
- */
-function crashBrowser(browser) {
-  /**
-   * Returns the directory where crash dumps are stored.
-   *
-   * @return nsIFile
-   */
-  function getMinidumpDirectory() {
-    let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
-    dir.append("minidumps");
-    return dir;
-  }
-
-  /**
-   * Removes a file from a directory. This is a no-op if the file does not
-   * exist.
-   *
-   * @param directory
-   *        The nsIFile representing the directory to remove from.
-   * @param filename
-   *        A string for the file to remove from the directory.
-   */
-  function removeFile(directory, filename) {
-    let file = directory.clone();
-    file.append(filename);
-    if (file.exists()) {
-      file.remove(false);
-    }
-  }
-
-  // This frame script is injected into the remote browser, and used to
-  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
-  // a bad pointer. The crash should happen immediately upon loading this
-  // frame script.
-  let frame_script = () => {
-    const Cu = Components.utils;
-    Cu.import("resource://gre/modules/ctypes.jsm");
-
-    let dies = function() {
-      privateNoteIntentionalCrash();
-      let zero = new ctypes.intptr_t(8);
-      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
-      badptr.contents
-    };
-
-    dump("Et tu, Brute?");
-    dies();
-  }
-
-  let crashCleanupPromise = new Promise((resolve, reject) => {
-    let observer = (subject, topic, data) => {
-      is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
-      ok(subject instanceof Ci.nsIPropertyBag2,
-         'Subject implements nsIPropertyBag2.');
-      // we might see this called as the process terminates due to previous tests.
-      // We are only looking for "abnormal" exits...
-      if (!subject.hasKey("abnormal")) {
-        info("This is a normal termination and isn't the one we are looking for...");
-        return;
-      }
-
-      let dumpID;
-      if ('nsICrashReporter' in Ci) {
-        dumpID = subject.getPropertyAsAString('dumpID');
-        ok(dumpID, "dumpID is present and not an empty string");
-      }
-
-      if (dumpID) {
-        let minidumpDirectory = getMinidumpDirectory();
-        removeFile(minidumpDirectory, dumpID + '.dmp');
-        removeFile(minidumpDirectory, dumpID + '.extra');
-      }
-
-      Services.obs.removeObserver(observer, 'ipc:content-shutdown');
-      info("Crash cleaned up");
-      resolve();
-    };
-
-    Services.obs.addObserver(observer, 'ipc:content-shutdown');
-  });
-
-  let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
-    browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
-      browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
-      info("about:tabcrashed loaded");
-      resolve();
-    }, false, true);
-  });
-
-  // This frame script will crash the remote browser as soon as it is
-  // evaluated.
-  let mm = browser.messageManager;
-  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
-  return Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]).then(() => {
-    let tab = gBrowser.getTabForBrowser(browser);
-    is(tab.getAttribute("crashed"), "true", "Tab should be marked as crashed");
-  });
-}
-
 // Write DOMSessionStorage data to the given browser.
 function modifySessionStorage(browser, data, options = {}) {
   return ContentTask.spawn(browser, [data, options], function* ([data, options]) {
diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
index 4b7e03c80aef..f44994473966 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -22,6 +22,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://testing-common/TestUtils.jsm");
+Cu.import("resource://gre/modules/KeyValueParser.jsm");
 
 Cc["@mozilla.org/globalmessagemanager;1"]
   .getService(Ci.nsIMessageListenerManager)
@@ -458,5 +459,139 @@ this.BrowserTestUtils = {
         tab.ownerDocument.defaultView.gBrowser.removeTab(tab);
       }
     });
-  }
+  },
+
+  /**
+   * Crashes a remote browser tab and cleans up the generated minidumps.
+   * Resolves with the data from the .extra file (the crash annotations).
+   *
+   * @param (Browser) browser
+   *        A remote <xul:browser> element. Must not be null.
+   *
+   * @returns (Promise)
+   * @resolves An Object with key-value pairs representing the data from the
+   *           crash report's extra file (if applicable).
+   */
+  crashBrowser: Task.async(function*(browser) {
+    let extra = {};
+
+    if (!browser.isRemoteBrowser) {
+      throw new Error("<xul:browser> needs to be remote in order to crash");
+    }
+
+    /**
+     * Returns the directory where crash dumps are stored.
+     *
+     * @return nsIFile
+     */
+    function getMinidumpDirectory() {
+      let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+      dir.append("minidumps");
+      return dir;
+    }
+
+    /**
+     * Removes a file from a directory. This is a no-op if the file does not
+     * exist.
+     *
+     * @param directory
+     *        The nsIFile representing the directory to remove from.
+     * @param filename
+     *        A string for the file to remove from the directory.
+     */
+    function removeFile(directory, filename) {
+      let file = directory.clone();
+      file.append(filename);
+      if (file.exists()) {
+        file.remove(false);
+      }
+    }
+
+    // This frame script is injected into the remote browser, and used to
+    // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+    // a bad pointer. The crash should happen immediately upon loading this
+    // frame script.
+    let frame_script = () => {
+      const Cu = Components.utils;
+      Cu.import("resource://gre/modules/ctypes.jsm");
+
+      let dies = function() {
+        privateNoteIntentionalCrash();
+        let zero = new ctypes.intptr_t(8);
+        let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+        badptr.contents
+      };
+
+      dump("\nEt tu, Brute?\n");
+      dies();
+    }
+
+    let crashCleanupPromise = new Promise((resolve, reject) => {
+      let observer = (subject, topic, data) => {
+        if (topic != "ipc:content-shutdown") {
+          return reject("Received incorrect observer topic: " + topic);
+        }
+        if (!(subject instanceof Ci.nsIPropertyBag2)) {
+          return reject("Subject did not implement nsIPropertyBag2");
+        }
+        // we might see this called as the process terminates due to previous tests.
+        // We are only looking for "abnormal" exits...
+        if (!subject.hasKey("abnormal")) {
+          dump("\nThis is a normal termination and isn't the one we are looking for...\n");
+          return;
+        }
+
+        let dumpID;
+        if ('nsICrashReporter' in Ci) {
+          dumpID = subject.getPropertyAsAString('dumpID');
+          if (!dumpID) {
+            return reject("dumpID was not present despite crash reporting " +
+                          "being enabled");
+          }
+        }
+
+        if (dumpID) {
+          let minidumpDirectory = getMinidumpDirectory();
+          let extrafile = minidumpDirectory.clone();
+          extrafile.append(dumpID + '.extra');
+          if (extrafile.exists()) {
+            dump(`\nNo .extra file for dumpID: ${dumpID}\n`);
+            extra = parseKeyValuePairsFromFile(extrafile);
+          }
+
+          removeFile(minidumpDirectory, dumpID + '.dmp');
+          removeFile(minidumpDirectory, dumpID + '.extra');
+        }
+
+        Services.obs.removeObserver(observer, 'ipc:content-shutdown');
+        dump("\nCrash cleaned up\n");
+        resolve();
+      };
+
+      Services.obs.addObserver(observer, 'ipc:content-shutdown', false);
+    });
+
+    let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
+      browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
+        browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
+        dump("\nabout:tabcrashed loaded\n");
+        resolve();
+      }, false, true);
+    });
+
+    // This frame script will crash the remote browser as soon as it is
+    // evaluated.
+    let mm = browser.messageManager;
+    mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+
+    yield Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]);
+
+    let gBrowser = browser.ownerDocument.defaultView.gBrowser;
+    let tab = gBrowser.getTabForBrowser(browser);
+    if (tab.getAttribute("crashed") != "true") {
+      throw new Error("Tab should be marked as crashed");
+    }
+
+    return extra;
+  }),
 };
diff --git a/toolkit/content/tests/browser/browser_content_url_annotation.js b/toolkit/content/tests/browser/browser_content_url_annotation.js
index cd42f99b0b62..62667651ccc7 100644
--- a/toolkit/content/tests/browser/browser_content_url_annotation.js
+++ b/toolkit/content/tests/browser/browser_content_url_annotation.js
@@ -9,72 +9,6 @@
 // Running this test in ASAN is slow.
 requestLongerTimeout(2);
 
-/**
- * Returns a Promise that resolves once a remote <xul:browser> has experienced
- * a crash. Resolves with the data from the .extra file (the crash annotations).
- *
- * @param browser
- *        The <xul:browser> that will crash
- * @return Promise
- */
-function crashBrowser(browser) {
-  let kv = {};
-  Cu.import("resource://gre/modules/KeyValueParser.jsm", kv);
-  // This frame script is injected into the remote browser, and used to
-  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
-  // a bad pointer. The crash should happen immediately upon loading this
-  // frame script.
-  let frame_script = () => {
-    const Cu = Components.utils;
-    Cu.import("resource://gre/modules/ctypes.jsm");
-
-    let dies = function() {
-      privateNoteIntentionalCrash();
-      let zero = new ctypes.intptr_t(8);
-      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
-      let crash = badptr.contents;
-    };
-
-    dump("Et tu, Brute?");
-    dies();
-  };
-
-  function checkSubject(subject, data) {
-    return subject instanceof Ci.nsIPropertyBag2 &&
-      subject.hasKey("abnormal");
-  };
-  let crashPromise = TestUtils.topicObserved('ipc:content-shutdown',
-                                             checkSubject);
-  let crashDataPromise = crashPromise.then(([subject, data]) => {
-    ok(subject instanceof Ci.nsIPropertyBag2);
-
-    let dumpID;
-    if ('nsICrashReporter' in Ci) {
-      dumpID = subject.getPropertyAsAString('dumpID');
-      ok(dumpID, "dumpID is present and not an empty string");
-    }
-
-    let extra = null;
-    if (dumpID) {
-      let minidumpDirectory = getMinidumpDirectory();
-      let extrafile = minidumpDirectory.clone();
-      extrafile.append(dumpID + '.extra');
-      ok(extrafile.exists(), 'found .extra file');
-      extra = kv.parseKeyValuePairsFromFile(extrafile);
-      removeFile(minidumpDirectory, dumpID + '.dmp');
-      removeFile(minidumpDirectory, dumpID + '.extra');
-    }
-
-    return extra;
-  });
-
-  // This frame script will crash the remote browser as soon as it is
-  // evaluated.
-  let mm = browser.messageManager;
-  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
-  return crashDataPromise;
-}
-
 /**
  * Removes a file from a directory. This is a no-op if the file does not
  * exist.
@@ -130,7 +64,7 @@ add_task(function* test_content_url_annotation() {
     yield promise;
 
     // Crash the tab
-    let annotations = yield crashBrowser(browser);
+    let annotations = yield BrowserTestUtils.crashBrowser(browser);
 
     ok("URL" in annotations, "annotated a URL");
     is(annotations.URL, redirect_url,

From 2a19b75b1284174402481dfe09ca717b42d140a9 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 30 Sep 2015 17:50:27 -0400
Subject: [PATCH 26/35] Bug 1110511 - Regression tests. r=felipe

--HG--
extra : commitid : GLdt6U8gPWC
extra : rebase_source : cd5d40b385caa2ec0b7c0656132275f04abacc56
---
 browser/base/content/test/general/browser.ini |   2 +
 .../test/general/browser_aboutTabCrashed.js   | 335 ++++++++++++++++++
 2 files changed, 337 insertions(+)
 create mode 100644 browser/base/content/test/general/browser_aboutTabCrashed.js

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 9d308d576cfd..197cb121c5e2 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -528,3 +528,5 @@ support-files =
   readerModeArticle.html
 [browser_domFullscreen_fullscreenMode.js]
 [browser_menuButtonBadgeManager.js]
+[browser_aboutTabCrashed.js]
+skip-if = !e10s || !crashreporter
diff --git a/browser/base/content/test/general/browser_aboutTabCrashed.js b/browser/base/content/test/general/browser_aboutTabCrashed.js
new file mode 100644
index 000000000000..bacf9d54441f
--- /dev/null
+++ b/browser/base/content/test/general/browser_aboutTabCrashed.js
@@ -0,0 +1,335 @@
+"use strict";
+
+let { TabCrashReporter } =
+  Cu.import("resource:///modules/ContentCrashReporters.jsm");
+
+const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
+const PAGE = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
+const COMMENTS = "Here's my test comment!";
+const EMAIL = "foo@privacy.com";
+
+/**
+ * For an nsIPropertyBag, returns the value for a given
+ * key.
+ *
+ * @param bag
+ *        The nsIPropertyBag to retrieve the value from
+ * @param key
+ *        The key that we want to get the value for from the
+ *        bag
+ * @returns The value corresponding to the key from the bag,
+ *          or null if the value could not be retrieved (for
+ *          example, if no value is set at that key).
+*/
+function getPropertyBagValue(bag, key) {
+  try {
+    let val = bag.getProperty(key);
+    return val;
+  } catch(e if e.result == Cr.NS_ERROR_FAILURE) {}
+
+  return null;
+}
+
+/**
+ * Returns a Promise that resolves once a crash report has
+ * been submitted. This function will also test the crash
+ * reports extra data to see if it matches expectedExtra.
+ *
+ * @param expectedExtra
+ *        An Object whose key-value pairs will be compared
+ *        against the key-value pairs in the extra data of the
+ *        crash report. A test failure will occur if there is
+ *        a mismatch.
+ *
+ *        Note that this will only check the values that exist
+ *        in expectedExtra. It's possible that the crash report
+ *        will contain other extra information that is not
+ *        compared against.
+ * @returns Promise
+ */
+function promiseCrashReport(expectedExtra) {
+  return Task.spawn(function*() {
+    info("Starting wait on crash-report-status");
+    let [subject, data] =
+      yield TestUtils.topicObserved("crash-report-status", (subject, data) => {
+        return data == "success";
+      });
+    info("Topic observed!");
+
+    if (!(subject instanceof Ci.nsIPropertyBag2)) {
+      throw new Error("Subject was not a Ci.nsIPropertyBag2");
+    }
+
+    let remoteID = getPropertyBagValue(subject, "serverCrashID");
+    if (!remoteID) {
+      throw new Error("Report should have a server ID");
+    }
+
+    let file = Cc["@mozilla.org/file/local;1"]
+                 .createInstance(Ci.nsILocalFile);
+    file.initWithPath(Services.crashmanager._submittedDumpsDir);
+    file.append(remoteID + ".txt");
+    if (!file.exists()) {
+      throw new Error("Report should have been received by the server");
+    }
+
+    file.remove(false);
+
+    let extra = getPropertyBagValue(subject, "extra");
+    if (!(extra instanceof Ci.nsIPropertyBag2)) {
+      throw new Error("extra was not a Ci.nsIPropertyBag2");
+    }
+
+    info("Iterating crash report extra keys");
+    let enumerator = extra.enumerator;
+    while (enumerator.hasMoreElements()) {
+      let key = enumerator.getNext().QueryInterface(Ci.nsIProperty).name;
+      let value = extra.getPropertyAsAString(key);
+      if (key in expectedExtra) {
+        is(value, expectedExtra[key],
+           `Crash report had the right extra value for ${key}`);
+      }
+    }
+  });
+}
+
+/**
+ * Sets up the browser to send crash reports to the local crash report
+ * testing server.
+ */
+add_task(function* setup() {
+  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables crash
+  // reports.  This test needs them enabled.  The test also needs a mock
+  // report server, and fortunately one is already set up by toolkit/
+  // crashreporter/test/Makefile.in.  Assign its URL to MOZ_CRASHREPORTER_URL,
+  // which CrashSubmit.jsm uses as a server override.
+  let env = Cc["@mozilla.org/process/environment;1"]
+              .getService(Components.interfaces.nsIEnvironment);
+  let noReport = env.get("MOZ_CRASHREPORTER_NO_REPORT");
+  let serverUrl = env.get("MOZ_CRASHREPORTER_URL");
+  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
+  env.set("MOZ_CRASHREPORTER_URL", SERVER_URL);
+
+  registerCleanupFunction(function() {
+    env.set("MOZ_CRASHREPORTER_NO_REPORT", noReport);
+    env.set("MOZ_CRASHREPORTER_URL", serverUrl);
+  });
+});
+
+/**
+ * This function returns a Promise that resolves once the following
+ * actions have taken place:
+ *
+ * 1) A new tab is opened up at PAGE
+ * 2) The tab is crashed
+ * 3) The about:tabcrashed page's fields are set in accordance with
+ *    fieldValues
+ * 4) The tab is restored
+ * 5) A crash report is received from the testing server
+ * 6) Any tab crash prefs that were overwritten are reset
+ *
+ * @param fieldValues
+ *        An Object describing how to set the about:tabcrashed
+ *        fields. The following properties are accepted:
+ *
+ *        comments (String)
+ *          The comments to put in the comment textarea
+ *        email (String)
+ *          The email address to put in the email address input
+ *        emailMe (bool)
+ *          The checked value of the "Email me" checkbox
+ *        includeURL (bool)
+ *          The checked value of the "Include URL" checkbox
+ *
+ *        If any of these fields are missing, the defaults from
+ *        the user preferences are used.
+ * @param expectedExtra
+ *        An Object describing the expected values that the submitted
+ *        crash report's extra data should contain.
+ * @returns Promise
+ */
+function crashTabTestHelper(fieldValues, expectedExtra) {
+  return BrowserTestUtils.withNewTab({
+    gBrowser,
+    url: PAGE,
+  }, function*(browser) {
+    let prefs = TabCrashReporter.prefs;
+    let originalSendReport = prefs.getBoolPref("sendReport");
+    let originalEmailMe = prefs.getBoolPref("emailMe");
+    let originalIncludeURL = prefs.getBoolPref("includeURL");
+    let originalEmail = prefs.getCharPref("email");
+
+    let tab = gBrowser.getTabForBrowser(browser);
+    yield BrowserTestUtils.crashBrowser(browser);
+    let doc = browser.contentDocument;
+
+    // Since about:tabcrashed will run in the parent process, we can safely
+    // manipulate its DOM nodes directly
+    let comments = doc.getElementById("comments");
+    let email = doc.getElementById("email");
+    let emailMe = doc.getElementById("emailMe");
+    let includeURL = doc.getElementById("includeURL");
+
+    if (fieldValues.hasOwnProperty("comments")) {
+      comments.value = fieldValues.comments;
+    }
+
+    if (fieldValues.hasOwnProperty("email")) {
+      email.value = fieldValues.email;
+    }
+
+    if (fieldValues.hasOwnProperty("emailMe")) {
+      emailMe.checked = fieldValues.emailMe;
+    }
+
+    if (fieldValues.hasOwnProperty("includeURL")) {
+      includeURL.checked = fieldValues.includeURL;
+    }
+
+    let crashReport = promiseCrashReport(expectedExtra);
+    let restoreTab = browser.contentDocument.getElementById("restoreTab");
+    restoreTab.click();
+    yield BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
+    yield crashReport;
+
+    // Submitting the crash report may have set some prefs regarding how to
+    // send tab crash reports. Let's reset them for the next test.
+    prefs.setBoolPref("sendReport", originalSendReport);
+    prefs.setBoolPref("emailMe", originalEmailMe);
+    prefs.setBoolPref("includeURL", originalIncludeURL);
+    prefs.setCharPref("email", originalEmail);
+  });
+}
+
+/**
+ * Tests what we send with the crash report by default. By default, we do not
+ * send any comments, the URL of the crashing page, or the email address of
+ * the user.
+ */
+add_task(function* test_default() {
+  yield crashTabTestHelper({}, {
+    "Comments": "",
+    "URL": "",
+    "Email": "",
+  });
+});
+
+/**
+ * Test just sending a comment.
+ */
+add_task(function* test_just_a_comment() {
+  yield crashTabTestHelper({
+    comments: COMMENTS,
+  }, {
+    "Comments": COMMENTS,
+    "URL": "",
+    "Email": "",
+  });
+});
+
+/**
+ * Test that we don't send email if emailMe is unchecked
+ */
+add_task(function* test_no_email() {
+  yield crashTabTestHelper({
+    email: EMAIL,
+    emailMe: false,
+  }, {
+    "Comments": "",
+    "URL": "",
+    "Email": "",
+  });
+});
+
+/**
+ * Test that we can send an email address if emailMe is checked
+ */
+add_task(function* test_yes_email() {
+  yield crashTabTestHelper({
+    email: EMAIL,
+    emailMe: true,
+  }, {
+    "Comments": "",
+    "URL": "",
+    "Email": EMAIL,
+  });
+});
+
+/**
+ * Test that we will send the URL of the page if includeURL is checked.
+ */
+add_task(function* test_send_URL() {
+  yield crashTabTestHelper({
+    includeURL: true,
+  }, {
+    "Comments": "",
+    "URL": PAGE,
+    "Email": "",
+  });
+});
+
+/**
+ * Test that we can send comments, the email address, and the URL
+ */
+add_task(function* test_send_all() {
+  yield crashTabTestHelper({
+    includeURL: true,
+    emailMe: true,
+    email: EMAIL,
+    comments: COMMENTS,
+  }, {
+    "Comments": COMMENTS,
+    "URL": PAGE,
+    "Email": EMAIL,
+  });
+});
+
+/**
+ * Test that if we have an email address stored in prefs, and we decide
+ * not to submit the email address in the next crash report, that we
+ * clear the email address.
+ */
+add_task(function* test_clear_email() {
+  return BrowserTestUtils.withNewTab({
+    gBrowser,
+    url: PAGE,
+  }, function*(browser) {
+    let prefs = TabCrashReporter.prefs;
+    let originalSendReport = prefs.getBoolPref("sendReport");
+    let originalEmailMe = prefs.getBoolPref("emailMe");
+    let originalIncludeURL = prefs.getBoolPref("includeURL");
+    let originalEmail = prefs.getCharPref("email");
+
+    // Pretend that we stored an email address from the previous
+    // crash
+    prefs.setCharPref("email", EMAIL);
+    prefs.setBoolPref("emailMe", true);
+
+    let tab = gBrowser.getTabForBrowser(browser);
+    yield BrowserTestUtils.crashBrowser(browser);
+    let doc = browser.contentDocument;
+
+    // Since about:tabcrashed will run in the parent process, we can safely
+    // manipulate its DOM nodes directly
+    let emailMe = doc.getElementById("emailMe");
+    emailMe.checked = false;
+
+    let crashReport = promiseCrashReport({
+      Email: "",
+    });
+
+    let restoreTab = browser.contentDocument.getElementById("restoreTab");
+    restoreTab.click();
+    yield BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
+    yield crashReport;
+
+    is(prefs.getCharPref("email"), "", "No email address should be stored");
+
+    // Submitting the crash report may have set some prefs regarding how to
+    // send tab crash reports. Let's reset them for the next test.
+    prefs.setBoolPref("sendReport", originalSendReport);
+    prefs.setBoolPref("emailMe", originalEmailMe);
+    prefs.setBoolPref("includeURL", originalIncludeURL);
+    prefs.setCharPref("email", originalEmail);
+  });
+});

From b5e57e3f6bb7bff0ccbbe850511338f1662390cd Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 2 Oct 2015 18:32:17 +0100
Subject: [PATCH 27/35] Bug 1073551 - fix doorhangers to not steal focus unless
 explicitly opened using mouse or keyboard, r=jaws

--HG--
extra : commitid : Mw8yIeqhB0
extra : rebase_source : 94344e5ee39946c0a7eb75a686be17c072788f5d
---
 browser/base/content/popup-notifications.inc | 1 +
 toolkit/modules/PopupNotifications.jsm       | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc
index b50ff5e6fb30..44fd8e2cdb8e 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -6,6 +6,7 @@
            position="after_start"
            hidden="true"
            orient="vertical"
+           noautofocus="true"
            role="alert"/>
 
     <popupnotification id="webRTC-shareDevices-notification" hidden="true">
diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm
index bf1f41f00443..ede1d8af153a 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -547,7 +547,6 @@ PopupNotifications.prototype = {
       popupnotification.setAttribute("id", popupnotificationID);
       popupnotification.setAttribute("popupid", n.id);
       popupnotification.setAttribute("closebuttoncommand", "PopupNotifications._dismiss();");
-      popupnotification.setAttribute("noautofocus", "true");
       if (n.mainAction) {
         popupnotification.setAttribute("buttonlabel", n.mainAction.label);
         popupnotification.setAttribute("buttonaccesskey", n.mainAction.accessKey);
@@ -869,6 +868,9 @@ PopupNotifications.prototype = {
       this._dismissOrRemoveCurrentNotifications();
     }
 
+    // Ensure we move focus into the panel because it's opened through user interaction:
+    this.panel.removeAttribute("noautofocus", "true");
+
     this._reshowNotifications(anchor);
   },
 
@@ -949,6 +951,10 @@ PopupNotifications.prototype = {
       return;
     }
 
+    // Ensure that when the panel comes up without user interaction,
+    // we don't autofocus it.
+    this.panel.setAttribute("noautofocus", "true");
+
     this._dismissOrRemoveCurrentNotifications();
 
     this._clearPanel();

From 539d69a3ddd7513edb7d0427fee20effd7318b8b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 5 Oct 2015 15:39:16 +0100
Subject: [PATCH 28/35] Bug 1211456 - remove usage of getImageURLForResolution
 from search component, r=florian

--HG--
extra : commitid : 8okcoGpNbUe
extra : rebase_source : f14d17cd5fe3e67b6c1b2bccbbf6260c71e6de58
---
 browser/components/search/content/search.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 983a404c05cc..e371ef97673c 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -119,9 +119,6 @@
       <field name="FormHistory" readonly="true">
         (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory;
       </field>
-      <field name="PlacesUtils" readonly="true">
-        (Components.utils.import("resource://gre/modules/PlacesUtils.jsm", {})).PlacesUtils;
-      </field>
 
       <property name="engines" readonly="true">
         <getter><![CDATA[
@@ -1445,7 +1442,7 @@
           button.id = "searchbar-engine-one-off-item-" + currentEngine.name.replace(/ /g, '-');
           let uri = "chrome://browser/skin/search-engine-placeholder.png";
           if (currentEngine.iconURI)
-            uri = PlacesUtils.getImageURLForResolution(window, currentEngine.iconURI.spec);
+            uri = currentEngine.iconURI.spec;
           button.setAttribute("image", uri);
           button.setAttribute("tooltiptext", currentEngine.name);
           button.engine = currentEngine;

From 9736cd824c16daed075eae453fc7ffb915b66b1b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 29/35] Bug 1208295 - Dispatch notifications-open-settings upon
 receiving alertsettingscallback so UI can open notification settings. r=nsm

alertsettingscallback only goes to the single observer whereas notifications-open-settings goes through the global observer service.

--HG--
extra : commitid : chMffpyqlT
extra : rebase_source : 35ff4a94fbf14899002a6f2395063bbdc124ff48
---
 dom/notification/Notification.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 9bf02b2b062b..97ca75c16c76 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -1161,6 +1161,15 @@ NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
     }
     permissionManager->RemoveFromPrincipal(mPrincipal, "desktop-notification");
     return NS_OK;
+  } else if (!strcmp("alertsettingscallback", aTopic)) {
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    if (!obs) {
+      return NS_ERROR_FAILURE;
+    }
+
+    // Notify other observers so they can show settings UI.
+    obs->NotifyObservers(mPrincipal, "notifications-open-settings", nullptr);
+    return NS_OK;
   }
 
   return mObserver->Observe(aSubject, aTopic, aData);

From d3537d638395da70c9c694199172585e911be383 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 30/35] Bug 1208295 - Show an additional action on OS X
 notifications to open notification settings. r=mstange

--HG--
extra : commitid : 1LMiMvjWhST
extra : rebase_source : ae556b8e132e43b52eae947455eda288e53660a1
---
 .../locales/en-US/chrome/alerts/alert.properties    |  1 +
 widget/cocoa/OSXNotificationCenter.mm               | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/alerts/alert.properties b/toolkit/locales/en-US/chrome/alerts/alert.properties
index c2d8fdb6cb4c..ed3364161e65 100644
--- a/toolkit/locales/en-US/chrome/alerts/alert.properties
+++ b/toolkit/locales/en-US/chrome/alerts/alert.properties
@@ -9,3 +9,4 @@ closeButton.title = Close
 # LOCALIZATION NOTE(actionButton.label): Used as the button label to provide more actions on OS X notifications. OS X will truncate this if it's too long.
 actionButton.label = …
 webActions.disable.label = Disable notifications from this site
+webActions.settings.label = Notification settings
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
index c6ddb3b0dae9..40a2faf30826 100644
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -139,7 +139,8 @@ enum {
 namespace mozilla {
 
 enum {
-  OSXNotificationActionDisable = 0
+  OSXNotificationActionDisable = 0,
+  OSXNotificationActionSettings = 1,
 };
 
 class OSXNotificationInfo {
@@ -253,13 +254,15 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
     nsCOMPtr<nsIStringBundle> bundle;
     nsresult rv = sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
-      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle;
+      nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle;
       bundle->GetStringFromName(NS_LITERAL_STRING("closeButton.title").get(),
                                 getter_Copies(closeButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("actionButton.label").get(),
                                 getter_Copies(actionButtonTitle));
       bundle->GetStringFromName(NS_LITERAL_STRING("webActions.disable.label").get(),
                                 getter_Copies(disableButtonTitle));
+      bundle->GetStringFromName(NS_LITERAL_STRING("webActions.settings.label").get(),
+                                getter_Copies(settingsButtonTitle));
 
       notification.hasActionButton = YES;
       notification.otherButtonTitle = nsCocoaUtils::ToNSString(closeButtonTitle);
@@ -267,7 +270,8 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
       [(NSObject*)notification setValue:@(YES) forKey:@"_showsButtons"];
       [(NSObject*)notification setValue:@(YES) forKey:@"_alwaysShowAlternateActionMenu"];
       [(NSObject*)notification setValue:@[
-                                          nsCocoaUtils::ToNSString(disableButtonTitle)
+                                          nsCocoaUtils::ToNSString(disableButtonTitle),
+                                          nsCocoaUtils::ToNSString(settingsButtonTitle)
                                           ]
                                forKey:@"_alternateActionButtonTitles"];
     }
@@ -394,6 +398,9 @@ OSXNotificationCenter::OnActivate(NSString *aAlertName,
               case OSXNotificationActionDisable:
                 osxni->mObserver->Observe(nullptr, "alertdisablecallback", osxni->mCookie.get());
                 break;
+              case OSXNotificationActionSettings:
+                osxni->mObserver->Observe(nullptr, "alertsettingscallback", osxni->mCookie.get());
+                break;
               default:
                 NS_WARNING("Unknown NSUserNotification additional action clicked");
                 break;

From d1625cdffe94b96a1004384ff5183439a6a1f11e Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 25 Sep 2015 13:18:29 -0700
Subject: [PATCH 31/35] Bug 1208295 - Open content preferences after receiving
 notifications-open-settings. r=jaws

--HG--
rename : browser/base/content/test/general/browser_notification_tab_switching.js => browser/base/content/test/alerts/browser_notification_tab_switching.js
rename : browser/base/content/test/general/file_dom_notifications.html => browser/base/content/test/alerts/file_dom_notifications.html
extra : commitid : L8SBHW3urul
extra : rebase_source : 2b308872a836a6df9634e991409c008f3e72040c
---
 browser/base/content/test/alerts/browser.ini   |  7 +++++++
 .../browser_notification_open_settings.js      | 18 ++++++++++++++++++
 .../browser_notification_tab_switching.js      |  4 ++--
 .../file_dom_notifications.html                |  1 +
 browser/base/content/test/general/browser.ini  |  3 ---
 browser/base/content/test/general/head.js      | 10 ----------
 browser/base/moz.build                         |  1 +
 browser/components/nsBrowserGlue.js            | 18 ++++++++++++++++++
 8 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 browser/base/content/test/alerts/browser.ini
 create mode 100644 browser/base/content/test/alerts/browser_notification_open_settings.js
 rename browser/base/content/test/{general => alerts}/browser_notification_tab_switching.js (95%)
 rename browser/base/content/test/{general => alerts}/file_dom_notifications.html (97%)

diff --git a/browser/base/content/test/alerts/browser.ini b/browser/base/content/test/alerts/browser.ini
new file mode 100644
index 000000000000..cde60ad06a94
--- /dev/null
+++ b/browser/base/content/test/alerts/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  file_dom_notifications.html
+
+[browser_notification_open_settings.js]
+[browser_notification_tab_switching.js]
+skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
diff --git a/browser/base/content/test/alerts/browser_notification_open_settings.js b/browser/base/content/test/alerts/browser_notification_open_settings.js
new file mode 100644
index 000000000000..f339af140fb1
--- /dev/null
+++ b/browser/base/content/test/alerts/browser_notification_open_settings.js
@@ -0,0 +1,18 @@
+"use strict";
+
+add_task(function* test_settingsOpen() {
+  info("Opening a dummy tab so openPreferences=>switchToTabHavingURI doesn't use the blank tab.");
+  yield BrowserTestUtils.withNewTab({
+    gBrowser,
+    url: "about:robots"
+  }, function* dummyTabTask(aBrowser) {
+    let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, "about:preferences#content");
+    info("simulate a notifications-open-settings notification");
+    let uri = NetUtil.newURI("https://example.com");
+    let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
+    Services.obs.notifyObservers(principal, "notifications-open-settings", null);
+    let tab = yield tabPromise;
+    ok(tab, "The notification settings tab opened");
+    BrowserTestUtils.removeTab(tab);
+  });
+});
diff --git a/browser/base/content/test/general/browser_notification_tab_switching.js b/browser/base/content/test/alerts/browser_notification_tab_switching.js
similarity index 95%
rename from browser/base/content/test/general/browser_notification_tab_switching.js
rename to browser/base/content/test/alerts/browser_notification_tab_switching.js
index 161e4e14958d..482b54fbb63a 100644
--- a/browser/base/content/test/general/browser_notification_tab_switching.js
+++ b/browser/base/content/test/alerts/browser_notification_tab_switching.js
@@ -6,7 +6,7 @@
 
 var tab;
 var notification;
-var notificationURL = "http://example.org/browser/browser/base/content/test/general/file_dom_notifications.html";
+var notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
 var newWindowOpenedFromTab;
 
 function test () {
@@ -58,7 +58,7 @@ function onAlertShowing() {
   info("Notification alert showing");
   notification.removeEventListener("show", onAlertShowing);
 
-  let alertWindow = findChromeWindowByURI("chrome://global/content/alerts/alert.xul");
+  let alertWindow = Services.wm.getMostRecentWindow("alert:alert");
   if (!alertWindow) {
     todo(false, "Notifications don't use XUL windows on all platforms.");
     notification.close();
diff --git a/browser/base/content/test/general/file_dom_notifications.html b/browser/base/content/test/alerts/file_dom_notifications.html
similarity index 97%
rename from browser/base/content/test/general/file_dom_notifications.html
rename to browser/base/content/test/alerts/file_dom_notifications.html
index 078c94a42d18..7cbdebdd48e0 100644
--- a/browser/base/content/test/general/file_dom_notifications.html
+++ b/browser/base/content/test/alerts/file_dom_notifications.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<meta charset="utf-8">
 <script>
 "use strict";
 
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 197cb121c5e2..4b956cfd7122 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -62,7 +62,6 @@ support-files =
   file_bug970276_favicon1.ico
   file_bug970276_favicon2.ico
   file_documentnavigation_frameset.html
-  file_dom_notifications.html
   file_double_close_tab.html
   file_favicon_change.html
   file_favicon_change_not_in_document.html
@@ -338,8 +337,6 @@ skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (
 skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
 tags = mcb
-[browser_notification_tab_switching.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
 [browser_offlineQuotaNotification.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
 [browser_overflowScroll.js]
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index 1d9b0258024d..47cfa20283fb 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -59,16 +59,6 @@ function whenDelayedStartupFinished(aWindow, aCallback) {
   }, "browser-delayed-startup-finished", false);
 }
 
-function findChromeWindowByURI(aURI) {
-  let windows = Services.wm.getEnumerator(null);
-  while (windows.hasMoreElements()) {
-    let win = windows.getNext();
-    if (win.location.href == aURI)
-      return win;
-  }
-  return null;
-}
-
 function updateTabContextMenu(tab) {
   let menu = document.getElementById("tabContextMenu");
   if (!tab)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 30c7883e2dfd..43e0a78230ad 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -15,6 +15,7 @@ MOCHITEST_CHROME_MANIFESTS += [
 ]
 
 BROWSER_CHROME_MANIFESTS += [
+    'content/test/alerts/browser.ini',
     'content/test/chat/browser.ini',
     'content/test/general/browser.ini',
     'content/test/newtab/browser.ini',
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index a89e97562658..c2eb1a851ca2 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -276,6 +276,9 @@ BrowserGlue.prototype = {
   // nsIObserver implementation
   observe: function BG_observe(subject, topic, data) {
     switch (topic) {
+      case "notifications-open-settings":
+        this._openPreferences("content");
+        break;
       case "prefservice:after-app-defaults":
         this._onAppDefaults();
         break;
@@ -591,6 +594,7 @@ BrowserGlue.prototype = {
   // initialization (called on application startup) 
   _init: function BG__init() {
     let os = Services.obs;
+    os.addObserver(this, "notifications-open-settings", false);
     os.addObserver(this, "prefservice:after-app-defaults", false);
     os.addObserver(this, "final-ui-startup", false);
     os.addObserver(this, "browser-delayed-startup-finished", false);
@@ -639,6 +643,7 @@ BrowserGlue.prototype = {
   // cleanup (called on application shutdown)
   _dispose: function BG__dispose() {
     let os = Services.obs;
+    os.removeObserver(this, "notifications-open-settings");
     os.removeObserver(this, "prefservice:after-app-defaults");
     os.removeObserver(this, "final-ui-startup");
     os.removeObserver(this, "sessionstore-windows-restored");
@@ -2361,6 +2366,19 @@ BrowserGlue.prototype = {
     }
   }),
 
+  /**
+   * Open preferences even if there are no open windows.
+   */
+  _openPreferences(...args) {
+    if (Services.appShell.hiddenDOMWindow.openPreferences) {
+      Services.appShell.hiddenDOMWindow.openPreferences(...args);
+      return;
+    }
+
+    let chromeWindow = RecentWindow.getMostRecentBrowserWindow();
+    chromeWindow.openPreferences(...args);
+  },
+
 #ifdef MOZ_SERVICES_SYNC
   /**
    * Called as an observer when Sync's "display URI" notification is fired.

From 5c69b71f9393613efc9294d4bd487a76f70fb4bb Mon Sep 17 00:00:00 2001
From: Sergej Kravcenko <sergej@codewaves.com>
Date: Thu, 1 Oct 2015 05:16:20 +0300
Subject: [PATCH 32/35] Bug 1207872 - Saved search suggestions DB query in
 SearchEngineRow runs on UI thread.r=ally

---
 mobile/android/base/home/BrowserSearch.java   | 130 +++++++++++++++---
 mobile/android/base/home/SearchEngineRow.java |  80 +++--------
 2 files changed, 129 insertions(+), 81 deletions(-)

diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java
index 6ed13ba2b169..dddb1a7df615 100644
--- a/mobile/android/base/home/BrowserSearch.java
+++ b/mobile/android/base/home/BrowserSearch.java
@@ -14,6 +14,7 @@ import java.util.Locale;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoAppShell;
@@ -25,6 +26,7 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserContract.History;
 import org.mozilla.gecko.db.BrowserContract.URLColumns;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
@@ -35,6 +37,7 @@ import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
@@ -94,6 +97,7 @@ public class BrowserSearch extends HomeFragment
 
     // AsyncTask loader ID for suggestion query
     private static final int LOADER_ID_SUGGESTION = 1;
+    private static final int LOADER_ID_SAVED_SUGGESTION = 2;
 
     // Timeout for the suggestion client to respond
     private static final int SUGGESTION_TIMEOUT = 3000;
@@ -137,6 +141,9 @@ public class BrowserSearch extends HomeFragment
     // Access to this member must only occur from the UI thread.
     private List<SearchEngine> mSearchEngines;
 
+    // Search history suggestions
+    private ArrayList<String> mSearchHistorySuggestions;
+
     // Track the locale that was last in use when we filled mSearchEngines.
     // Access to this member must only occur from the UI thread.
     private Locale mLastLocale;
@@ -148,7 +155,8 @@ public class BrowserSearch extends HomeFragment
     private CursorLoaderCallbacks mCursorLoaderCallbacks;
 
     // Callbacks used for the search suggestion loader
-    private SuggestionLoaderCallbacks mSuggestionLoaderCallbacks;
+    private SearchEngineSuggestionLoaderCallbacks mSearchEngineSuggestionLoaderCallbacks;
+    private SearchHistorySuggestionLoaderCallbacks mSearchHistorySuggestionLoaderCallback;
 
     // Autocomplete handler used when filtering results
     private AutocompleteHandler mAutocompleteHandler;
@@ -220,6 +228,7 @@ public class BrowserSearch extends HomeFragment
         super.onCreate(savedInstanceState);
 
         mSearchEngines = new ArrayList<SearchEngine>();
+        mSearchHistorySuggestions = new ArrayList<>();
     }
 
     @Override
@@ -355,7 +364,8 @@ public class BrowserSearch extends HomeFragment
         mList.setAdapter(mAdapter);
 
         // Only create an instance when we need it
-        mSuggestionLoaderCallbacks = null;
+        mSearchEngineSuggestionLoaderCallbacks = null;
+        mSearchHistorySuggestionLoaderCallback = null;
 
         // Create callbacks before the initial loader is started
         mCursorLoaderCallbacks = new CursorLoaderCallbacks();
@@ -519,11 +529,20 @@ public class BrowserSearch extends HomeFragment
             return;
         }
 
-        if (mSuggestionLoaderCallbacks == null) {
-            mSuggestionLoaderCallbacks = new SuggestionLoaderCallbacks();
+        // Suggestions from search engine
+        if (mSearchEngineSuggestionLoaderCallbacks == null) {
+            mSearchEngineSuggestionLoaderCallbacks = new SearchEngineSuggestionLoaderCallbacks();
         }
+        getLoaderManager().restartLoader(LOADER_ID_SUGGESTION, null, mSearchEngineSuggestionLoaderCallbacks);
 
-        getLoaderManager().restartLoader(LOADER_ID_SUGGESTION, null, mSuggestionLoaderCallbacks);
+        // Start search history suggestions query only in nightly. Bug 1201325
+        if (AppConstants.NIGHTLY_BUILD) {
+            // Saved suggestions
+            if (mSearchHistorySuggestionLoaderCallback == null) {
+                mSearchHistorySuggestionLoaderCallback = new SearchHistorySuggestionLoaderCallbacks();
+            }
+            getLoaderManager().restartLoader(LOADER_ID_SAVED_SUGGESTION, null, mSearchHistorySuggestionLoaderCallback);
+        }
     }
 
     private void setSuggestions(ArrayList<String> suggestions) {
@@ -533,6 +552,13 @@ public class BrowserSearch extends HomeFragment
         mAdapter.notifyDataSetChanged();
     }
 
+    private void setSavedSuggestions(ArrayList<String> savedSuggestions) {
+        ThreadUtils.assertOnUiThread();
+
+        mSearchHistorySuggestions = savedSuggestions;
+        mAdapter.notifyDataSetChanged();
+    }
+
     private void setSearchEngines(JSONObject data) {
         ThreadUtils.assertOnUiThread();
 
@@ -788,22 +814,15 @@ public class BrowserSearch extends HomeFragment
         }
     }
 
-    private static class SuggestionAsyncLoader extends AsyncTaskLoader<ArrayList<String>> {
-        private final SuggestClient mSuggestClient;
-        private final String mSearchTerm;
+    abstract private static class SuggestionAsyncLoader extends AsyncTaskLoader<ArrayList<String>> {
+        protected final String mSearchTerm;
         private ArrayList<String> mSuggestions;
 
-        public SuggestionAsyncLoader(Context context, SuggestClient suggestClient, String searchTerm) {
+        public SuggestionAsyncLoader(Context context, String searchTerm) {
             super(context);
-            mSuggestClient = suggestClient;
             mSearchTerm = searchTerm;
         }
 
-        @Override
-        public ArrayList<String> loadInBackground() {
-            return mSuggestClient.query(mSearchTerm);
-        }
-
         @Override
         public void deliverResult(ArrayList<String> suggestions) {
             mSuggestions = suggestions;
@@ -838,6 +857,58 @@ public class BrowserSearch extends HomeFragment
         }
     }
 
+    private static class SearchEngineSuggestionAsyncLoader extends SuggestionAsyncLoader {
+        private final SuggestClient mSuggestClient;
+
+        public SearchEngineSuggestionAsyncLoader(Context context, SuggestClient suggestClient, String searchTerm) {
+            super(context, searchTerm);
+            mSuggestClient = suggestClient;
+        }
+
+        @Override
+        public ArrayList<String> loadInBackground() {
+            return mSuggestClient.query(mSearchTerm);
+        }
+    }
+
+    private static class SearchHistorySuggestionAsyncLoader extends SuggestionAsyncLoader {
+        public SearchHistorySuggestionAsyncLoader(Context context, String searchTerm) {
+            super(context, searchTerm);
+        }
+
+        @Override
+        public ArrayList<String> loadInBackground() {
+            final ContentResolver cr = getContext().getContentResolver();
+
+            String[] columns = new String[] { BrowserContract.SearchHistory.QUERY };
+            String actualQuery = BrowserContract.SearchHistory.QUERY + " LIKE ?";
+            String[] queryArgs = new String[] { '%' + mSearchTerm + '%' };
+
+            final int maxSavedSuggestions = getContext().getResources().getInteger(R.integer.max_saved_suggestions);
+            final String sortOrderAndLimit = BrowserContract.SearchHistory.DATE +" DESC LIMIT " + maxSavedSuggestions;
+            final Cursor result =  cr.query(BrowserContract.SearchHistory.CONTENT_URI, columns, actualQuery, queryArgs, sortOrderAndLimit);
+
+            if (result == null) {
+                return new ArrayList<>();
+            }
+
+            final ArrayList<String> savedSuggestions = new ArrayList<>();
+            try {
+                if (result.moveToFirst()) {
+                    final int searchColumn = result.getColumnIndexOrThrow(BrowserContract.SearchHistory.QUERY);
+                    do {
+                        final String savedSearch = result.getString(searchColumn);
+                        savedSuggestions.add(savedSearch);
+                    } while (result.moveToNext());
+                }
+            } finally {
+                result.close();
+            }
+
+            return savedSuggestions;
+        }
+    }
+
     private class SearchAdapter extends MultiTypeCursorAdapter {
         private static final int ROW_SEARCH = 0;
         private static final int ROW_STANDARD = 1;
@@ -915,8 +986,9 @@ public class BrowserSearch extends HomeFragment
                 row.setSearchTerm(mSearchTerm);
 
                 final SearchEngine engine = mSearchEngines.get(position);
-                final boolean animate = (mAnimateSuggestions && engine.hasSuggestions());
-                row.updateSuggestions(mSuggestionsEnabled, engine, mSearchTerm, animate);
+                final boolean haveSuggestions = (engine.hasSuggestions() || !mSearchHistorySuggestions.isEmpty());
+                final boolean animate = (mAnimateSuggestions && haveSuggestions);
+                row.updateSuggestions(mSuggestionsEnabled, engine, mSearchHistorySuggestions, animate);
                 if (animate) {
                     // Only animate suggestions the first time they are shown
                     mAnimateSuggestions = false;
@@ -955,13 +1027,13 @@ public class BrowserSearch extends HomeFragment
         }
     }
 
-    private class SuggestionLoaderCallbacks implements LoaderCallbacks<ArrayList<String>> {
+    private class SearchEngineSuggestionLoaderCallbacks implements LoaderCallbacks<ArrayList<String>> {
         @Override
         public Loader<ArrayList<String>> onCreateLoader(int id, Bundle args) {
             // mSuggestClient is set to null in onDestroyView(), so using it
             // safely here relies on the fact that onCreateLoader() is called
             // synchronously in restartLoader().
-            return new SuggestionAsyncLoader(getActivity(), mSuggestClient, mSearchTerm);
+            return new SearchEngineSuggestionAsyncLoader(getActivity(), mSuggestClient, mSearchTerm);
         }
 
         @Override
@@ -975,6 +1047,26 @@ public class BrowserSearch extends HomeFragment
         }
     }
 
+    private class SearchHistorySuggestionLoaderCallbacks implements LoaderCallbacks<ArrayList<String>> {
+        @Override
+        public Loader<ArrayList<String>> onCreateLoader(int id, Bundle args) {
+            // mSuggestClient is set to null in onDestroyView(), so using it
+            // safely here relies on the fact that onCreateLoader() is called
+            // synchronously in restartLoader().
+            return new SearchHistorySuggestionAsyncLoader(getActivity(), mSearchTerm);
+        }
+
+        @Override
+        public void onLoadFinished(Loader<ArrayList<String>> loader, ArrayList<String> suggestions) {
+            setSavedSuggestions(suggestions);
+        }
+
+        @Override
+        public void onLoaderReset(Loader<ArrayList<String>> loader) {
+            setSavedSuggestions(new ArrayList<String>());
+        }
+    }
+
     private static class ListSelectionListener implements View.OnFocusChangeListener,
                                                           AdapterView.OnItemSelectedListener {
         private SearchEngineRow mSelectedEngineRow;
diff --git a/mobile/android/base/home/SearchEngineRow.java b/mobile/android/base/home/SearchEngineRow.java
index 5df280492748..69c160722f11 100644
--- a/mobile/android/base/home/SearchEngineRow.java
+++ b/mobile/android/base/home/SearchEngineRow.java
@@ -6,7 +6,6 @@
 package org.mozilla.gecko.home;
 
 import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
@@ -22,8 +21,6 @@ import org.mozilla.gecko.widget.AnimatedHeightLayout;
 import org.mozilla.gecko.widget.FaviconView;
 import org.mozilla.gecko.widget.FlowLayout;
 
-import android.database.Cursor;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
@@ -37,6 +34,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.EnumSet;
+import java.util.List;
 
 class SearchEngineRow extends AnimatedHeightLayout {
     // Duration for fade-in animation
@@ -242,55 +240,26 @@ class SearchEngineRow extends AnimatedHeightLayout {
     /**
      * Displays search suggestions from previous searches.
      *
-     * @param c The Cursor to iterate over for saved search suggestion to display
+     * @param savedSuggestions The List to iterate over for saved search suggestions to display
      * @param suggestionCounter global index of where to start adding suggestion "buttons" in the search engine row
      * @param animate whether or not to animate suggestions for visual polish
      * @param recycledSuggestionCount How many suggestion "button" views we could recycle from previous calls
      */
-    private void updateFromSavedSearches(Cursor c, boolean animate, int suggestionCounter, int recycledSuggestionCount) {
-        if (c == null) {
+    private void updateFromSavedSearches(List<String> savedSuggestions, boolean animate, int suggestionCounter, int recycledSuggestionCount) {
+        if (savedSuggestions == null || savedSuggestions.isEmpty()) {
             return;
         }
-        try {
-            if (c.moveToFirst()) {
-                final int searchColumn = c.getColumnIndexOrThrow(SearchHistory.QUERY);
-                final int historyStartIndex = suggestionCounter;
-                do {
-                    final String savedSearch = c.getString(searchColumn);
-                    // suggestionCounter counts all suggestions (from history and the search engine)
-                    // but we want the relative position of the history item in telemetry
-                    String telemetryTag = "history." + (suggestionCounter - historyStartIndex);
-                    bindSuggestionView(savedSearch, animate, recycledSuggestionCount, suggestionCounter, true, telemetryTag);
-                    ++suggestionCounter;
-                } while (c.moveToNext());
-            }
-        } finally {
-            c.close();
+
+        final int historyStartIndex = suggestionCounter;
+        for (String suggestion : savedSuggestions) {
+            String telemetryTag = "history." + (suggestionCounter - historyStartIndex);
+            bindSuggestionView(suggestion, animate, recycledSuggestionCount, suggestionCounter, true, telemetryTag);
+            ++suggestionCounter;
         }
+
         hideRecycledSuggestions(suggestionCounter, recycledSuggestionCount);
     }
 
-    /**
-     * Gets matching suggestions from search history.
-     *
-     * @param searchTerm the string with which to look for matches in the saved searches
-     * @return matching prior searches that contain searchTerm
-     */
-    private Cursor getSavedSearches(String searchTerm) {
-        if (!AppConstants.NIGHTLY_BUILD) {
-            return null;
-        }
-
-        final ContentResolver cr = getContext().getContentResolver();
-
-        String[] columns = new String[] { SearchHistory.QUERY };
-        String actualQuery = SearchHistory.QUERY + " LIKE ?";
-        String[] queryArgs = new String[] { '%' + searchTerm + '%' };
-
-        String sortOrderAndLimit = SearchHistory.DATE +" DESC LIMIT " + mMaxSavedSuggestions;
-        return cr.query(SearchHistory.CONTENT_URI, columns, actualQuery, queryArgs, sortOrderAndLimit);
-    }
-
     /**
      * Displays suggestions supplied by the search engine, relative to number of suggestions from search history.
      *
@@ -341,10 +310,10 @@ class SearchEngineRow extends AnimatedHeightLayout {
      *
      * @param searchSuggestionsEnabled whether or not suggestions from the default search engine are enabled
      * @param searchEngine the search engine to use throughout the SearchEngineRow class
-     * @param searchTerm the text from the url to get suggestions on
+     * @param searchHistorySuggestions search history suggestions
      * @param animate whether or not to use animations
      **/
-    public void updateSuggestions(boolean searchSuggestionsEnabled, SearchEngine searchEngine, String searchTerm, boolean animate) {
+    public void updateSuggestions(boolean searchSuggestionsEnabled, SearchEngine searchEngine, List<String> searchHistorySuggestions, boolean animate) {
         mSearchEngine = searchEngine;
         // Set the search engine icon (e.g., Google) for the row.
         mIconView.updateAndScaleImage(mSearchEngine.getIcon(), mSearchEngine.getEngineIdentifier());
@@ -363,25 +332,12 @@ class SearchEngineRow extends AnimatedHeightLayout {
         final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);
 
         if (searchSuggestionsEnabled && savedSearchesEnabled) {
-            final Cursor c = getSavedSearches(searchTerm);
-            try {
-                final int savedSearchCount = (c != null) ? c.getCount() : 0;
-                final int suggestionViewCount = updateFromSearchEngine(animate, recycledSuggestionCount, savedSearchCount);
-                updateFromSavedSearches(c, animate, suggestionViewCount, recycledSuggestionCount);
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
+            final int savedSearchCount = (searchHistorySuggestions != null) ? searchHistorySuggestions.size() : 0;
+            final int suggestionViewCount = updateFromSearchEngine(animate, recycledSuggestionCount, savedSearchCount);
+            updateFromSavedSearches(searchHistorySuggestions, animate, suggestionViewCount, recycledSuggestionCount);
+
         } else if (savedSearchesEnabled) {
-            final Cursor c = getSavedSearches(searchTerm);
-            try {
-                updateFromSavedSearches(c, animate, 0, recycledSuggestionCount);
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
+            updateFromSavedSearches(searchHistorySuggestions, animate, 0, recycledSuggestionCount);
         } else if (searchSuggestionsEnabled) {
             updateFromSearchEngine(animate, recycledSuggestionCount, 0);
         }

From c1121ee892fb6589e1d40fb44b58a3aa569f204d Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 5 Oct 2015 16:38:03 -0700
Subject: [PATCH 33/35] Backed out 6 changesets (bug 1110511) for automation
 timeouts in mochitest-bc suites

Backed out changeset eddfd7f32a1c (bug 1110511)
Backed out changeset 0eb0dda094b3 (bug 1110511)
Backed out changeset 8e20cd68ca78 (bug 1110511)
Backed out changeset c7b983f65568 (bug 1110511)
Backed out changeset 219d86f78b6b (bug 1110511)
Backed out changeset 0e055b648e10 (bug 1110511)
---
 browser/app/profile/firefox.js                |   6 -
 browser/base/content/aboutTabCrashed.js       |  68 +---
 browser/base/content/aboutTabCrashed.xhtml    |  16 +-
 browser/base/content/browser.js               |  10 +-
 browser/base/content/test/general/browser.ini |   2 -
 .../test/general/browser_aboutTabCrashed.js   | 335 ------------------
 .../test/browser_async_flushes.js             |   2 +-
 .../sessionstore/test/browser_crashedTabs.js  |  18 +-
 browser/components/sessionstore/test/head.js  | 106 ++++++
 .../en-US/chrome/browser/aboutTabCrashed.dtd  |   5 -
 browser/modules/ContentCrashReporters.jsm     |  86 +----
 browser/themes/shared/aboutTabCrashed.css     |  31 --
 .../BrowserTestUtils/BrowserTestUtils.jsm     | 137 +------
 .../browser/browser_content_url_annotation.js |  68 +++-
 .../themes/shared/in-content/common.inc.css   |  27 +-
 15 files changed, 212 insertions(+), 705 deletions(-)
 delete mode 100644 browser/base/content/test/general/browser_aboutTabCrashed.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 052a23c8f02c..c0e188586d90 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1882,12 +1882,6 @@ pref("browser.tabs.remote.autostart.1", false);
 pref("browser.tabs.remote.autostart.2", true);
 #endif
 
-// For the about:tabcrashed page
-pref("browser.tabs.crashReporting.sendReport", true);
-pref("browser.tabs.crashReporting.includeURL", false);
-pref("browser.tabs.crashReporting.emailMe", false);
-pref("browser.tabs.crashReporting.email", "");
-
 #ifdef NIGHTLY_BUILD
 #ifndef MOZ_MULET
 pref("layers.async-pan-zoom.enabled", true);
diff --git a/browser/base/content/aboutTabCrashed.js b/browser/base/content/aboutTabCrashed.js
index 5ff0071a46e2..a0abedc0e58f 100644
--- a/browser/base/content/aboutTabCrashed.js
+++ b/browser/base/content/aboutTabCrashed.js
@@ -3,66 +3,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function parseQueryString() {
-  let URL = document.documentURI;
-  let queryString = URL.replace(/^about:tabcrashed?e=tabcrashed/, "");
+  let url = document.documentURI;
+  let queryString = url.replace(/^about:tabcrashed?e=tabcrashed/, "");
 
   let titleMatch = queryString.match(/d=([^&]*)/);
-  let URLMatch = queryString.match(/u=([^&]*)/);
-  return {
-    title: titleMatch && titleMatch[1] ? decodeURIComponent(titleMatch[1]) : "",
-    URL: URLMatch && URLMatch[1] ? decodeURIComponent(URLMatch[1]) : "",
-  };
+  return titleMatch && titleMatch[1] ? decodeURIComponent(titleMatch[1]) : "";
 }
 
-function displayUI() {
-  if (!hasReport()) {
-    return;
-  }
+document.title = parseQueryString();
 
-  let sendCrashReport = document.getElementById("sendReport").checked;
-  let container = document.getElementById("crash-reporter-container");
-  container.hidden = !sendCrashReport;
-}
-
-function hasReport() {
-  return document.documentElement.classList.contains("crashDumpAvailable");
+function shouldSendReport() {
+  if (!document.documentElement.classList.contains("crashDumpAvailable"))
+    return false;
+  return document.getElementById("sendReport").checked;
 }
 
 function sendEvent(message) {
-  let comments = "";
-  let email = "";
-  let URL = "";
-  let sendCrashReport = false;
-  let emailMe = false;
-  let includeURL = false;
-
-  if (hasReport()) {
-    sendCrashReport = document.getElementById("sendReport").checked;
-    if (sendCrashReport) {
-      comments = document.getElementById("comments").value.trim();
-
-      includeURL = document.getElementById("includeURL").checked;
-      if (includeURL) {
-        URL = parseQueryString().URL.trim();
-      }
-
-      emailMe = document.getElementById("emailMe").checked;
-      if (emailMe) {
-        email = document.getElementById("email").value.trim();
-      }
-    }
-  }
-
   let event = new CustomEvent("AboutTabCrashedMessage", {
     bubbles: true,
     detail: {
       message,
-      sendCrashReport,
-      comments,
-      email,
-      emailMe,
-      includeURL,
-      URL,
+      sendCrashReport: shouldSendReport(),
     },
   });
 
@@ -81,17 +42,6 @@ function restoreAll() {
   sendEvent("restoreAll");
 }
 
-document.title = parseQueryString().title;
-
 // Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
 var event = new CustomEvent("AboutTabCrashedLoad", {bubbles:true});
 document.dispatchEvent(event);
-
-addEventListener("DOMContentLoaded", function() {
-  let sendReport = document.getElementById("sendReport");
-  sendReport.addEventListener("click", function() {
-    displayUI();
-  });
-
-  displayUI();
-});
diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml
index 9de02cc21029..ec1f37161bf1 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -37,22 +37,8 @@
       <p>&tabCrashed.message;</p>
 
       <div id="report-box">
-        <input type="checkbox" id="sendReport"/>
+        <input type="checkbox" id="sendReport" checked="checked"/>
         <label for="sendReport">&tabCrashed.sendReport;</label>
-        <div id="crash-reporter-container" hidden="true">
-          <p id="crash-reporter-title">&tabCrashed.crashReporter;</p>
-          <textarea id="comments" placeholder="&tabCrashed.commentPlaceholder;" rows="4"></textarea>
-
-          <ul id="options">
-            <li><input type="checkbox" id="includeURL"/>
-            <label for="includeURL">&tabCrashed.includeURL;</label></li>
-
-            <li><input type="checkbox" id="emailMe"/>
-            <label for="emailMe">&tabCrashed.emailMe;</label></li>
-          </ul>
-
-          <input type="text" id="email" placeholder="&tabCrashed.emailPlaceholder;"/>
-        </div>
       </div>
 
       <p id="reportSent">&tabCrashed.reportSent;</p>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index c3e933b338e8..ed10547395f3 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1166,15 +1166,7 @@ var gBrowserInit = {
       let browser = gBrowser.getBrowserForDocument(ownerDoc);
 #ifdef MOZ_CRASHREPORTER
       if (event.detail.sendCrashReport) {
-        TabCrashReporter.submitCrashReport(browser, {
-          comments: event.detail.comments,
-          email: event.detail.email,
-          emailMe: event.detail.emailMe,
-          includeURL: event.detail.includeURL,
-          URL: event.detail.URL,
-        });
-      } else {
-        TabCrashReporter.dontSubmitCrashReport();
+        TabCrashReporter.submitCrashReport(browser);
       }
 #endif
 
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 4b956cfd7122..41a5b611273c 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -525,5 +525,3 @@ support-files =
   readerModeArticle.html
 [browser_domFullscreen_fullscreenMode.js]
 [browser_menuButtonBadgeManager.js]
-[browser_aboutTabCrashed.js]
-skip-if = !e10s || !crashreporter
diff --git a/browser/base/content/test/general/browser_aboutTabCrashed.js b/browser/base/content/test/general/browser_aboutTabCrashed.js
deleted file mode 100644
index bacf9d54441f..000000000000
--- a/browser/base/content/test/general/browser_aboutTabCrashed.js
+++ /dev/null
@@ -1,335 +0,0 @@
-"use strict";
-
-let { TabCrashReporter } =
-  Cu.import("resource:///modules/ContentCrashReporters.jsm");
-
-const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
-const PAGE = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
-const COMMENTS = "Here's my test comment!";
-const EMAIL = "foo@privacy.com";
-
-/**
- * For an nsIPropertyBag, returns the value for a given
- * key.
- *
- * @param bag
- *        The nsIPropertyBag to retrieve the value from
- * @param key
- *        The key that we want to get the value for from the
- *        bag
- * @returns The value corresponding to the key from the bag,
- *          or null if the value could not be retrieved (for
- *          example, if no value is set at that key).
-*/
-function getPropertyBagValue(bag, key) {
-  try {
-    let val = bag.getProperty(key);
-    return val;
-  } catch(e if e.result == Cr.NS_ERROR_FAILURE) {}
-
-  return null;
-}
-
-/**
- * Returns a Promise that resolves once a crash report has
- * been submitted. This function will also test the crash
- * reports extra data to see if it matches expectedExtra.
- *
- * @param expectedExtra
- *        An Object whose key-value pairs will be compared
- *        against the key-value pairs in the extra data of the
- *        crash report. A test failure will occur if there is
- *        a mismatch.
- *
- *        Note that this will only check the values that exist
- *        in expectedExtra. It's possible that the crash report
- *        will contain other extra information that is not
- *        compared against.
- * @returns Promise
- */
-function promiseCrashReport(expectedExtra) {
-  return Task.spawn(function*() {
-    info("Starting wait on crash-report-status");
-    let [subject, data] =
-      yield TestUtils.topicObserved("crash-report-status", (subject, data) => {
-        return data == "success";
-      });
-    info("Topic observed!");
-
-    if (!(subject instanceof Ci.nsIPropertyBag2)) {
-      throw new Error("Subject was not a Ci.nsIPropertyBag2");
-    }
-
-    let remoteID = getPropertyBagValue(subject, "serverCrashID");
-    if (!remoteID) {
-      throw new Error("Report should have a server ID");
-    }
-
-    let file = Cc["@mozilla.org/file/local;1"]
-                 .createInstance(Ci.nsILocalFile);
-    file.initWithPath(Services.crashmanager._submittedDumpsDir);
-    file.append(remoteID + ".txt");
-    if (!file.exists()) {
-      throw new Error("Report should have been received by the server");
-    }
-
-    file.remove(false);
-
-    let extra = getPropertyBagValue(subject, "extra");
-    if (!(extra instanceof Ci.nsIPropertyBag2)) {
-      throw new Error("extra was not a Ci.nsIPropertyBag2");
-    }
-
-    info("Iterating crash report extra keys");
-    let enumerator = extra.enumerator;
-    while (enumerator.hasMoreElements()) {
-      let key = enumerator.getNext().QueryInterface(Ci.nsIProperty).name;
-      let value = extra.getPropertyAsAString(key);
-      if (key in expectedExtra) {
-        is(value, expectedExtra[key],
-           `Crash report had the right extra value for ${key}`);
-      }
-    }
-  });
-}
-
-/**
- * Sets up the browser to send crash reports to the local crash report
- * testing server.
- */
-add_task(function* setup() {
-  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables crash
-  // reports.  This test needs them enabled.  The test also needs a mock
-  // report server, and fortunately one is already set up by toolkit/
-  // crashreporter/test/Makefile.in.  Assign its URL to MOZ_CRASHREPORTER_URL,
-  // which CrashSubmit.jsm uses as a server override.
-  let env = Cc["@mozilla.org/process/environment;1"]
-              .getService(Components.interfaces.nsIEnvironment);
-  let noReport = env.get("MOZ_CRASHREPORTER_NO_REPORT");
-  let serverUrl = env.get("MOZ_CRASHREPORTER_URL");
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-  env.set("MOZ_CRASHREPORTER_URL", SERVER_URL);
-
-  registerCleanupFunction(function() {
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", noReport);
-    env.set("MOZ_CRASHREPORTER_URL", serverUrl);
-  });
-});
-
-/**
- * This function returns a Promise that resolves once the following
- * actions have taken place:
- *
- * 1) A new tab is opened up at PAGE
- * 2) The tab is crashed
- * 3) The about:tabcrashed page's fields are set in accordance with
- *    fieldValues
- * 4) The tab is restored
- * 5) A crash report is received from the testing server
- * 6) Any tab crash prefs that were overwritten are reset
- *
- * @param fieldValues
- *        An Object describing how to set the about:tabcrashed
- *        fields. The following properties are accepted:
- *
- *        comments (String)
- *          The comments to put in the comment textarea
- *        email (String)
- *          The email address to put in the email address input
- *        emailMe (bool)
- *          The checked value of the "Email me" checkbox
- *        includeURL (bool)
- *          The checked value of the "Include URL" checkbox
- *
- *        If any of these fields are missing, the defaults from
- *        the user preferences are used.
- * @param expectedExtra
- *        An Object describing the expected values that the submitted
- *        crash report's extra data should contain.
- * @returns Promise
- */
-function crashTabTestHelper(fieldValues, expectedExtra) {
-  return BrowserTestUtils.withNewTab({
-    gBrowser,
-    url: PAGE,
-  }, function*(browser) {
-    let prefs = TabCrashReporter.prefs;
-    let originalSendReport = prefs.getBoolPref("sendReport");
-    let originalEmailMe = prefs.getBoolPref("emailMe");
-    let originalIncludeURL = prefs.getBoolPref("includeURL");
-    let originalEmail = prefs.getCharPref("email");
-
-    let tab = gBrowser.getTabForBrowser(browser);
-    yield BrowserTestUtils.crashBrowser(browser);
-    let doc = browser.contentDocument;
-
-    // Since about:tabcrashed will run in the parent process, we can safely
-    // manipulate its DOM nodes directly
-    let comments = doc.getElementById("comments");
-    let email = doc.getElementById("email");
-    let emailMe = doc.getElementById("emailMe");
-    let includeURL = doc.getElementById("includeURL");
-
-    if (fieldValues.hasOwnProperty("comments")) {
-      comments.value = fieldValues.comments;
-    }
-
-    if (fieldValues.hasOwnProperty("email")) {
-      email.value = fieldValues.email;
-    }
-
-    if (fieldValues.hasOwnProperty("emailMe")) {
-      emailMe.checked = fieldValues.emailMe;
-    }
-
-    if (fieldValues.hasOwnProperty("includeURL")) {
-      includeURL.checked = fieldValues.includeURL;
-    }
-
-    let crashReport = promiseCrashReport(expectedExtra);
-    let restoreTab = browser.contentDocument.getElementById("restoreTab");
-    restoreTab.click();
-    yield BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
-    yield crashReport;
-
-    // Submitting the crash report may have set some prefs regarding how to
-    // send tab crash reports. Let's reset them for the next test.
-    prefs.setBoolPref("sendReport", originalSendReport);
-    prefs.setBoolPref("emailMe", originalEmailMe);
-    prefs.setBoolPref("includeURL", originalIncludeURL);
-    prefs.setCharPref("email", originalEmail);
-  });
-}
-
-/**
- * Tests what we send with the crash report by default. By default, we do not
- * send any comments, the URL of the crashing page, or the email address of
- * the user.
- */
-add_task(function* test_default() {
-  yield crashTabTestHelper({}, {
-    "Comments": "",
-    "URL": "",
-    "Email": "",
-  });
-});
-
-/**
- * Test just sending a comment.
- */
-add_task(function* test_just_a_comment() {
-  yield crashTabTestHelper({
-    comments: COMMENTS,
-  }, {
-    "Comments": COMMENTS,
-    "URL": "",
-    "Email": "",
-  });
-});
-
-/**
- * Test that we don't send email if emailMe is unchecked
- */
-add_task(function* test_no_email() {
-  yield crashTabTestHelper({
-    email: EMAIL,
-    emailMe: false,
-  }, {
-    "Comments": "",
-    "URL": "",
-    "Email": "",
-  });
-});
-
-/**
- * Test that we can send an email address if emailMe is checked
- */
-add_task(function* test_yes_email() {
-  yield crashTabTestHelper({
-    email: EMAIL,
-    emailMe: true,
-  }, {
-    "Comments": "",
-    "URL": "",
-    "Email": EMAIL,
-  });
-});
-
-/**
- * Test that we will send the URL of the page if includeURL is checked.
- */
-add_task(function* test_send_URL() {
-  yield crashTabTestHelper({
-    includeURL: true,
-  }, {
-    "Comments": "",
-    "URL": PAGE,
-    "Email": "",
-  });
-});
-
-/**
- * Test that we can send comments, the email address, and the URL
- */
-add_task(function* test_send_all() {
-  yield crashTabTestHelper({
-    includeURL: true,
-    emailMe: true,
-    email: EMAIL,
-    comments: COMMENTS,
-  }, {
-    "Comments": COMMENTS,
-    "URL": PAGE,
-    "Email": EMAIL,
-  });
-});
-
-/**
- * Test that if we have an email address stored in prefs, and we decide
- * not to submit the email address in the next crash report, that we
- * clear the email address.
- */
-add_task(function* test_clear_email() {
-  return BrowserTestUtils.withNewTab({
-    gBrowser,
-    url: PAGE,
-  }, function*(browser) {
-    let prefs = TabCrashReporter.prefs;
-    let originalSendReport = prefs.getBoolPref("sendReport");
-    let originalEmailMe = prefs.getBoolPref("emailMe");
-    let originalIncludeURL = prefs.getBoolPref("includeURL");
-    let originalEmail = prefs.getCharPref("email");
-
-    // Pretend that we stored an email address from the previous
-    // crash
-    prefs.setCharPref("email", EMAIL);
-    prefs.setBoolPref("emailMe", true);
-
-    let tab = gBrowser.getTabForBrowser(browser);
-    yield BrowserTestUtils.crashBrowser(browser);
-    let doc = browser.contentDocument;
-
-    // Since about:tabcrashed will run in the parent process, we can safely
-    // manipulate its DOM nodes directly
-    let emailMe = doc.getElementById("emailMe");
-    emailMe.checked = false;
-
-    let crashReport = promiseCrashReport({
-      Email: "",
-    });
-
-    let restoreTab = browser.contentDocument.getElementById("restoreTab");
-    restoreTab.click();
-    yield BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
-    yield crashReport;
-
-    is(prefs.getCharPref("email"), "", "No email address should be stored");
-
-    // Submitting the crash report may have set some prefs regarding how to
-    // send tab crash reports. Let's reset them for the next test.
-    prefs.setBoolPref("sendReport", originalSendReport);
-    prefs.setBoolPref("emailMe", originalEmailMe);
-    prefs.setBoolPref("includeURL", originalIncludeURL);
-    prefs.setCharPref("email", originalEmail);
-  });
-});
diff --git a/browser/components/sessionstore/test/browser_async_flushes.js b/browser/components/sessionstore/test/browser_async_flushes.js
index fe6e5b639ffd..f5496e9e60e3 100644
--- a/browser/components/sessionstore/test/browser_async_flushes.js
+++ b/browser/components/sessionstore/test/browser_async_flushes.js
@@ -69,7 +69,7 @@ add_task(function* test_crash() {
   // the content process. The "crash" message makes it first so that we don't
   // get a chance to process the flush. The TabStateFlusher however should be
   // notified so that the flush still completes.
-  let promise1 = BrowserTestUtils.crashBrowser(browser);
+  let promise1 = crashBrowser(browser);
   let promise2 = TabStateFlusher.flush(browser);
   yield Promise.all([promise1, promise2]);
 
diff --git a/browser/components/sessionstore/test/browser_crashedTabs.js b/browser/components/sessionstore/test/browser_crashedTabs.js
index 72df2d2a6c45..71eca9e0baa4 100644
--- a/browser/components/sessionstore/test/browser_crashedTabs.js
+++ b/browser/components/sessionstore/test/browser_crashedTabs.js
@@ -117,7 +117,7 @@ add_task(function test_crash_page_not_in_history() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   // Check the tab state and make sure the tab crashed page isn't
   // mentioned.
@@ -146,7 +146,7 @@ add_task(function test_revived_history_from_remote() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   // Browse to a new site that will cause the browser to
   // become remote again.
@@ -185,7 +185,7 @@ add_task(function test_revived_history_from_non_remote() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   // Browse to a new site that will not cause the browser to
   // become remote again.
@@ -235,7 +235,7 @@ add_task(function test_revive_tab_from_session_store() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
   is(newTab2.getAttribute("crashed"), "true", "Second tab should be crashed too.");
 
   // Use SessionStore to revive the tab
@@ -286,7 +286,7 @@ add_task(function test_revive_all_tabs_from_session_store() {
   yield TabStateFlusher.flush(browser2);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
   is(newTab2.getAttribute("crashed"), "true", "Second tab should be crashed too.");
 
   // Use SessionStore to revive all the tabs
@@ -331,7 +331,7 @@ add_task(function test_close_tab_after_crash() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   let promise = promiseEvent(gBrowser.tabContainer, "TabClose");
 
@@ -359,7 +359,7 @@ add_task(function* test_hide_restore_all_button() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   let doc = browser.contentDocument;
   let restoreAllButton = doc.getElementById("restoreAll");
@@ -375,7 +375,7 @@ add_task(function* test_hide_restore_all_button() {
   yield promiseBrowserLoaded(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   doc = browser.contentDocument;
   restoreAllButton = doc.getElementById("restoreAll");
@@ -405,7 +405,7 @@ add_task(function* test_aboutcrashedtabzoom() {
   yield TabStateFlusher.flush(browser);
 
   // Crash the tab
-  yield BrowserTestUtils.crashBrowser(browser);
+  yield crashBrowser(browser);
 
   ok(ZoomManager.getZoomForBrowser(browser) === 1, "zoom should have reset on crash");
 
diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index af326cc7c704..da4c0328ee0c 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -538,6 +538,112 @@ function promiseRemoveTab(tab) {
   return BrowserTestUtils.removeTab(tab);
 }
 
+/**
+ * Returns a Promise that resolves once a remote <xul:browser> has experienced
+ * a crash. Also does the job of cleaning up the minidump of the crash.
+ *
+ * @param browser
+ *        The <xul:browser> that will crash
+ * @return Promise
+ */
+function crashBrowser(browser) {
+  /**
+   * Returns the directory where crash dumps are stored.
+   *
+   * @return nsIFile
+   */
+  function getMinidumpDirectory() {
+    let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+    dir.append("minidumps");
+    return dir;
+  }
+
+  /**
+   * Removes a file from a directory. This is a no-op if the file does not
+   * exist.
+   *
+   * @param directory
+   *        The nsIFile representing the directory to remove from.
+   * @param filename
+   *        A string for the file to remove from the directory.
+   */
+  function removeFile(directory, filename) {
+    let file = directory.clone();
+    file.append(filename);
+    if (file.exists()) {
+      file.remove(false);
+    }
+  }
+
+  // This frame script is injected into the remote browser, and used to
+  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+  // a bad pointer. The crash should happen immediately upon loading this
+  // frame script.
+  let frame_script = () => {
+    const Cu = Components.utils;
+    Cu.import("resource://gre/modules/ctypes.jsm");
+
+    let dies = function() {
+      privateNoteIntentionalCrash();
+      let zero = new ctypes.intptr_t(8);
+      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+      badptr.contents
+    };
+
+    dump("Et tu, Brute?");
+    dies();
+  }
+
+  let crashCleanupPromise = new Promise((resolve, reject) => {
+    let observer = (subject, topic, data) => {
+      is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
+      ok(subject instanceof Ci.nsIPropertyBag2,
+         'Subject implements nsIPropertyBag2.');
+      // we might see this called as the process terminates due to previous tests.
+      // We are only looking for "abnormal" exits...
+      if (!subject.hasKey("abnormal")) {
+        info("This is a normal termination and isn't the one we are looking for...");
+        return;
+      }
+
+      let dumpID;
+      if ('nsICrashReporter' in Ci) {
+        dumpID = subject.getPropertyAsAString('dumpID');
+        ok(dumpID, "dumpID is present and not an empty string");
+      }
+
+      if (dumpID) {
+        let minidumpDirectory = getMinidumpDirectory();
+        removeFile(minidumpDirectory, dumpID + '.dmp');
+        removeFile(minidumpDirectory, dumpID + '.extra');
+      }
+
+      Services.obs.removeObserver(observer, 'ipc:content-shutdown');
+      info("Crash cleaned up");
+      resolve();
+    };
+
+    Services.obs.addObserver(observer, 'ipc:content-shutdown');
+  });
+
+  let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
+    browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
+      browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
+      info("about:tabcrashed loaded");
+      resolve();
+    }, false, true);
+  });
+
+  // This frame script will crash the remote browser as soon as it is
+  // evaluated.
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  return Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]).then(() => {
+    let tab = gBrowser.getTabForBrowser(browser);
+    is(tab.getAttribute("crashed"), "true", "Tab should be marked as crashed");
+  });
+}
+
 // Write DOMSessionStorage data to the given browser.
 function modifySessionStorage(browser, data, options = {}) {
   return ContentTask.spawn(browser, [data, options], function* ([data, options]) {
diff --git a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd b/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
index eac62d7211f9..609e001989e4 100644
--- a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
@@ -5,11 +5,6 @@
 <!ENTITY tabCrashed.header "Bad news first: This tab has crashed">
 <!ENTITY tabCrashed.message "Now for the good news: You can just close this tab, restore it or restore all your crashed tabs.">
 <!ENTITY tabCrashed.sendReport "Submit a crash report to help prevent more bad news">
-<!ENTITY tabCrashed.includeURL "Include the address of the page I was on">
-<!ENTITY tabCrashed.commentPlaceholder "Add a comment (comments are publicly visible)">
-<!ENTITY tabCrashed.emailPlaceholder "Enter your email address here">
-<!ENTITY tabCrashed.emailMe "Email me when more information is available">
-<!ENTITY tabCrashed.crashReporter "Mozilla Crash Reporter">
 <!ENTITY tabCrashed.reportSent "Crash report already submitted; thank you for helping make &brandShortName; better!">
 <!ENTITY tabCrashed.closeTab "Close This Tab">
 <!ENTITY tabCrashed.restoreTab "Restore This Tab">
diff --git a/browser/modules/ContentCrashReporters.jsm b/browser/modules/ContentCrashReporters.jsm
index 7c43d9fbb201..34a1bd75b74f 100644
--- a/browser/modules/ContentCrashReporters.jsm
+++ b/browser/modules/ContentCrashReporters.jsm
@@ -17,11 +17,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "CrashSubmit",
   "resource://gre/modules/CrashSubmit.jsm");
 
 this.TabCrashReporter = {
-  get prefs() {
-    delete this.prefs;
-    return this.prefs = Services.prefs.getBranch("browser.tabs.crashReporting.");
-  },
-
   init: function () {
     if (this.initialized)
       return;
@@ -52,66 +47,21 @@ this.TabCrashReporter = {
         if (!browser)
           return;
 
-        this.browserMap.set(browser.permanentKey, aSubject.childID);
+        this.browserMap.set(browser, aSubject.childID);
         break;
     }
   },
 
-  /**
-   * Submits a crash report from about:tabcrashed
-   *
-   * @param aBrowser
-   *        The <xul:browser> that the report was sent from.
-   * @param aFormData
-   *        An Object with the following properties:
-   *
-   *        includeURL (bool):
-   *          Whether to include the URL that the user was on
-   *          in the crashed tab before the crash occurred.
-   *        URL (String)
-   *          The URL that the user was on in the crashed tab
-   *          before the crash occurred.
-   *        emailMe (bool):
-   *          Whether or not to include the user's email address
-   *          in the crash report.
-   *        email (String):
-   *          The email address of the user.
-   *        comments (String):
-   *          Any additional comments from the user.
-   *
-   *        Note that it is expected that all properties are set,
-   *        even if they are empty.
-   */
-  submitCrashReport: function (aBrowser, aFormData) {
-    let childID = this.browserMap.get(aBrowser.permanentKey);
+  submitCrashReport: function (aBrowser) {
+    let childID = this.browserMap.get(aBrowser);
     let dumpID = this.childMap.get(childID);
     if (!dumpID)
       return
 
-    CrashSubmit.submit(dumpID, {
-      recordSubmission: true,
-      extraExtraKeyVals: {
-        Comments: aFormData.comments,
-        Email: aFormData.email,
-        URL: aFormData.URL,
-      },
-    }).then(null, Cu.reportError);
-
-    this.prefs.setBoolPref("sendReport", true);
-    this.prefs.setBoolPref("includeURL", aFormData.includeURL);
-    this.prefs.setBoolPref("emailMe", aFormData.emailMe);
-    if (aFormData.emailMe) {
-      this.prefs.setCharPref("email", aFormData.email);
-    } else {
-      this.prefs.setCharPref("email", "");
+    if (CrashSubmit.submit(dumpID, { recordSubmission: true })) {
+      this.childMap.set(childID, null); // Avoid resubmission.
+      this.removeSubmitCheckboxesForSameCrash(childID);
     }
-
-    this.childMap.set(childID, null); // Avoid resubmission.
-    this.removeSubmitCheckboxesForSameCrash(childID);
-  },
-
-  dontSubmitCrashReport: function() {
-    this.prefs.setBoolPref("sendReport", false);
   },
 
   removeSubmitCheckboxesForSameCrash: function(childID) {
@@ -129,8 +79,8 @@ this.TabCrashReporter = {
         if (!doc.documentURI.startsWith("about:tabcrashed"))
           continue;
 
-        if (this.browserMap.get(browser.permanentKey) == childID) {
-          this.browserMap.delete(browser.permanentKey);
+        if (this.browserMap.get(browser) == childID) {
+          this.browserMap.delete(browser);
           browser.contentDocument.documentElement.classList.remove("crashDumpAvailable");
           browser.contentDocument.documentElement.classList.add("crashDumpSubmitted");
         }
@@ -147,27 +97,11 @@ this.TabCrashReporter = {
     if (!this.childMap)
       return;
 
-    let dumpID = this.childMap.get(this.browserMap.get(aBrowser.permanentKey));
+    let dumpID = this.childMap.get(this.browserMap.get(aBrowser));
     if (!dumpID)
       return;
 
-    let doc = aBrowser.contentDocument;
-
-    doc.documentElement.classList.add("crashDumpAvailable");
-
-    let sendReport = this.prefs.getBoolPref("sendReport");
-    doc.getElementById("sendReport").checked = sendReport;
-
-    let includeURL = this.prefs.getBoolPref("includeURL");
-    doc.getElementById("includeURL").checked = includeURL;
-
-    let emailMe = this.prefs.getBoolPref("emailMe");
-    doc.getElementById("emailMe").checked = emailMe;
-
-    if (emailMe) {
-      let email = this.prefs.getCharPref("email", "");
-      doc.getElementById("email").value = email;
-    }
+    aBrowser.contentDocument.documentElement.classList.add("crashDumpAvailable");
   },
 
   hideRestoreAllButton: function (aBrowser) {
diff --git a/browser/themes/shared/aboutTabCrashed.css b/browser/themes/shared/aboutTabCrashed.css
index e42922ac95d6..2ef767eb8b24 100644
--- a/browser/themes/shared/aboutTabCrashed.css
+++ b/browser/themes/shared/aboutTabCrashed.css
@@ -9,34 +9,3 @@
 #reportSent {
   font-weight: bold;
 }
-
-#crash-reporter-container {
-  width: 80%;
-  background-color: var(--in-content-box-background-hover);
-  margin: 24px 0;
-  padding: 14px;
-  border: 1px solid var(--in-content-box-border-color);
-  border-radius: 2px;
-}
-
-#crash-reporter-title {
-  font-weight: bold;
-  margin: 0 0 14px 0;
-}
-
-input[type="text"],
-textarea {
-  width: 100%;
-  box-sizing: border-box;
-  resize: none;
-}
-
-#options {
-  list-style: none;
-  margin-inline-start: 0;
-}
-
-input[type="text"],
-#options > li {
-  margin: 14px 0 0 0;
-}
diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
index f44994473966..4b7e03c80aef 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -22,7 +22,6 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://testing-common/TestUtils.jsm");
-Cu.import("resource://gre/modules/KeyValueParser.jsm");
 
 Cc["@mozilla.org/globalmessagemanager;1"]
   .getService(Ci.nsIMessageListenerManager)
@@ -459,139 +458,5 @@ this.BrowserTestUtils = {
         tab.ownerDocument.defaultView.gBrowser.removeTab(tab);
       }
     });
-  },
-
-  /**
-   * Crashes a remote browser tab and cleans up the generated minidumps.
-   * Resolves with the data from the .extra file (the crash annotations).
-   *
-   * @param (Browser) browser
-   *        A remote <xul:browser> element. Must not be null.
-   *
-   * @returns (Promise)
-   * @resolves An Object with key-value pairs representing the data from the
-   *           crash report's extra file (if applicable).
-   */
-  crashBrowser: Task.async(function*(browser) {
-    let extra = {};
-
-    if (!browser.isRemoteBrowser) {
-      throw new Error("<xul:browser> needs to be remote in order to crash");
-    }
-
-    /**
-     * Returns the directory where crash dumps are stored.
-     *
-     * @return nsIFile
-     */
-    function getMinidumpDirectory() {
-      let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
-      dir.append("minidumps");
-      return dir;
-    }
-
-    /**
-     * Removes a file from a directory. This is a no-op if the file does not
-     * exist.
-     *
-     * @param directory
-     *        The nsIFile representing the directory to remove from.
-     * @param filename
-     *        A string for the file to remove from the directory.
-     */
-    function removeFile(directory, filename) {
-      let file = directory.clone();
-      file.append(filename);
-      if (file.exists()) {
-        file.remove(false);
-      }
-    }
-
-    // This frame script is injected into the remote browser, and used to
-    // intentionally crash the tab. We crash by using js-ctypes and dereferencing
-    // a bad pointer. The crash should happen immediately upon loading this
-    // frame script.
-    let frame_script = () => {
-      const Cu = Components.utils;
-      Cu.import("resource://gre/modules/ctypes.jsm");
-
-      let dies = function() {
-        privateNoteIntentionalCrash();
-        let zero = new ctypes.intptr_t(8);
-        let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
-        badptr.contents
-      };
-
-      dump("\nEt tu, Brute?\n");
-      dies();
-    }
-
-    let crashCleanupPromise = new Promise((resolve, reject) => {
-      let observer = (subject, topic, data) => {
-        if (topic != "ipc:content-shutdown") {
-          return reject("Received incorrect observer topic: " + topic);
-        }
-        if (!(subject instanceof Ci.nsIPropertyBag2)) {
-          return reject("Subject did not implement nsIPropertyBag2");
-        }
-        // we might see this called as the process terminates due to previous tests.
-        // We are only looking for "abnormal" exits...
-        if (!subject.hasKey("abnormal")) {
-          dump("\nThis is a normal termination and isn't the one we are looking for...\n");
-          return;
-        }
-
-        let dumpID;
-        if ('nsICrashReporter' in Ci) {
-          dumpID = subject.getPropertyAsAString('dumpID');
-          if (!dumpID) {
-            return reject("dumpID was not present despite crash reporting " +
-                          "being enabled");
-          }
-        }
-
-        if (dumpID) {
-          let minidumpDirectory = getMinidumpDirectory();
-          let extrafile = minidumpDirectory.clone();
-          extrafile.append(dumpID + '.extra');
-          if (extrafile.exists()) {
-            dump(`\nNo .extra file for dumpID: ${dumpID}\n`);
-            extra = parseKeyValuePairsFromFile(extrafile);
-          }
-
-          removeFile(minidumpDirectory, dumpID + '.dmp');
-          removeFile(minidumpDirectory, dumpID + '.extra');
-        }
-
-        Services.obs.removeObserver(observer, 'ipc:content-shutdown');
-        dump("\nCrash cleaned up\n");
-        resolve();
-      };
-
-      Services.obs.addObserver(observer, 'ipc:content-shutdown', false);
-    });
-
-    let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
-      browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
-        browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
-        dump("\nabout:tabcrashed loaded\n");
-        resolve();
-      }, false, true);
-    });
-
-    // This frame script will crash the remote browser as soon as it is
-    // evaluated.
-    let mm = browser.messageManager;
-    mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
-
-    yield Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]);
-
-    let gBrowser = browser.ownerDocument.defaultView.gBrowser;
-    let tab = gBrowser.getTabForBrowser(browser);
-    if (tab.getAttribute("crashed") != "true") {
-      throw new Error("Tab should be marked as crashed");
-    }
-
-    return extra;
-  }),
+  }
 };
diff --git a/toolkit/content/tests/browser/browser_content_url_annotation.js b/toolkit/content/tests/browser/browser_content_url_annotation.js
index 62667651ccc7..cd42f99b0b62 100644
--- a/toolkit/content/tests/browser/browser_content_url_annotation.js
+++ b/toolkit/content/tests/browser/browser_content_url_annotation.js
@@ -9,6 +9,72 @@
 // Running this test in ASAN is slow.
 requestLongerTimeout(2);
 
+/**
+ * Returns a Promise that resolves once a remote <xul:browser> has experienced
+ * a crash. Resolves with the data from the .extra file (the crash annotations).
+ *
+ * @param browser
+ *        The <xul:browser> that will crash
+ * @return Promise
+ */
+function crashBrowser(browser) {
+  let kv = {};
+  Cu.import("resource://gre/modules/KeyValueParser.jsm", kv);
+  // This frame script is injected into the remote browser, and used to
+  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+  // a bad pointer. The crash should happen immediately upon loading this
+  // frame script.
+  let frame_script = () => {
+    const Cu = Components.utils;
+    Cu.import("resource://gre/modules/ctypes.jsm");
+
+    let dies = function() {
+      privateNoteIntentionalCrash();
+      let zero = new ctypes.intptr_t(8);
+      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+      let crash = badptr.contents;
+    };
+
+    dump("Et tu, Brute?");
+    dies();
+  };
+
+  function checkSubject(subject, data) {
+    return subject instanceof Ci.nsIPropertyBag2 &&
+      subject.hasKey("abnormal");
+  };
+  let crashPromise = TestUtils.topicObserved('ipc:content-shutdown',
+                                             checkSubject);
+  let crashDataPromise = crashPromise.then(([subject, data]) => {
+    ok(subject instanceof Ci.nsIPropertyBag2);
+
+    let dumpID;
+    if ('nsICrashReporter' in Ci) {
+      dumpID = subject.getPropertyAsAString('dumpID');
+      ok(dumpID, "dumpID is present and not an empty string");
+    }
+
+    let extra = null;
+    if (dumpID) {
+      let minidumpDirectory = getMinidumpDirectory();
+      let extrafile = minidumpDirectory.clone();
+      extrafile.append(dumpID + '.extra');
+      ok(extrafile.exists(), 'found .extra file');
+      extra = kv.parseKeyValuePairsFromFile(extrafile);
+      removeFile(minidumpDirectory, dumpID + '.dmp');
+      removeFile(minidumpDirectory, dumpID + '.extra');
+    }
+
+    return extra;
+  });
+
+  // This frame script will crash the remote browser as soon as it is
+  // evaluated.
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  return crashDataPromise;
+}
+
 /**
  * Removes a file from a directory. This is a no-op if the file does not
  * exist.
@@ -64,7 +130,7 @@ add_task(function* test_content_url_annotation() {
     yield promise;
 
     // Crash the tab
-    let annotations = yield BrowserTestUtils.crashBrowser(browser);
+    let annotations = yield crashBrowser(browser);
 
     ok("URL" in annotations, "annotated a URL");
     is(annotations.URL, redirect_url,
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 1b19a93bc217..c3c77d8995bd 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -406,11 +406,13 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 
 /* textboxes */
 
-html|input[type="text"],
-html|textarea,
-xul|textbox {
+*|textbox {
   -moz-appearance: none;
+  height: 30px;
   color: var(--in-content-text-color);
+  line-height: 20px;
+  padding-right: 10px;
+  padding-left: 10px;
   border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -420,27 +422,12 @@ xul|textbox {
   background-color: var(--in-content-box-background);
 }
 
-xul|textbox {
-  min-height: 30px;
-  padding-right: 10px;
-  padding-left: 10px;
-}
-
-html|input[type="text"],
-html|textarea {
-  font-family: inherit;
-  font-size: inherit;
-  padding: 5px 10px;
-}
-
-html|input[type="text"]:focus,
-html|textarea:focus,
+html|textbox:focus,
 xul|textbox[focused] {
   border-color: var(--in-content-border-focus);
 }
 
-html|input[type="text"]:disabled,
-html|textarea:disabled,
+html|textbox:disabled,
 xul|textbox[disabled="true"] {
   opacity: 0.5;
 }

From 74ef03c1a618eabc46b8ff64d0127f81efb044ef Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Mon, 5 Oct 2015 16:39:34 -0700
Subject: [PATCH 34/35] Bug 1192458, Part 1 - Consolidate push and desktop
 notification permissions. r=nsm,wchen,MattN

--HG--
extra : commitid : 1veevVaOOYv
---
 browser/base/content/browser.xul              |   1 -
 browser/components/nsBrowserGlue.js           |  48 ++----------------
 .../preferences/aboutPermissions.js           |  18 +++----
 .../preferences/aboutPermissions.xul          |  18 +++----
 .../in-content/tests/browser_permissions.js   |   2 +-
 .../en-US/chrome/browser/browser.properties   |  11 ----
 .../browser/preferences/aboutPermissions.dtd  |   2 +-
 .../chrome/browser/sitePermissions.properties |   1 -
 browser/modules/SitePermissions.jsm           |   8 ++-
 .../test/xpcshell/test_SitePermissions.js     |   3 +-
 browser/themes/linux/Push-16.png              | Bin 606 -> 0 bytes
 browser/themes/linux/Push-64.png              | Bin 8056 -> 0 bytes
 browser/themes/linux/jar.mn                   |   2 -
 .../linux/preferences/aboutPermissions.css    |   4 +-
 browser/themes/osx/Push-16.png                | Bin 312 -> 0 bytes
 browser/themes/osx/Push-16@2x.png             | Bin 666 -> 0 bytes
 browser/themes/osx/Push-64.png                | Bin 8490 -> 0 bytes
 browser/themes/osx/Push-64@2x.png             | Bin 26989 -> 0 bytes
 browser/themes/osx/jar.mn                     |   4 --
 .../osx/preferences/aboutPermissions.css      |   7 ++-
 .../themes/shared/notification-icons.inc.css  |  16 ------
 browser/themes/windows/Push-16.png            | Bin 704 -> 0 bytes
 browser/themes/windows/Push-64.png            | Bin 8388 -> 0 bytes
 browser/themes/windows/jar.mn                 |   2 -
 .../windows/preferences/aboutPermissions.css  |   4 +-
 dom/notification/Notification.cpp             |   6 +--
 dom/permission/PermissionUtils.cpp            |   3 +-
 .../tests/test_permissions_api.html           |   2 +-
 dom/push/Push.js                              |  23 ++++-----
 dom/push/PushManager.cpp                      |  24 +++------
 dom/push/PushRecord.jsm                       |  12 +----
 dom/push/test/test_data.html                  |   2 +-
 dom/push/test/test_has_permissions.html       |   2 +-
 dom/push/test/test_multiple_register.html     |   2 +-
 ...est_multiple_register_different_scope.html |   2 +-
 ...le_register_during_service_activation.html |   2 +-
 dom/push/test/test_permissions.html           |  36 ++++++++++---
 dom/push/test/test_register.html              |   2 +-
 ...test_try_registering_offline_disabled.html |   2 +-
 dom/push/test/test_unregister.html            |   2 +-
 40 files changed, 97 insertions(+), 176 deletions(-)
 delete mode 100644 browser/themes/linux/Push-16.png
 delete mode 100644 browser/themes/linux/Push-64.png
 delete mode 100644 browser/themes/osx/Push-16.png
 delete mode 100644 browser/themes/osx/Push-16@2x.png
 delete mode 100644 browser/themes/osx/Push-64.png
 delete mode 100644 browser/themes/osx/Push-64@2x.png
 delete mode 100644 browser/themes/windows/Push-16.png
 delete mode 100644 browser/themes/windows/Push-64.png

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 8bc6179edbd9..69a4914e0906 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -713,7 +713,6 @@
                 <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-                <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/>
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c2eb1a851ca2..755b1d51780d 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2552,38 +2552,6 @@ ContentPermissionPrompt.prototype = {
                                              mainAction, secondaryActions, aOptions);
   },
 
-  _promptPush : function(aRequest) {
-    var message = gBrowserBundle.GetStringFromName("push.enablePush2");
-
-    var actions = [
-    {
-      stringId: "push.alwaysAllow",
-      action: Ci.nsIPermissionManager.ALLOW_ACTION,
-      expireType: null,
-      callback: function() {}
-    },
-    {
-      stringId: "push.allowForSession",
-      action: Ci.nsIPermissionManager.ALLOW_ACTION,
-      expireType: Ci.nsIPermissionManager.EXPIRE_SESSION,
-      callback: function() {}
-    },
-    {
-      stringId: "push.alwaysBlock",
-      action: Ci.nsIPermissionManager.DENY_ACTION,
-      expireType: null,
-      callback: function() {}
-    }]
-
-    var options = {
-      learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
-    };
-
-    this._showPrompt(aRequest, message, "push", actions, "push",
-                     "push-notification-icon", options);
-
-  },
-
   _promptGeo : function(aRequest) {
     var secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
 
@@ -2638,12 +2606,6 @@ ContentPermissionPrompt.prototype = {
     var message = gBrowserBundle.GetStringFromName("webNotifications.showFromSite2");
 
     var actions = [
-      {
-        stringId: "webNotifications.showForSession",
-        action: Ci.nsIPermissionManager.ALLOW_ACTION,
-        expireType: Ci.nsIPermissionManager.EXPIRE_SESSION,
-        callback: function() {},
-      },
       {
         stringId: "webNotifications.alwaysShow",
         action: Ci.nsIPermissionManager.ALLOW_ACTION,
@@ -2658,9 +2620,13 @@ ContentPermissionPrompt.prototype = {
       },
     ];
 
+    var options = {
+      learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
+    };
+
     this._showPrompt(aRequest, message, "desktop-notification", actions,
                      "web-notifications",
-                     "web-notifications-notification-icon", null);
+                     "web-notifications-notification-icon", options);
   },
 
   _promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) {
@@ -2731,7 +2697,6 @@ ContentPermissionPrompt.prototype = {
     const kFeatureKeys = { "geolocation" : "geo",
                            "desktop-notification" : "desktop-notification",
                            "pointerLock" : "pointerLock",
-                           "push" : "push"
                          };
 
     // Make sure that we support the request.
@@ -2782,9 +2747,6 @@ ContentPermissionPrompt.prototype = {
     case "pointerLock":
       this._promptPointerLock(request, autoAllow);
       break;
-    case "push":
-      this._promptPush(request);
-      break;
     }
   },
 
diff --git a/browser/components/preferences/aboutPermissions.js b/browser/components/preferences/aboutPermissions.js
index 14a2bf966254..bc34becdf18c 100644
--- a/browser/components/preferences/aboutPermissions.js
+++ b/browser/components/preferences/aboutPermissions.js
@@ -46,7 +46,7 @@ var gVisitStmt = gPlacesDatabase.createAsyncStatement(
  * Permission types that should be tested with testExactPermission, as opposed
  * to testPermission. This is based on what consumers use to test these permissions.
  */
-var TEST_EXACT_PERM_TYPES = ["geo", "camera", "microphone"];
+var TEST_EXACT_PERM_TYPES = ["geo", "camera", "microphone", "desktop-notification"];
 
 /**
  * Site object represents a single site, uniquely identified by a principal.
@@ -321,16 +321,9 @@ var PermissionDefaults = {
     Services.prefs.setBoolPref("dom.disable_open_during_load", value);
   },
 
-  get push() {
-    if (!Services.prefs.getBoolPref("dom.push.enabled")) {
-      return this.DENY;
-    }
+  get ["desktop-notification"]() {
     return this.UNKNOWN;
   },
-  set push(aValue) {
-    let value = (aValue != this.DENY);
-    Services.prefs.setBoolPref("dom.push.enabled", value);
-  },
   get camera() {
     return this.UNKNOWN;
   },
@@ -384,17 +377,18 @@ var AboutPermissions = {
    * Potential future additions: "sts/use", "sts/subd"
    */
   _supportedPermissions: ["password", "cookie", "geo", "indexedDB", "popup",
-                          "camera", "microphone", "push"],
+                          "camera", "microphone", "desktop-notification"],
 
   /**
    * Permissions that don't have a global "Allow" option.
    */
-  _noGlobalAllow: ["geo", "indexedDB", "camera", "microphone", "push"],
+  _noGlobalAllow: ["geo", "indexedDB", "camera", "microphone",
+                   "desktop-notification"],
 
   /**
    * Permissions that don't have a global "Deny" option.
    */
-  _noGlobalDeny: ["camera", "microphone"],
+  _noGlobalDeny: ["camera", "microphone", "desktop-notification"],
 
   _stringBundle: Services.strings.
                  createBundle("chrome://browser/locale/preferences/aboutPermissions.properties"),
diff --git a/browser/components/preferences/aboutPermissions.xul b/browser/components/preferences/aboutPermissions.xul
index 7226bbd4f383..b6d25714f0a2 100644
--- a/browser/components/preferences/aboutPermissions.xul
+++ b/browser/components/preferences/aboutPermissions.xul
@@ -239,21 +239,21 @@
           </vbox>
         </hbox>
 
-        <!-- Push Notifications -->
-        <hbox id="push-pref-item"
+        <!-- Notifications -->
+        <hbox id="desktop-notification-pref-item"
               class="pref-item" align="top">
-          <image class="pref-icon" type="push"/>
+          <image class="pref-icon" type="desktop-notification"/>
           <vbox>
-            <label class="pref-title" value="&push.label;"/>
+            <label class="pref-title" value="&desktop-notification.label;"/>
             <hbox align="center">
-              <menulist id="push-menulist"
+              <menulist id="desktop-notification-menulist"
                         class="pref-menulist"
-                        type="push"
+                        type="desktop-notification"
                         oncommand="AboutPermissions.onPermissionCommand(event);">
                 <menupopup>
-                  <menuitem id="push-0" value="0" label="&permission.alwaysAsk;"/>
-                  <menuitem id="push-1" value="1" label="&permission.allow;"/>
-                  <menuitem id="push-2" value="2" label="&permission.block;"/>
+                  <menuitem id="desktop-notification-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="desktop-notification-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="desktop-notification-2" value="2" label="&permission.block;"/>
                 </menupopup>
               </menulist>
             </hbox>
diff --git a/browser/components/preferences/in-content/tests/browser_permissions.js b/browser/components/preferences/in-content/tests/browser_permissions.js
index 3b1ad1969feb..3bf88d42aac0 100644
--- a/browser/components/preferences/in-content/tests/browser_permissions.js
+++ b/browser/components/preferences/in-content/tests/browser_permissions.js
@@ -28,7 +28,7 @@ const TEST_PERMS = {
   "password": PERM_ALLOW,
   "cookie": PERM_ALLOW,
   "geo": PERM_UNKNOWN,
-  "push": PERM_DENY,
+  "desktop-notification": PERM_UNKNOWN,
   "indexedDB": PERM_UNKNOWN,
   "popup": PERM_DENY,
   "camera": PERM_UNKNOWN,
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index dbaa22ba56eb..2d4cf60deae2 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -375,23 +375,12 @@ geolocation.neverShareLocation.accesskey=N
 geolocation.shareWithSite2=Would you like to share your location with this site?
 geolocation.shareWithFile2=Would you like to share your location with this file?
 
-webNotifications.showForSession=Show for this session
-webNotifications.showForSession.accesskey=s
 webNotifications.alwaysShow=Always Show Notifications
 webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
 webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite2=Would you like to show notifications from this site?
 
-# Push Notifications
-push.allowForSession=Allow for Session
-push.allowForSession.accesskey=S
-push.alwaysAllow=Always Allow Push Notifications
-push.alwaysAllow.accesskey=A
-push.alwaysBlock=Always Block Push Notifications
-push.alwaysBlock.accesskey=B
-push.enablePush2=Would you like to allow Push Notifications for this site?
-
 # Pointer lock UI
 
 pointerLock.allow2=Hide pointer
diff --git a/browser/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd b/browser/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd
index 4adbf84f33f5..7e44af86e7b9 100644
--- a/browser/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd
@@ -41,7 +41,7 @@
 
 <!ENTITY popup.label                     "Open Pop-up Windows">
 
-<!ENTITY push.label                      "Receive Push Notifications">
+<!ENTITY desktop-notification.label      "Show Notifications">
 <!ENTITY camera.label                    "Use the Camera">
 <!ENTITY microphone.label                "Use the Microphone">
 
diff --git a/browser/locales/en-US/chrome/browser/sitePermissions.properties b/browser/locales/en-US/chrome/browser/sitePermissions.properties
index f4b386d5db56..1ec28f9d7af1 100644
--- a/browser/locales/en-US/chrome/browser/sitePermissions.properties
+++ b/browser/locales/en-US/chrome/browser/sitePermissions.properties
@@ -17,4 +17,3 @@ permission.popup.label = Open Pop-up Windows
 permission.geo.label = Access Your Location
 permission.indexedDB.label = Maintain Offline Storage
 permission.pointerLock.label = Hide the Mouse Pointer
-permission.push.label = Receive Push Notifications
diff --git a/browser/modules/SitePermissions.jsm b/browser/modules/SitePermissions.jsm
index eedb0e95d731..709e1eee00d4 100644
--- a/browser/modules/SitePermissions.jsm
+++ b/browser/modules/SitePermissions.jsm
@@ -161,7 +161,9 @@ var gPermissionObject = {
     }
   },
 
-  "desktop-notification": {},
+  "desktop-notification": {
+    exactHostMatch: true
+  },
 
   "camera": {},
   "microphone": {},
@@ -188,9 +190,5 @@ var gPermissionObject = {
 
   "pointerLock": {
     exactHostMatch: true
-  },
-
-  "push": {
-    exactHostMatch: true
   }
 };
diff --git a/browser/modules/test/xpcshell/test_SitePermissions.js b/browser/modules/test/xpcshell/test_SitePermissions.js
index 93158daab417..38db7b1f2b63 100644
--- a/browser/modules/test/xpcshell/test_SitePermissions.js
+++ b/browser/modules/test/xpcshell/test_SitePermissions.js
@@ -8,7 +8,6 @@ Components.utils.import("resource:///modules/SitePermissions.jsm");
 add_task(function* testPermissionsListing() {
   Assert.deepEqual(SitePermissions.listPermissions().sort(),
     ["camera","cookie","desktop-notification","geo","image",
-     "indexedDB","install","microphone","pointerLock","popup",
-     "push"],
+     "indexedDB","install","microphone","pointerLock","popup"],
     "Correct list of all permissions");
 });
diff --git a/browser/themes/linux/Push-16.png b/browser/themes/linux/Push-16.png
deleted file mode 100644
index 082b177811eb58303ee74b744e924adaf7223ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006dNkl<ZILn2T
z-)mBF7{(6>yNDu!h-y^WT4$vu1#K<dtOkxvn`sG~UUboqMYteyQF<{qGz&5hoQiJx
zN!w^aFcv6X8H28jF=7yO(Z3J`gMsk$J_nW4k?7)s&-1*``{j7_s{l~Ube(^y3I(Am
z)aq30nQHC-Wz>+K5Z2@RXH32Oh6m-J2Gq<rW2fbS&Y;#Nl*TekxIMdy@h4w!dSc%A
zG;7Y-VV67213Cf^wNUB<l5bbxODsTqMHuP3_6CHS8E5RUE52YHU>~~g5^57KzT(V{
zIf%|T9#1qqOg_&}{CSmmO*pLV^JTTc<a-2Cix6EAY>frc%wY01Vfk!&5x!dsoE4Nk
z15@9_Gi5k06d~GUealv)<8?+fgr-aEuPN=`)JACL6TI<R^h7m?H?S@?^4^$cbc2~P
z{V!#wXL4gW^%1>SUgCg13-Jcl0~&c}AcvDzUt#F(68&#w$BCOi`s4Gk`!W#y->)DY
zuYGVDp6he$uPNJ)$8~3<2=|x{(G{Wj5=AqE$=ifwcl0qFkw=_q%C=+UE}_<Q`8Ay9
zauD788Aa2><nxYT4&Bn_4tI^g)+3kny#r~uW6y9jl!f?;FtV#J2|~?`Gj`Y&uQmUP
zTO1eLgwpQ*Npyt^=#CcQ@~6?^zh^+rj5BuF<xb0G+I%RM5Z2pI-NF9h9Mo{pfSMU+
s?ELdKl1&FkRiPlP2&l7C&swhYA1K2vaguu^HUIzs07*qoM6N<$f{UggX8-^I

diff --git a/browser/themes/linux/Push-64.png b/browser/themes/linux/Push-64.png
deleted file mode 100644
index 6e09ab9c32d021d9f1f4c937943b31be08cb87c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8056
zcmV-;ABW(HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00199Nkl<Zc-rNg
zd7K<ox%a>4oT~1gp6Q-Fvt+Wblbs}l5SBoQtb&RPcx4e#5k$R;C|)<X?h4WC3vx9V
z6i_6H0s=wy05Jq&cCzp5%p|ifJ>6Ax&Uyc+>PeFuB&hd&eLru1KF_DSYI>^c`JLah
zo~MMhmj9n$&OghI=vq+%%mBs#bwE9^1!w}6sAk*rKk>Wb|0DyhUflWL&MmyUVurxJ
z7r})nA(28L!h6GFvDOk;13ajj?SlWO04Pvc93}D_-#D#q@PW-=L)sZa2?-X9*lLYf
zf#IOQ9+a4|2s=YaaU#ZAwA}<;r<!f=KP>=9DXj{`$;%IKns`O3ukB;FQlhQxF0Oih
z)A+f+|JAj3ZUKS<(SW}Dy4q=u_3jWtr18yTs@dN5PX|DxcwT82hylsX&pk7$ZP%_j
zK{h)vt+S2aYI%12XumCGEgWiS<ogw8;tr}{?C?tV9BAt?md!g4c5ce}W<$mB5z89i
zbM_7(^PO9!Ppa<RdzT1|LEBF_Eq3KU1poz#JCV|f{cG3M?fUc5OY6$wAKHI7H~#xy
zJfA6UKSOT61xMr{Q9|yj&*9CxfP0?Xfd#IaH<G{@d_N$Q&9ZdGHlBTDBY)YjZ?l_B
zJThYT$%_`<^TDf1ysopYr(eJBp0?`%`^)po{_g=0DX)NdwA$l(c5eN`_~BI-pEGwV
zx~QDZEk2(Zkz@3Kd<ki?nEH`;pZx~g<2BS&B)Q^_r4%PzZa8NY)#XKu99)L6ptZsC
zeU`1>!=1lgPFM3js{31)-nsALni2hN{X0g^`oNEFd14Qs{~i#Wf556I_ODqrblXcW
z-aLJL{Z(JR`TdL>R!3Q?n0P$K3%`4b;;;W3woI_gt)uPQZ_}HJGiP)ek1X9yX)1}a
z7FS6cs)})?zyd}pVvgjLX~Su1>SfcLrI_}XQ$JgDEwkD-w4Kv`-~!-RK=$gzox$JA
zhIh??NO>9AdGW5te|z!FQRR2cJ7r?JuBMWzic*q^I7%thuB~K0b2S}poxDDD4u70=
zIq`~8&X`z*9~l0!rw64J)>wv?Ih-`2l+z~EkiR2qEgQDB@Y2g0*|}vuDQPH<IqdA}
zXXU}RZc&`PY1S22{sHI%e89Y05Z)C41<J>P^cz20aOd?Oo%^B2F@tHS8$@ZUn0U-Z
z3PG@S6Y}4#qp!1@gM-Gi>0j?aDaoELkLEs2GNy<-5+wy%8?wHkH<RO2r`1zY9HXi<
z!S1FmZhv3}y1N(G>nEmjC~MI1ByC0IY}&b-?zY2^%)Rl(8-Z>h_ijNrZU7?X9U!@X
z?doBz%U@pfrR&dYY^blIzNU(FaT3>ckOD-em%|^w9KB};`%4D1@pHFx&4rT@Ku5;s
z?q!E4jw^~{3P%V6ZOHkWOfH}=>r<C<NTS(#po^}~EGpNJ%=SaJACt}EX+xhXq9<KL
zYfCeSw{O@qZvI)9)=!$e2gm@y@q!@V<;o`yu3I~NXlC!jU%LLh#-R;^XsE3wU6NN`
zAcVmE@vRKeEo93EG3x$bvmxWq+LNQ-3;4ydW>Q5irO6oONtd!>hq7XqbkZeV9HYD>
zPJ6#)Tc;*)6C_KM#L^|G(iEiAm{c0yjpO@1XN*ZwKcs<%3DX<*zWVaRO&i`E4kQ72
ztgQ2Ia)O1l-@j({u!-`}qBG}D8DCjmN?mmYsoqW!OP)mb^&$j_J=;;so`b4E{9?w9
zd`!pqw+lv5or(caoQ#u<JEV&gB{78~1->@8QXob6LsEdN1UW|%ID$Y4v?H-fVWq<2
zpiP#;Z9RPN%ISRjfwf#Tea`rM7rn5^7<0+s$y2rixvLj<zN0xDPZSW5!%MrnRxg@&
z<-GB!;w1IGtqi*NyTrDyM>t{fPA-eswH+bBq$|1P#5yJpDGh;%E_UX~Vpbf?A@e5%
zC?SX`Ns+5C#)4HyKw<HP#REJc&<KPTU?c>By{%a)OOt%-+7ozY*$ytf@Wk==JoNOU
z!IP()33LJ;@K<eI-FoY-@3i_ZP_q1g-G29{E<a;#x+KZaYzGZLz6H1QAR@5n>8D}l
z%ttPJ1>q_XF+{qUA<GxT@G&rC_&^a*la5jBz@GLTu99FwZ?CPzSc@?hYb;<9Hh=pT
zYr$ABRuEW0V4x=xaImG5DWeB5VsI&y<w;6Y@#-bNf2y*6`iV<`;PGu)^Zqf3cMrhT
zi#xgPYjaBHy|8e`jz7Qp!I_hWd}czaV6e$DY{8dtWPqt1h4-U-G3S2}xqc;b&t|Bs
zML+N-*uNifXg{o22IpN2u{a{4L3Oc9TThN2pCgJHi`JnS8!BwA#bU6A=$yrv@Vj~0
zv9F6oPp>B#S4<dHL#iZ(#Gdf{W6y6NI%CEbKtH}MYu^q8=WXipe_1HRMOLW>&yB?|
zbGygXY}kpjMG@=jz{#{>MFN#Ii0|Hv89oMis0k4m^!1;IntJRv@4$ZMqlg1L;JGK@
z1OLK{n_4+xNSY@%cHp5%xC$eqy4P9)6EeX@D<1+Dnu?SHDJ4n?Tu0)%idbCXdoDpD
z!K<qdFmqxZRpq73o<5RiU)glW{xxe}YnV1|7tsH9rtlU9=vpxr!EbTpsaA@#LCF_l
zLsIUTapi7JJ*svvv9?199YCrQiW1P%f!weTbN!c4e|j9bdKs)+iD+rUmR8Wcek~e@
z;I#StZf!g3Tl(=(sC?O<UwvZ<v_%_((fJiN$9&g?pLO{Cw$2RCF5SxbVHK2@7O}C3
z_?9<bFCH;__Dg{OcBbIGW#t8T;Hom~n@w#ML+-z5-gmm&)~{Xqog3aq&@hNWgQ`gU
z=*!4$>&V@D7mON*df^G&JHLms;8yH}DTsaB5!=?nj&*eHYNoiam8M?9)9Ht>)6c{p
zvC)kOR$!zUV88&i?Gdqga~SZ*VYE<Epp?XM6^^S=j^w5*PocIliBbmZmLuKNRhyoD
zc46b$XRnFMYx~#ofEg$;*al|brtzoW@Rc8}ePjRX)nAy_ID)cdoK&)ixa%T{OF#+K
z`c+VpLcaDglon%8K7-)S2MK=h80Pw~(lu=!PNo+r4duCZKJfG%eC&spaM~kxP`h&t
z))=%g1c4^d2CYr#0|r(%wEfTz95D+BO+!eDR05?0%8@v(%buog8tTePCgSK!7bW%M
zIk0}+7k~tyj+Gk}0x%9K1coOT-27N}->Q{$((^8!ICd22WP(IIhT|yoNpnN$EMA0q
z{6XaA)nG09@=u0Wsi}weT!=GzJiS%*v=uk7{G`k1DXAi^`x&!k31|KC7B2YVl{7wk
zKSga#1<D@_h%hQxYcV$L8(~AgA&Gp03Vp*9ukJu8Ni60veQYT)rI2pP#rxN+u8X4C
zUv+{9v49ZcfY`PrFJ3yhx}M&aPLf3<a9tOrBzpdZm?cl6cCN$y&P`Ah!<_kksHtcB
z)&p#PW(nu*SwhK<b;y*<qo;k0&9mRf3RhBdcsFC$y}+n7FHq9c%EYA)G4bUG**|7B
zTV`KG%ZSMXp)hajy1*=KUIsFhF!Pi$1R~=ZcI|7YeozS~O|Hk02iRIRiWRTEa%sb~
z6K)5xN1MTb6STMA)&qRRDlt;|{wq)I?fZITb$!)@5hXNE8cI=dG6F%NPd*d1`Y*^W
zs}Z?=WVR2r=pLLuJV4dDS1I*62t3WA#!FZ`>mpn!Py%x43Yy2vVB_f@rY}{E+uKcX
z*CEP!4l-ih3k+ZJ9JyGM)<MGy9Gn?ogElrg&NIb?<`aabq<ziWP5T))tdfqdZW>2b
zkVv?!TDfV^(AlRv2=pKA3<m&^U%a)~{_xhZ)>WfBnhs5RMh!V_QvG1goHv?^no8nD
z2^`l&N{NWYk$ZL^TlPTZ5ZV(JsQx~DZP}5i=g*bXxbNia*f)9xu9P^EBVIpxwbzVb
z$F%wEm@*IJ8PbRLlk~b7vh58<t$LoUo8)lyup`R9#Y75@15FSZbPx~(n%4FVQW(xT
zbu2m02a}_>x4&xZ)_spvj~?9w=t2PAk_Y%sY@ssxtUbn^Jv5bKP??~jI*n8cAq(=^
zzFyQzPhk^Df^Xi*_f}}OHuVvUJ0y|`VlhQLricp=HcDg+7%W(cF(9I>s4G>)^7mZJ
zs?#oG)SBm+u;NM5{cX&B?q|$;{vMW|eia)UPY?ZpE{qhBfB0`^0Vj;FLrF!<bx=|=
z=ftrrzyH-aoOAA~C?U1S1mOCGE!+O%)5GuGtjcdKEiNUVbdgTD>U|lHum0dE*6iru
z+RDSccW*NXNOR|(dg#g-5($@B%)yo5N^k^7Ya;+eNL?#1)(+GGg`CK^3D(VgFKcI9
z!00tEGGo~yO8eV6Ysr5yW7)$jn|U$o#-1AH2@xX-&BJPoH3n-f$s!ji1xhI#M^Rr}
z&S^77OpNq>3jp%yHrMCw+WniyOB$O<mU5t_3*jh`l9t2WG`IC3V=>a}mXq}~FAkea
zN5;o>L`ZW9N?0VJ;@HrG8*`MsYC{kh0v(3HK!-FAB06uJIG6jcy_09=euB<e1*O?`
z&ROzvK7Rk_XxP8;t=I82fgc`g9kN15HIO~JN)hOQwzjUuJOG8^P#&Z5bGoe>>boUu
z-rYibM;{2m$PqQ%^r?A_EO(gMy#=cc>uV<=g+)pb!XmH;Ot|VcT#=Bvy1;4a&|ztV
z9~gXJ<NF3b(BW~Q2Y`5U{OSDH6+hvrIoHrHizv@^aQQPo<ch^Vprq?i^uL<G)A)Ws
zWjfC6Np*}GQh^|f5K3Z<rMJ6xd;tUAwib|pBcziG5(zx%aNmP3^Qli?#1Fsy2X-CK
z@$=IYxXTo~Vl{Lm%ZUjX$WrojHwK{vhI}O_k=7zjcvE@%k22v<OlZe>n+{Xt5XiM-
zPGw`mG^Ve8npqp4V`Td_ZhqpcEFOIh%cot)zRnC@&f~rXAHf)d=Lhs>y#WxcwG6JU
zNJaX}zXpH+govfcT7f4O8+Wzw>90J9jTa*lMQncX5l+&E*Xm~w)~g0<4aNwx5eOp?
z`iOecN~E+XDKJtVDR3gijm=ktM--20<N+{@Hh3z*OH(gm#n9QD{rYd2(6p9wxBZE0
zoNe4c?n4Yc_pGRq$^ejH2YxA;j1wH$n)|B_5n-JeIjQiagOwKRxZp^Hl+5hjiV>2v
zgC<0ZhjCfxXmyX=KgNJm7AXZrNQATz1CHFNwhSaY`4U(}JEM7KS(6WWhQo<+etGgI
z8M9+0A6flt;<<J{{>I&SmF;Awetuv-)#hsn-je!=<LU?*A@P-iuN;sDp%h5P#NNFK
zDQI;|X-$;j8iO$!9f$!w+bDaJTB4*JNL8gY;pZp<SSzp=Vvc0~q-qXz=Kwg=nPv0-
z?&!N=x@*Z-ev!Y(X;xNFV9l&A^V`zpq_?af_QLN_Z?2^G#;;);Mn*m;1eT+6kaq&W
zY9TOAj6gbA0;C9Ue0=wAgn-qR<FQ6#v>@<BsEn}~Wg}$^MGU+vC6F@j1HzElpR+9A
ze2Di<tL3Z{1_Q9WrI*_tTt_yiQSt~20-bl70ToGyia~X}Fza)icj12GcYX`ix{H!;
zej4-9Pt$wSSyAGo-=f<)0bl{E{VX;XM=Ljqtpco}v1c#VSoRdxptS*^krs@$XsHm=
zAf*bk#Yk~cz=C`U8%7N=&<WbrlHsl=xAU9lcT!p6aMPtzsY|<TIheyy95I8y5O@KB
z7clSS5nO)3WVD6Aj3O95hQznOh-}(H`ko)4w{E2U!mH5QAf=?Wy^qo(KKE_IpaBA7
z{2t#*v~<ykuwQ2^6MFYzjAcW~kTCW11AH&Q^L%nypIpCBuHQo%!<gC>A2?+g-?)4l
zv&UAF>B*Am%hBKO)1M8<W_>&_!1Kau_`aqx6=PU+F~tdo&h9LJF2MIRfv>|b=?4V9
zkMH|T9$ih?It=aH4638&#}AO5eGb+_`jyA2|K%NM-^Wps^*cIyqMm?xCk6yk$<5Z9
z6LDNj02srN-f%*tSHx&>N>D+7)OO%{r%W5hDN`Fbb!r18$yivkM}{|PL<Rr);VJa>
zdpxmhFN>D!L@GHDqKvWlzGcm}c2;e+TzTGj{^hLEeCO9|ur~As#zx7HuL(S#Czoty
z(%9M~5jb*sT{nCMXY@o$@A(0h>tA8!&MmCE<{R{9z0JpJiVOho%k#^)dU2-(0w?Bf
z3bMT?N;iSdhBsN2?ZjHk?szqUA7Hda3PVXzoFCtO9%F`8MKP3taFlnuHageco8z*x
zMl)-CHD6h{g1&w)Y?7uER1b<{EUekqhP9ym0PXt-Bu0YGH&22fvTHH0`j&i0*<iJy
zd(M3N`uZ94>jjkd9Av~#Z$pX`H{}5++$%UH1Kgsb4Y{s1+>#3X-oscMFf4NjtYv4s
zlE4p;LL-ozb^2IF53M}nVQi?dILhS+VCBYUQpFuiZ>*udG{&3l8Rkr`;mY&IF}k6Q
zo{Y!m7re^T%XV@1@7EAZ#L?O!qO4K}8XW`-uS;>uCr*!6-xl-`j)2rT^E8?gr8M66
zT`Jmk^HAUJ;)UECyps>GfUX`rW?A3i1H@BlgmkgSk_@s~3q3dlo`>)Gc)1)OK6gq%
z;*n263KEin<F1}8t2VW8)z_cqFB@9OW^!Ejz6p#PT!yt!QWRt4;1YiJhxG_YVXVfO
z03Af4Lzy$Rfi1fZv1M0Fcx_`j*wi)vP~iLc*&JQvHEcZP!}NCbGdXu~%3ashfAF0E
z0ML!^IeUloGn-9dkZuyJWn}I!U|AQd#m{-6csXjTQUm2^;YMp-ag)#ZfXmLG%(<tI
z<lH&KNjMPrJ}Wo1(AAftt1rjPEBDaU+KsgutO)_o8a+@ygva+jx`K~=Wf4t>y3y8f
z^S2)2L)ZS4SO2`8|6KS4LCzz{=0FELlo`W)CDXDo6XaZz`~1RdD(c?W2}XWE1DSZL
z_>pW!)7N4pW%!x)g0xgKqP~>6L8ZKJ{?xF%%~zOFikHvz?a`4}z?fl`j2Tvmv4(pe
zUC+PY{R%=5hRLYAt5g^wg*h@QXN<uF8m)tH=SYAyh6TTPhNW+8Lt4Xa-&@4ZH=fVK
zi=L;xGR;#@yoo9w%z^4jw|}$a<?@8|PZ8SQ3S9Ts7+?W!^yzaKb?@6oJY9x#l9X7F
zR4UH2#yW1g=1jixg^M_4#;C9awPqlVHAgX_u;9t({no-I=S<|r%chYmaya+YkyvZ6
zR%1+oM3fJ^Jpq9ZFgpC3HJXKsUgdXBtpuYHR+BDr*}Z)~XPz>N6@T7LGLgn>-^<W5
z&RVo<#Iyy%Sc?)T>RM6vPMf2C!_;X_o1S^*54o<ki(@4fjP~0p8&t*_*ImY-$};>Q
z2v<7q_7%ve#bJa%L^=J@X=omrlHxd*T`-l)E|?k}yZrw7jnSIOu+9?s5N8H@3PuMJ
zK!)vmTEQBm)l3>&$MqkZhYWl=T3R`Lu$$Vtayr{v|4?(n%%%k={IP4{wdIcsSH2%@
z&j5aVOa??DLIc@`X(ue`+_QnAia{78%}rf=|E|TfclMC=eEj^%6f`4@$yag=u)!3x
zt=>*XHI$(PKf0bz;D?FUz~>-92Y%@2A`q<62pjev`uj4hUA+~F;kl>&LPc3M*~2?1
zn||Vgs2i+>r75z{)H@AGSioyM`|K@_viD`%n~=)I)0WM<+xhODi)rtOK=4Cqh8r9@
z%)d=oB2%!dV+v~hW679dRd~4^eiUJR-zV@Q@qGd>Ku3V+AT$Gv0jt4i`g$_dR+qAV
z)pqvn>m!+rlgV}8S9#&3TMD+x>yB$eBw|4TWX8>(|D&$G8@mt1%8<&T&Su%T^AO+q
z>60veVKrIL$Mb`MPR>BrHY#EBKoo*;EZMZ}0D<oj<Z}3VDFh>8htXjLYIUf1GN!01
zFJe+-1HR|+{EM4ORX1?(;EwLZ1(*B?$bA3iDMkNvP5CEr<@*VY29_MpfP@8d4O6G>
z-Sfs9HyvoR3u|L>>XfBLxNO>an2BTS*t`D_Lk3re^}Op~t&OU`@ZAVI&;=60h64^q
zHhl-O#<{b{@$o}F{Nkadh^V4Oim)3UIfHzg%|>Oo)S7?2;arpn*t~HU_uRLX;#57k
z{vOWAZhz#42d<i5^7D>KQrH>9WLVT_`y174w;tD!RKb8m>Jy(m;n}pqjDMf>Y2L^>
z1es3e&K!d4NN%`tKJj=A*L83m2S=$Ry#Ohr9)O4@MZ{Z_2iUy*AV2%{OZ>;JAH`a@
z^(T+>)GM39dO_xEhJ4m%uv#;$Hq8|m&EV(1dXCQ4F5)UqNxGK0`U>otXI4Ml@tCKy
zS0qi;pw#vNmfKacefhYDqzX)-uTk_quDnckV()HBYKEZ_X}0Zc=j7?5=<Cmt>CckO
zdgO8*InO8O`*?xI4<hpzXp9z^NhD)N)Y09O;kj4V6KKs>Z@hrdTz)zxh{B#e5*n@6
zSYv2u?dDrQeTufO93qyYVdN-2d;O_s4sZF1S@RR?+55<uyYS7|3G4-`$zFK0^2a+P
zWC34!xxEci@2%VO`cUf6NTh0qbGUgocPw1O*KU}{;QC5T5D<@rOmG}0+)R}+Y?26B
zU<%PjcL5FV{_a)b4+R0%S~hRnhtYZ<91bK`HvHdAR)=Xi4#kyqTyw>V9BS*>*({Tv
z`pArrzZows>KJv-N8WLa_PFK*$Deft&u)2iPL=c*9+YW4ci6{MWy7Zocby{ons;OR
z+WGO<FQh0DCy|Kb#@ujMCNc-9)LZCW2m&0L0m?^&pZ@YW9({H_!f}u?+?R-^2nKTO
zxFeY~wubl4YXp^`tD|-AJ&!KCCCGGd?%cEWpx@oxDTA(DYx9=Be^&VLhLv)fJMGQA
z=Jnoc(_Q+0yZgT$+Yww>*3dYltbQcfmKa;MH8W;d1v=-Eh{w=z7uR(O90%nngi-??
zqHvo{91{RzEIXUBILWes?-s=*Crz%Swlc}GReP8)s*<_0MvzFvF$SJ}Y0bgsmv6Yk
z>+R^wwjajp?uwy_36y_y1LSWUmbTIap6Wy`OF8EJ%Xhyxaq;L&ZtL3r=BNCU>X}t_
zW2vf0qkvprA12#REFL3>#lj6$$3Z$F6NFNs@?l?$fkh=$eos?3+nNI6sj2~trj04(
zyi*(4bD)DyUOJt4EJi#YWBrCb{O*ZmYuh_J?$36%wR*i>zVWhP0wu8dJ%GO-fN-}b
zXII(eb7$I~^Tq}3GbSHc_v)(h(GO&MgPjLA9eUqyf^qR{J}`wrsW>{9!|&-uONolP
zNH-MWIG_|lO01MvAwh(rZz25+KYMaN74?HLfevGTF2{kx{q*$Z7~W7pEanoAx%}}@
zE4;`4^xCr`=zqiO?dl8q`*Oz51=zp{8(3jIBhdetS>dYMampf!4Dr-PvFRsC#R>a@
z*v`4B(|_w0r>Ya_%At6iF>Au`$)EV>86=g!<Z@`=50j&4{M{-AjswcUst^Dp!W|@I
zVcotgukF$VIiLDs&6v7yl(xP)9L0^f4qLY$<o8c5+p>G#!Pjy<?fd;qZ>#aLZB~2j
z7~LVP-zluuDarK+Y=3L>7X6O^Kmc(I$=mIr$scfg7g$4Tok_0#Onl;!=Hja2SaGV#
zi4_k`EBB<iGsccQbJjS9)s~}!08bk{WAQEc))F8H5VU0sdpk8aF8ewRZ5e@=(_}L~
zr;d$t(u8sxN8z{*`wz6Sbou(d&%eB4jq&>r1eu<;puexp1YU>Leh27IX@gE-y)Hq}
zBf_ESTx;_d`;P!1|71u4Y;rOC-rMN-U)BcMsa5A|vUKCiv8q<zElLORWO|Ctj4jG~
z<K7rNHSP^+P~*l9W5k#ShL5VJH>Y`hLkC@+VC!Lnabjqx@QlC@z!8@54GGSlnWptn
zJL@;??pgZU+Py7@Tej<5U#re$I(4qU!}z&QtAkE#&;`0n+Mr7ibPH@Bh)li!dZ#FG
z+~e{Q2oBf;P;@T`XPqjuUsRHMjZoSk4MJ)u9V3J?NSTq2ez<7VzWdUXrLw95E6Zdo
zopMV`U1CYBTZEB{z#5G9@ca9MvGs0`qfGa@_1ik6@LO!q-xg#u-P+4`8$a7)0>29r
zbYpc7Hs}_Zo>1tEM&<iKWP#wFlz-O`OcXF7o(JMl_McxvFfAsj4}@?$jkDLfhnLBc
z=AXHPn}y>ROXVho;}!|!CZtkvp`4fqH}R#6mlT;?Pro(B7#;Xl2cFSE&IW$gYQNuT
zKVx;!XN}GXYkI--g<|_cnv0BhtKwO}9FOvU^FvdSPsp<&0VFIG<w41x1Cc<4B7}+~
zMNA0g3aMO#P*Ir5S31TT9aw98jPb2C9@gZnwK=d^5h|9Keh^s^j=)Ce23GxDDfBl#
zH5RcU4@5kAj3#cQ_vl=#K-_|dClx}-f+tC%y>U#`jLAPZ=|#^1d7+3LkQ3pfF_DN|
zzTbbmtNssvaI(NO9I$SI!Z8~v94T*|=zFqY^$Tl`JOBnn9t2;6AoxeX5Pts2(!WLN
z|ItThBQWv`ssg3eF_aetLrb;*ggg+Dh~Nk?$8X=q^ZMV3q-#qbXB7|t0000<MNUMn
GLSTZxlG)Ax

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 4754508250ea..14c8309c4792 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -23,8 +23,6 @@ browser.jar:
   skin/classic/browser/content-contextmenu.svg
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
-  skin/classic/browser/Push-16.png
-  skin/classic/browser/Push-64.png
   skin/classic/browser/Info.png
   skin/classic/browser/menuPanel.png
   skin/classic/browser/menuPanel@2x.png
diff --git a/browser/themes/linux/preferences/aboutPermissions.css b/browser/themes/linux/preferences/aboutPermissions.css
index 16d0aee8a946..e2da8f2949ad 100644
--- a/browser/themes/linux/preferences/aboutPermissions.css
+++ b/browser/themes/linux/preferences/aboutPermissions.css
@@ -94,8 +94,8 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/notification-64.png);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/browser/themes/osx/Push-16.png b/browser/themes/osx/Push-16.png
deleted file mode 100644
index 54ef8f8eae7221735fe774a2d6cfc4c68c1e342e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`|2<tCLn>}9J?*%vDM94u$IYDS
zJH=yNY~rmm#G^W9c64~`TqmCRLa*pf?ek{i3H@x2&GIpP|GN_<_BFl!`igty0(&F(
z@10Kjk3TJn{JpTXM=s^w-T)_o1@Egpob+dDUP@!i-8{=h`a<d4%?s6iMFftp2(5_x
z!n`H-^_-I$YHM;>wKv}CYFL&z$GW$LzxNm8t6gPhHY-<r%ePvvO6$0dbyNEPWz45G
zmE@TS*_pgz*XTNAIXTcL;wD#^(pFK%%6Zn(RhL{C9eorUXSv!R_*l`R@@3IXrChZO
zW-C3nFt#5~)P*|gg1%#e&gmM(xi8$*%ySpsSN6TU{tt8I%AdK_V&6M}LBZhZ>gTe~
HDWM4f3@d|D

diff --git a/browser/themes/osx/Push-16@2x.png b/browser/themes/osx/Push-16@2x.png
deleted file mode 100644
index 314089368457780f64af9b7107edfda1d8f37ebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007ENkl<Zc-pnj
zJ5F0s6oui%O#_iV3N9015HJKgnE~%N;{BGeqbQ<GfHnzjW??Gg0pxKzFs+GVH#>iE
zkdC%4&c!mtR~+r7wT@0sPKqj_f{$q64u69?G{UVCvMQoTD8&WZu!7pSKnnGu<KyF}
z45Nk)tWO=(LznXC=;$cVC~jZ_a)T7|^2Wz;3(Jw=6caFKGTeT`ywExB_jGu87)#ND
zIT_yI6%?4GAPLzF=CqK;n>si+cr=3VFy|Y}kYkRV628EkX4n#>{r&w%b(nL81j=EK
zatz@E%&9}rV{jB*7rF`s>f;0c6IU+VMG9$eZ%?>@MKYA29?Ve>C1fst32AqCw~RI{
z@)jDfs@rIzteu^m3M}#)2{d3y=(b2j+uPgcut*JhAvL#kuC1-D1}riOy^u+_)zIeV
z<~^(cJ(Cr1uZ@k34y*t@lNHd>`uchYR)C(#3g~EUZS5XbfS$<;xYz3HY6BLTfL_R?
z+iGZKW#t?esX;HK=C;nYyu4h2MSdZH1}q8P7O7}yX{n4hEK-FAtm-x%P}bt&qHqa|
zWGF#Bn4=y_$Xxys(!#=mkfIBVe8mv-1ap*+4!T^ni!n&^^Yf4DFy{;jl*1h57{Ys)
z^A3XI@CceP=Nrm>e4vESFsF&v5Tv=exmb!8%*jwi0tMzMNJ2J)IW45|re<eny>Z;a
za%4Eg1k9NTw;wPsbdLKy&CJZ?NzsH2NHcWGiyz)F>gdAy)I~jXDUYV7r~hXR7kGdb
z^aqz1gL=`_)KpO=RPhPdXrUXla2;;dkW~@?02aAW9_}4~KL7v#07*qoM6N<$f;@aM
A9smFU

diff --git a/browser/themes/osx/Push-64.png b/browser/themes/osx/Push-64.png
deleted file mode 100644
index 099b9c76f355237c3ae163f5c17845bb2cf36c6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8490
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
Y57q13Is`|s(f|Me07*qoM6N<$g6Am5R{#J2

diff --git a/browser/themes/osx/Push-64@2x.png b/browser/themes/osx/Push-64@2x.png
deleted file mode 100644
index 411db1a5a455401d5df6a5fd3bca39bd3b3bca77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26989
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
Q9RL6T07*qoM6N<$f>=WD@c;k-

diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 8c0d08d1b22c..052350c90cec 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -25,10 +25,6 @@ browser.jar:
   skin/classic/browser/Geolocation-16@2x.png
   skin/classic/browser/Geolocation-64.png
   skin/classic/browser/Geolocation-64@2x.png
-  skin/classic/browser/Push-16.png
-  skin/classic/browser/Push-16@2x.png
-  skin/classic/browser/Push-64.png
-  skin/classic/browser/Push-64@2x.png
   skin/classic/browser/Info.png
   skin/classic/browser/keyhole-circle.png
   skin/classic/browser/keyhole-circle@2x.png
diff --git a/browser/themes/osx/preferences/aboutPermissions.css b/browser/themes/osx/preferences/aboutPermissions.css
index 94a69de0c36e..3f03c2836f28 100644
--- a/browser/themes/osx/preferences/aboutPermissions.css
+++ b/browser/themes/osx/preferences/aboutPermissions.css
@@ -104,8 +104,8 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/notification-64.png);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
@@ -133,6 +133,9 @@
   .pref-icon[type="geo"] {
     list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
   }
+  .pref-icon[type="desktop-notification"] {
+    list-style-image: url(chrome://browser/skin/notification-64@2x.png);
+  }
 }
 
 .pref-title {
diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
index 6505c744d60f..b16747cefd73 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -14,10 +14,6 @@
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
-}
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -142,10 +138,6 @@
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png);
-}
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
@@ -369,10 +361,6 @@
     list-style-image: url(chrome://browser/skin/Geolocation-16@2x.png);
   }
 
-  #push-notification-icon {
-    list-style-image: url(chrome://browser/skin/Push-16@2x.png);
-  }
-
   .indexedDB-notification-icon,
   #indexedDB-notification-icon {
     list-style-image: url(chrome://global/skin/icons/question-32.png);
@@ -438,10 +426,6 @@
     list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
   }
 
-  .popup-notification-icon[popupid="push"] {
-    list-style-image: url(chrome://browser/skin/Push-64@2x.png);
-  }
-
   .popup-notification-icon[popupid="web-notifications"] {
     list-style-image: url(chrome://browser/skin/notification-64@2x.png);
   }
diff --git a/browser/themes/windows/Push-16.png b/browser/themes/windows/Push-16.png
deleted file mode 100644
index d710e7336dbc445d36ee4868257d9139c50f8919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007qNkl<ZILl-B
z|NlP&G6n(_AZ}z}VBf~TC3F{zL2R%Xg9?UvG|d^TyrMV66*O<F=$hRyuyMNt!XP$C
z3?v6qgJA#=umSNhQ8~3cidu%(BotJeWK=XQjI5ncfiQ>-5(CMB)PU52^dKA1ETy7*
zTUpEKsECw;Hq3MtZKJ(PS_V5{d|^p>Z6!^^qad|FJq=L344R^{YPU5FEw2el$Y~-w
zPgqiJv9N^P0%S2kaam1uL-VV`QYs)r)Ict2(loZZC9SB@j2=Lo{G!4fe4+yA;!+Cg
z&1(7<HyIdM8W=>Rl=hk0xm_2QQZz$Xhzkpd$(k8iIbY|OklW3mqGNKy)j#s8j+y-p
zUJ;p{3=FI*85kH9u|%&T(8gt4LXtZ)jjXTQdj?-t(9plYplxh@(?2p9C=hr{)6jgo
zu(bS2Mos}t12}jU`Nd?Hs_U3+w|4fq;Sn5tSxv|E3WJ7$`2o+s=v&&xmd3<-K||Nn
z*vUKOhO)NdZU$*Z^;So(pnGy^+AWy23dk_9^NXX4ODkzM+qih&5tmhNVi1&&*R*!=
zzGrIZexHR;SPNMpzl8j9UNPC(sD|=u8Cp5tHM4WO!zV1I2^Lh-Hf(bXh<vDHVSk>5
zR}^lDslC@RLtEDaaLt^2TIxpD=N!C3?klS6G{aM(n4B`3p{3n2&%l@`macwJfa$(n
zQOnpmJgwkXNMi0y8C5+CVHu@16FZMbPQIa!bc`*R0aGO#MrP7Awaj$&kGSt0k?=eu
zDerlHUH9YM+Rn#;@tIHEf?}RJcn9CrG&IY^nHxb^%g92-*vhflGbCznL{j#%@T9C~
m?g0^d49)GE)D289vNHgKsnY3}7pKGk0000<MNUMnLSTYaut7oq

diff --git a/browser/themes/windows/Push-64.png b/browser/themes/windows/Push-64.png
deleted file mode 100644
index 27fecb8588f939fbb33347518c1627fc8e9b8af8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8388
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
a(e*!ZccN(?S#V<j0000<MNUMnLSTYLBJ$n<

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index e85166839d82..80cb81ac4f8a 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -25,8 +25,6 @@ browser.jar:
   skin/classic/browser/content-contextmenu.svg
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
-  skin/classic/browser/Push-16.png
-  skin/classic/browser/Push-64.png
   skin/classic/browser/Info.png
   skin/classic/browser/Info-XP.png
   skin/classic/browser/keyhole-forward-mask.svg
diff --git a/browser/themes/windows/preferences/aboutPermissions.css b/browser/themes/windows/preferences/aboutPermissions.css
index 744f4589759d..5e158f6114c2 100644
--- a/browser/themes/windows/preferences/aboutPermissions.css
+++ b/browser/themes/windows/preferences/aboutPermissions.css
@@ -98,8 +98,8 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/notification-64.png);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 97ca75c16c76..349674876438 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -1639,9 +1639,9 @@ Notification::GetPermissionInternal(nsIPrincipal* aPrincipal,
   nsCOMPtr<nsIPermissionManager> permissionManager =
     services::GetPermissionManager();
 
-  permissionManager->TestPermissionFromPrincipal(aPrincipal,
-                                                 "desktop-notification",
-                                                 &permission);
+  permissionManager->TestExactPermissionFromPrincipal(aPrincipal,
+                                                      "desktop-notification",
+                                                      &permission);
 
   // Convert the result to one of the enum types.
   switch (permission) {
diff --git a/dom/permission/PermissionUtils.cpp b/dom/permission/PermissionUtils.cpp
index c873f154127a..47853a1c8a41 100644
--- a/dom/permission/PermissionUtils.cpp
+++ b/dom/permission/PermissionUtils.cpp
@@ -12,7 +12,8 @@ namespace dom {
 const char* kPermissionTypes[] = {
   "geo",
   "desktop-notification",
-  "push",
+  // Alias `push` to `desktop-notification`.
+  "desktop-notification",
   "midi"
 };
 
diff --git a/dom/permission/tests/test_permissions_api.html b/dom/permission/tests/test_permissions_api.html
index 19b6e657b5a9..bec08592d112 100644
--- a/dom/permission/tests/test_permissions_api.html
+++ b/dom/permission/tests/test_permissions_api.html
@@ -23,7 +23,7 @@ SimpleTest.waitForExplicitFinish();
 const PERMISSIONS = [
   { name: 'geolocation', perm: 'geo' },
   { name: 'notifications', perm: 'desktop-notification' },
-  { name: 'push', perm: 'push' },
+  { name: 'push', perm: 'desktop-notification' },
 ];
 
 const UNSUPPORTED_PERMISSIONS = [
diff --git a/dom/push/Push.js b/dom/push/Push.js
index 05d558137dd7..f03ba8b7bee1 100644
--- a/dom/push/Push.js
+++ b/dom/push/Push.js
@@ -67,13 +67,13 @@ Push.prototype = {
   askPermission: function (aAllowCallback, aCancelCallback) {
     debug("askPermission");
 
-    let principal = this._window.document.nodePrincipal;
-    let type = "push";
-    let permValue =
-      Services.perms.testExactPermissionFromPrincipal(principal, type);
+    let permValue = Services.perms.testExactPermissionFromPrincipal(
+      this._principal,
+      "desktop-notification"
+    );
 
     if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
-        aAllowCallback();
+      aAllowCallback();
       return;
     }
 
@@ -83,8 +83,8 @@ Push.prototype = {
     }
 
     // Create an array with a single nsIContentPermissionType element.
-    type = {
-      type: "push",
+    let type = {
+      type: "desktop-notification",
       access: null,
       options: [],
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
@@ -95,7 +95,7 @@ Push.prototype = {
     // create a nsIContentPermissionRequest
     let request = {
       types: typeArray,
-      principal: principal,
+      principal: this._principal,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
       allow: function() {
         let histogram = Services.telemetry.getHistogramById("PUSH_API_PERMISSION_GRANTED");
@@ -182,11 +182,8 @@ Push.prototype = {
       let permission = Ci.nsIPermissionManager.DENY_ACTION;
 
       try {
-        let permissionManager = Cc["@mozilla.org/permissionmanager;1"]
-                                .getService(Ci.nsIPermissionManager);
-        permission =
-          permissionManager.testExactPermissionFromPrincipal(this._principal,
-                                                             "push");
+        permission = Services.perms.testExactPermissionFromPrincipal(
+          this._principal, "desktop-notification");
       } catch(e) {
         reject();
         return;
diff --git a/dom/push/PushManager.cpp b/dom/push/PushManager.cpp
index c350a447615a..c30f2dab9298 100644
--- a/dom/push/PushManager.cpp
+++ b/dom/push/PushManager.cpp
@@ -592,7 +592,7 @@ public:
     uint32_t permission = nsIPermissionManager::DENY_ACTION;
     nsresult rv = permManager->TestExactPermissionFromPrincipal(
                     principal,
-                    "push",
+                    "desktop-notification",
                     &permission);
 
     if (NS_WARN_IF(NS_FAILED(rv)) || permission != nsIPermissionManager::ALLOW_ACTION) {
@@ -732,28 +732,20 @@ public:
       mozilla::services::GetPermissionManager();
 
     nsresult rv = NS_ERROR_FAILURE;
-    PushPermissionState state = PushPermissionState::Denied;
+    PushPermissionState state = PushPermissionState::Prompt;
 
     if (permManager) {
-      uint32_t permission = nsIPermissionManager::DENY_ACTION;
+      uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
       rv = permManager->TestExactPermissionFromPrincipal(
              mProxy->GetWorkerPrivate()->GetPrincipal(),
-             "push",
+             "desktop-notification",
              &permission);
 
       if (NS_SUCCEEDED(rv)) {
-        switch (permission) {
-          case nsIPermissionManager::ALLOW_ACTION:
-            state = PushPermissionState::Granted;
-            break;
-          case nsIPermissionManager::DENY_ACTION:
-            state = PushPermissionState::Denied;
-            break;
-          case nsIPermissionManager::PROMPT_ACTION:
-            state = PushPermissionState::Prompt;
-            break;
-          default:
-            MOZ_CRASH("Unexpected case!");
+        if (permission == nsIPermissionManager::ALLOW_ACTION) {
+          state = PushPermissionState::Granted;
+        } else if (permission == nsIPermissionManager::DENY_ACTION) {
+          state = PushPermissionState::Denied;
         }
       }
     }
diff --git a/dom/push/PushRecord.jsm b/dom/push/PushRecord.jsm
index b2e3c0e24150..4c002b122841 100644
--- a/dom/push/PushRecord.jsm
+++ b/dom/push/PushRecord.jsm
@@ -160,21 +160,13 @@ PushRecord.prototype = {
     return false;
   },
 
-  /**
-   * Returns the push permission state for the principal associated with
-   * this registration.
-   */
-  pushPermission() {
-    return Services.perms.testExactPermissionFromPrincipal(
-           this.principal, "push");
-  },
-
   /**
    * Indicates whether the registration can deliver push messages to its
    * associated service worker.
    */
   hasPermission() {
-    let permission = this.pushPermission();
+    let permission = Services.perms.testExactPermissionFromPrincipal(
+      this.principal, "desktop-notification");
     return permission == Ci.nsIPermissionManager.ALLOW_ACTION;
   },
 
diff --git a/dom/push/test/test_data.html b/dom/push/test/test_data.html
index 8002e95ef1d9..ef30486dbb9f 100644
--- a/dom/push/test/test_data.html
+++ b/dom/push/test/test_data.html
@@ -179,7 +179,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_has_permissions.html b/dom/push/test/test_has_permissions.html
index db54a1ffb577..72337f91fcf1 100644
--- a/dom/push/test/test_has_permissions.html
+++ b/dom/push/test/test_has_permissions.html
@@ -65,7 +65,7 @@ http://creativecommons.org/licenses/publicdomain/
     }).then(SimpleTest.finish);
   }
 
-  SpecialPowers.addPermission('push', false, document);
+  SpecialPowers.addPermission("desktop-notification", false, document);
   SpecialPowers.pushPrefEnv({"set": [
     ["dom.push.enabled", true],
     ["dom.serviceWorkers.exemptFromPerDomainMax", true],
diff --git a/dom/push/test/test_multiple_register.html b/dom/push/test/test_multiple_register.html
index be7bb574a87a..34df563a755c 100644
--- a/dom/push/test/test_multiple_register.html
+++ b/dom/push/test/test_multiple_register.html
@@ -125,7 +125,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_multiple_register_different_scope.html b/dom/push/test/test_multiple_register_different_scope.html
index 3915c54b8d7a..5cfafdb66873 100644
--- a/dom/push/test/test_multiple_register_different_scope.html
+++ b/dom/push/test/test_multiple_register_different_scope.html
@@ -119,7 +119,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_multiple_register_during_service_activation.html b/dom/push/test/test_multiple_register_during_service_activation.html
index 2c6dcb7904f3..4af23813384d 100644
--- a/dom/push/test/test_multiple_register_during_service_activation.html
+++ b/dom/push/test/test_multiple_register_during_service_activation.html
@@ -107,7 +107,7 @@ var defaultServerURL = SpecialPowers.getCharPref("dom.push.serverURL");
     ["dom.serviceWorkers.testing.enabled", true],
     ["dom.push.serverURL", "wss://something.org"]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_permissions.html b/dom/push/test/test_permissions.html
index e171fd5a4765..4d580ed8a617 100644
--- a/dom/push/test/test_permissions.html
+++ b/dom/push/test/test_permissions.html
@@ -71,13 +71,33 @@ http://creativecommons.org/licenses/publicdomain/
   }
 
   function checkPermissionState(swr) {
-    return swr.pushManager.permissionState().then(function(state) {
-      ok(state === "denied", "permissionState() should resolve to denied.");
-      return swr;
-    }).catch(function(e) {
-      ok(false, "permissionState() should resolve to denied.");
-      return swr;
-    });
+    var permissionManager = SpecialPowers.Ci.nsIPermissionManager;
+    var tests = [{
+      action: permissionManager.ALLOW_ACTION,
+      state: "granted",
+    }, {
+      action: permissionManager.DENY_ACTION,
+      state: "denied",
+    }, {
+      action: permissionManager.PROMPT_ACTION,
+      state: "prompt",
+    }, {
+      action: permissionManager.UNKNOWN_ACTION,
+      state: "prompt",
+    }];
+    return tests.reduce((promise, test) => {
+      return promise.then(function() {
+        if (test.action == permissionManager.UNKNOWN_ACTION) {
+          SpecialPowers.removePermission("desktop-notification", document);
+        } else {
+          SpecialPowers.addPermission("desktop-notification",
+            test.action, document);
+        }
+        return swr.pushManager.permissionState().then(state => {
+          is(state, test.state, JSON.stringify(test));
+        });
+      });
+    }, Promise.resolve());
   }
 
   function runTest() {
@@ -91,7 +111,7 @@ http://creativecommons.org/licenses/publicdomain/
     }).then(SimpleTest.finish);
   }
 
-  SpecialPowers.addPermission('push', false, document);
+  SpecialPowers.addPermission("desktop-notification", false, document);
   SpecialPowers.pushPrefEnv({"set": [
     ["dom.push.enabled", true],
     ["dom.serviceWorkers.exemptFromPerDomainMax", true],
diff --git a/dom/push/test/test_register.html b/dom/push/test/test_register.html
index 510fd0e399c9..62366239013e 100644
--- a/dom/push/test/test_register.html
+++ b/dom/push/test/test_register.html
@@ -131,7 +131,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_try_registering_offline_disabled.html b/dom/push/test/test_try_registering_offline_disabled.html
index 0b61b80b70c4..d455eae985e0 100644
--- a/dom/push/test/test_try_registering_offline_disabled.html
+++ b/dom/push/test/test_try_registering_offline_disabled.html
@@ -293,7 +293,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/test_unregister.html b/dom/push/test/test_unregister.html
index 15459a59553d..461fe8952eac 100644
--- a/dom/push/test/test_unregister.html
+++ b/dom/push/test/test_unregister.html
@@ -85,7 +85,7 @@ http://creativecommons.org/licenses/publicdomain/
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission("desktop-notification", true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>

From c32b73c214518eb69a5c7a8948e2bbb127b5e180 Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Mon, 5 Oct 2015 16:39:41 -0700
Subject: [PATCH 35/35] Bug 1192458, Part 2 - New icon for consolidated
 notification permission. r=MattN

--HG--
extra : commitid : Bs2HfzOQss0
---
 browser/themes/linux/jar.mn                   |   2 --
 browser/themes/linux/notification-16.png      | Bin 610 -> 0 bytes
 browser/themes/linux/notification-64.png      | Bin 3373 -> 0 bytes
 .../linux/preferences/aboutPermissions.css    |   2 +-
 browser/themes/osx/jar.mn                     |   4 ---
 browser/themes/osx/notification-16.png        | Bin 610 -> 0 bytes
 browser/themes/osx/notification-16@2x.png     | Bin 1262 -> 0 bytes
 browser/themes/osx/notification-64.png        | Bin 3373 -> 0 bytes
 browser/themes/osx/notification-64@2x.png     | Bin 7338 -> 0 bytes
 .../osx/preferences/aboutPermissions.css      |   5 +---
 browser/themes/shared/jar.inc.mn              |   2 ++
 .../themes/shared/notification-icons.inc.css  |  24 ++++++++++--------
 .../themes/shared/web-notifications-icon.svg  |  15 +++++++++++
 .../themes/shared/web-notifications-tray.svg  |  23 +++++++++++++++++
 browser/themes/windows/jar.mn                 |   2 --
 browser/themes/windows/notification-16.png    | Bin 514 -> 0 bytes
 browser/themes/windows/notification-64.png    | Bin 3294 -> 0 bytes
 .../windows/preferences/aboutPermissions.css  |   2 +-
 18 files changed, 56 insertions(+), 25 deletions(-)
 delete mode 100644 browser/themes/linux/notification-16.png
 delete mode 100644 browser/themes/linux/notification-64.png
 delete mode 100644 browser/themes/osx/notification-16.png
 delete mode 100644 browser/themes/osx/notification-16@2x.png
 delete mode 100644 browser/themes/osx/notification-64.png
 delete mode 100644 browser/themes/osx/notification-64@2x.png
 create mode 100644 browser/themes/shared/web-notifications-icon.svg
 create mode 100644 browser/themes/shared/web-notifications-tray.svg
 delete mode 100644 browser/themes/windows/notification-16.png
 delete mode 100644 browser/themes/windows/notification-64.png

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 14c8309c4792..77e9a00dbf05 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -36,8 +36,6 @@ browser.jar:
   skin/classic/browser/menuPanel-small@2x.png
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
-  skin/classic/browser/notification-16.png
-  skin/classic/browser/notification-64.png
 * skin/classic/browser/pageInfo.css
   skin/classic/browser/pageInfo.png
   skin/classic/browser/page-livemarks.png
diff --git a/browser/themes/linux/notification-16.png b/browser/themes/linux/notification-16.png
deleted file mode 100644
index 6b2df734137b83b58f899252907e52ebde657bd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zJB|0tuw22DAVG0q;pf
zK~y-)jgvn})o~QXKi}uep+QTbK>{Cyi%5tCK@AZOg=JVRmf2EDuLuLFrHJSsQbcJz
zl_Hh2!N@d&uqBt4qzIxYnk0l8GNdBHhv&5Xgx{0WzHo<g?)Mz-z1$o4kJo)~bTe=j
zSPhH;t%n<SP6H&C5_b)ZHrYI~$=FocytaATH85HTko=dhvwx%z=(bf4Tt3oR*BhnU
zJNrj|0&PG#{7sy>JG=oH1WF^S{OEyQ@1xwj<~dNGV{oHys03&PYJp7={TpZnI)FSN
z1H3XJ8K59^^gal{c3>Z{2e=jq=G*%QOafIAE&z5o<h{VUl91FU>9M4}lJX_ZNJ>f~
ziULW?Vz@*y?@H??WtSu@9kN6$<}77nIB97rhBKDR04!ybl8P40a4ql#SQq17Mguj_
z^K1F4`^D356SE2=CCvaUVxMb(t_23QK*fplegia*JFNLQSP|?G30qHW5sM;Q30q%d
zT&1m+c$r}?n-&a*wwrxrz{G+oW`VQ7$rwKeoB<w2Rn~k?ZQT|CE_L*zfQ>*gupUrk
zat`<bR7Rp|AO(ymFaOx5@`mp@i*&L5&Te2Rg3nI19IRgKPMXIZa*oN?M6B=Bh3mJA
w7c;oEB{;|6^zo)C%U>*KEw8kEeyMBy12rfguUWen=l}o!07*qoM6N<$f_`}XHvj+t

diff --git a/browser/themes/linux/notification-64.png b/browser/themes/linux/notification-64.png
deleted file mode 100644
index a01d0ab7764fd0766d4b38208e7e50ce996aba3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3373
zcmV+|4bt+7P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU;&q+i<RCwC$TM2ZNRTf4z867%~h~kXH
zC_2n2Zlgz!qa2(gibq@yI^#Mcqlg8hYr5}kx~F^6C27*^P0}Py+H@~nXlPTK{5p;c
zqaq0CxUnc89%VVscWZu58q)G-QLxAVobS;5|GVFN_r7=EyYIfoj2S;a=l2tnka`Ue
z0Vsj3fD7mYq(C@u)pS+-*8o2`gYPV@tYPZqYDTRyGL22mjH<DT5jUuql8S03DLu!D
za(TdSrj7E^38~BCQ?q)jYNd?EU}m&XdNR;=VV#so%E+-p?y>2h{LSgv`NImW!KcDH
zlhx5^v^c!qt1vopi^~|u^MIK@P37ZL?}qY2YMqJE8k$eTU~b*I%`sN^`ThfIzx(dH
z#|Q@w9$Gs(_A1|GZSV9fTUJ%az#THcb-_<a@s!y>RAz3Wi~L(l!`_Xy&K~WNBS#;H
z($@mNU}f<4JmBh6r%tUL8Fl7kZWv`{Dyqc{_#%EP$}d8XDQKeeRGiS>y+wKa#EHK^
z(K(aJ<J$$mlAXJDha1c-L#!+&NEf(Qo$t!8NKDHfsFSJ2Co@l&tZkjgzW(|yQjiN5
z%3booo_%XEN7z}8oWhcAsN?)w9irn><^l;>xy3Gp#=vOwW^cIO+VRfwP|B~#4CUuT
zZWHE$G2&5bn;0yk;`2=T<m+M+(~M<RHBi*#6YzT_^=Kgckh^qfo1>8Bs*yA>sB`5x
zS3D{%`2ygX<jfq0gn}A0ZZeFyUV9>#x{e<|zSP{>Ze{uSg{7^id)B#B{xU$AS6n_m
zENPjW3`R>^d!W7VIWfNR=8k8<=OoU0xrT{NNPF~LDgQuxO6Gt_EE^AH&jwpZcU~y!
zg%N%QSCX^5dBtT`8ihZm;+Fsg*?Gl`T%+ftJfXLL@S#w(;XiM_wHll*;*~V08MNoN
zAI$)9$(eN(A~7~DM$W)+9X<5L7Yjnw28@DVT3S1FEPqZxNx=`QbR;inArJ=KB&w5*
z@7nx<-e~Dy*L`rz2jT!5&;)2aK)+i(&<Sh@_`p2RHuZ0{uV?uYAr9mF+#f>mS->+1
zDVfTHhYron$}P(GSNZP^(A?nWyNH*VrWaI*7^y<Th!H5&NfoC-ziE5yh6{!>=uOs+
za?$ucpbGM*ef`TX5C0aCp`G|KAuw^t87o4od~DLak-TJMZec0Y(cPDV-?Pg_Vmr<D
z{-V)f&LvJ>VtPWIRLMzZc+{DVQF9M)UvK|bVO32%gEp-4aD$na)=mjqzM!~*A0ovQ
z?*JMyatfI58*6aBz2lu*;*!#DZBRAR??4a>&ajdSk%LQly~)xI1%J=B2^*tjCX3CI
zTTo*1Y-?wC-wUivWwp31V5K8s6K4Y}0d-1dE<;Nj?b``@v(<*i%*_{6gtPDbMT5F=
zePVjfBMlg;T*_N)ou%Gw#E4i|3pYU<uVdf6`Sy+_DDNbhI+@aiZ(;r_z7&XrZ}m`*
zQ+TPs(&h=1rL~;OR*33Ky}xmVRH6Q7Nx3M8YxyQ~%eph8z!R4v1Rlil`?7}{%)va-
z&dQ}^@RxH@dJ&KX*b-8+n8K3E@rY`Q#%v(D8i`CBr~zsv4KIkqQaRW1a#iCRUu`!w
zw<^l3YK5Nf3?^$0D<>!uZkSZ@&9R9$0&;9vTqTv&<H<(~WX=X-v-JUz#}I4dQr;J8
z>*X6U!yCDl7u89h_N9Z?V9KeMG#Dosz-;BQa##)pzLk$jSe}%gJqqISCBq*Wn_F%m
z4lGN3{>rjI@5f`=Gjc5tcZ>9;hg{tlEs-fZJ>Th?%#X8j)v&TJ<rk!7=MB;f9!TSx
zTWnVl59Ip;HGr_TzEG*rE4Y^T9_H*LmMSA)$li%=(Q-R0S645$ogu_aO3$Rgf(#G{
zWD3ot;|5SRb_dEKs+FSingm?SmkDd_o1^2;i0rV`Wh>OW2}%x+Y+uOAA(+}avG=3n
z!vy6*N1zQS6qQt7?jC-&Ksjo}G8=koJ=gNoVMuvB?rnh5sv3(%XOw#F3uc{`Q)q@K
z2qdIsJ&c!(jCwLa6qi+9J8l4tzA;b^#1+n-zJc5Ew~MPxcD|thmFW0|tS<QbdLiNy
zgeAN)<_3-4K{80lI469-5?3HoYMEe=S5$TnaVa#q>OeUt?iZ9*-KH~ITDZ!HWlD<w
ztx){003}&zy|=&n-p*y-1_1vETaUNT7=krGak=n0;=<lLH5eX#LCH(KeS<On$WUOG
zipVr2laIgUPRDj<oUc?mYXD4yBNILdYo!BZm0*B5B#XH8P0h~+!vj|mA3Jtzu|{v~
z@<$GejkUCOO80&E(Th;tXDVFMpmMs)4talY1Zx1y$Xep+>g~HZ7#>Vu4uq=nUVHtG
z7xCN4LGkUa?cI|9ef$X>oBbKM*q8E~qT<46(j*zI5FHZ@AXkmjBp3`3U5%oWxoE&e
z3ax%1P#%grakzOOrMCy|BYeDb`6?$<X&r4{y|tfy_W3_h_7<vls?a`zUvNDu3m0hg
z_6@s7f*~N#WE35reCN0um@Lv@xU%z$gzly58rQ4;PQ*60m;HtwcXV|13J)AO_$<EP
zL}!FtHgtJKrK?#E1Y70ap<`#T1|a0*6{iv(GP~=7;la7y*rv$1MQ$T3I(h2Ust@+;
z4d3zKcOwoS`r;|PTSi-Ne|EHmr4>AuU#mAoc^N>b#yr3TivmGK-^NJZ%)R?Qyc(m*
z5hxFhCL~tkybeI;lUw+!IQtZrS1DM2tF2?=Nf9i<4}}4+$zTvw-c3=L+1geY3>V^x
z5g2oRD6&`Jxe!Nj;~hdv;lYE4E}c*Sjr}_%8bg7!?EHG-936A5#&1`kJhk--CW@CF
zk~4ms2i#A5#ES%}_KXwfo$v3y3clf>p%*NW$#rdrh`kY&gc(d0O)y;i0>LP_g1!ZY
z6`-EwY-#I=@^yeP3yqbB!T^NC)GQhCVl96R!)`249wbO8%$36k0pIz7>|*K^;-gO9
z`Tnk@J_~N?-};<q?mZYFtIMF`RWxz6ws%zp!&Qo`6u348Y5<%s2v{!UEhT8v?8%Oi
zE<+q|4V4j6Gx>vP_!UQv9=!$Yct<c?NN|!{tq!2~mlu{)xV}G3Q956J?e(dz%wQAo
zFBEo#!T^+3!{nnV7uL*u=e?azV))sE;Y-fQaYCU-{Tcdj#eP;E+vEDl!eq};u)xyV
zUQ50g3Xm&c2`WRJ9`^bhZ*4#?I0EIO9Urc{xWYHb@PG@a(gWYGhw*!mVjGvOm#gdu
zq?U8C+|jSTx((SBbEu3!>GTboV+2@fE{73b!KAn?7`~i*0kbh8wjE0T4G8m6d<hvS
zCO&1fsz$=fxNwawhI0T#XKDNQA6TV98WnkZhAWVT-PWMg_NcW6i_T!yH<_%;W(+%9
zdzT3L`}~NQ_&X_*Lr<*j>gf~E`{tH5Nu$A}$M;ULR58l6t}5IEOwHgkn<9D6@K>VE
zfD*7p@sePmVoI%@F5A_!rG&z1f6vwDeEaRUE4sJz7oo?7X!sFe%`vqOs@Xbf`UdTM
zEORk?Km2IjH{X2oBxD{29spJVbhqyg;8u6segm-3&3!Sj)cu}zaTGbOJbCiunq9j;
z2)B=nro#=fDQxUSoi4U+U!cgdTv$8qYDkfLe|L3sZz-j^0=--?6Ziv;njU>`=dKMH
zzR`z|9C;e=meVe*XG{M*$lkonOG-_`kSszENPs4w73c;A+~{+^GrD`K5?C_Hg-43_
ze+S%5M)~aX{m&2DhqD`-%sLo<`&7p8grq@fM<kjAjz5OtmIWCij3!9WG*eb?;e(Wh
z%FZid@{7tSlf#r@&8|R?RH8S8@Ie9%S9(X^O3H=gDk9?JST|jVT@2jy<>A9mjf{?^
zT3g$z>l;*qG|asrm8<&OJA2A;C*X<6vO*zy28Qf6&=B+oI6LUYz27?n?1(v}lsgCT
z(5~HkUZ!5Q4?EK7-#vTxy@dA<0)Lw7YHi3K>K)7v1O6CbaA-Kn-`k&4-3kS+bi2%z
zXI<leh)1c>sj9_Nh6~`A{U=VGm_GljgC3REkWLXF7a$R-m@(ZR>>$^0H9&>1PCe}m
zfTeLUlyh=105&CK>o-MBFBhP#C6=Tv5n}GMftE!4-#7L8jgj-Fl@SoeifPlq1x2Nm
z3}ST|jBwesF#tm2Sgr;jz!exApbWqWi>8GE%+}VG{uqEj@q0pY#+qqifR8`<bOF}+
z?ZR4wzJ34+&)n%U5zds#HC9Y=F2v)*ZrHKC?IYC7lsz(qx{V-LX<L-I5>7xF{<N6~
zV1#=C`oDdTxItUvRc_E0`93#RxObC;Wix($&i(U$OTQEF^sei&00000NkvXXu0mjf
Dh&Oq7

diff --git a/browser/themes/linux/preferences/aboutPermissions.css b/browser/themes/linux/preferences/aboutPermissions.css
index e2da8f2949ad..b308d915a02c 100644
--- a/browser/themes/linux/preferences/aboutPermissions.css
+++ b/browser/themes/linux/preferences/aboutPermissions.css
@@ -95,7 +95,7 @@
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 .pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 052350c90cec..df9f8c2f8c92 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -32,10 +32,6 @@ browser.jar:
   skin/classic/browser/subtle-pattern.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
-  skin/classic/browser/notification-16.png
-  skin/classic/browser/notification-16@2x.png
-  skin/classic/browser/notification-64.png
-  skin/classic/browser/notification-64@2x.png
   skin/classic/browser/menuPanel.png
   skin/classic/browser/menuPanel@2x.png
   skin/classic/browser/menuPanel-customize.png
diff --git a/browser/themes/osx/notification-16.png b/browser/themes/osx/notification-16.png
deleted file mode 100644
index 6b2df734137b83b58f899252907e52ebde657bd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zJB|0tuw22DAVG0q;pf
zK~y-)jgvn})o~QXKi}uep+QTbK>{Cyi%5tCK@AZOg=JVRmf2EDuLuLFrHJSsQbcJz
zl_Hh2!N@d&uqBt4qzIxYnk0l8GNdBHhv&5Xgx{0WzHo<g?)Mz-z1$o4kJo)~bTe=j
zSPhH;t%n<SP6H&C5_b)ZHrYI~$=FocytaATH85HTko=dhvwx%z=(bf4Tt3oR*BhnU
zJNrj|0&PG#{7sy>JG=oH1WF^S{OEyQ@1xwj<~dNGV{oHys03&PYJp7={TpZnI)FSN
z1H3XJ8K59^^gal{c3>Z{2e=jq=G*%QOafIAE&z5o<h{VUl91FU>9M4}lJX_ZNJ>f~
ziULW?Vz@*y?@H??WtSu@9kN6$<}77nIB97rhBKDR04!ybl8P40a4ql#SQq17Mguj_
z^K1F4`^D356SE2=CCvaUVxMb(t_23QK*fplegia*JFNLQSP|?G30qHW5sM;Q30q%d
zT&1m+c$r}?n-&a*wwrxrz{G+oW`VQ7$rwKeoB<w2Rn~k?ZQT|CE_L*zfQ>*gupUrk
zat`<bR7Rp|AO(ymFaOx5@`mp@i*&L5&Te2Rg3nI19IRgKPMXIZa*oN?M6B=Bh3mJA
w7c;oEB{;|6^zo)C%U>*KEw8kEeyMBy12rfguUWen=l}o!07*qoM6N<$f_`}XHvj+t

diff --git a/browser/themes/osx/notification-16@2x.png b/browser/themes/osx/notification-16@2x.png
deleted file mode 100644
index 21818c847e9a55288e39556fb5f35c7d94c7d18f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1262
zcmV<K1QGj*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00fRnL_t(o!>yNVY*bYc$A9<sW?P{W
zutJaow18+@1Rt0fND%RXJOY&x)N~7lCWRKL2~cYQ4TON8kyj}tkV0EZg3?l`V#O#m
zu_mS>$|EEwF-5|&3k4rlpzhxf9ALBAd#|>g&3xE1GiT=f&)k_g7M)0&ch&}gJRlu-
z2sjNK07_<OObo@cu{z6n$<Eroz-K^83~>vPnVT_jf3(2v6z7$-k0ZW9q#&*#<|9%O
zBN6Km35btNDr+-39f3`i`(^`cfdrr#7?Bs8^mCNX5TFjYA9x`zIO*#S2e4_!-tNFw
zU`oXD)V$2J-7fl%0p9}WfgyRBX|3(Pg5rw3BPEVVOp(CwQ8(uRd6{X)Bnl)3NEEay
z2Z}3d;)^S4R)G$J`hkexa{nE)8FU0RuehQn@qY!dv3yUwq((`FlHw#0#b0>XCIHNt
z_DWdNYDq~FnK|{cd~=|vtU3{xZ1SbdMXe3!0u%yE%>S-N76yI=8h~kl16%-(AA4}}
zDBIm}RiLP>Y8L1x(7m8nqacsu3!o=K%R%v=t`V}g=4GWPgRX)m%*#r@3EBr5@#xvQ
z?oPDh4cn{w06~elKwq<b09fV$)K%bh7g;rc#4?~Lr(U0goAw;E(2TgYzn*pg)^FP#
z0A2&;N_r|PH?9C7AjvDcfc`GB%K-T^ri6?i!j^r=4!0o~>Z~jM$dObBjCR@J641>j
zRg!=v7g-<R+AS1h0ff3ee5z;5i5rMyThc5^qhn<CZT?fzbq_g`dP%zAA{%oDCMf{W
z+#@wC>Aa*~4pPwPbUjQn@gfH}=OQayyLDGJ&;{vs^|g?G2i@aHdctS(-oQ<B6}>$4
zT1+qK8N>c0a9Ng}9)X4>tn0R<cprGXNa`=?kdNL7NlRj^UzGGtn;l3wIdJNC5dn0+
zA^W<cTd?@ivp^#-&O>J`kYx}k0Dc4309zK$&S=f4*PWvGz`2Hiq~5Y<awN5yD&|F#
zfTf1rC=r-ekQ-b9ta!hq(kjRe#ynluKhCB~ii@+thi#!Bh3{{i&?TY6K6(q^E7=hb
z5bb=+bC&MH-!?|*pT84&G}uUWMD$b_c951LE%wnHfb^ypl=n3sv8`}83+bD){ay;$
zlFB9B@JTQv&6LzEsn$nt$?D?r(XQWg^U-Wc1H)LQ0CwS=>1QMr{f7W-NgqmDAnBBc
zUO-aKs*Ppiqn#(8s2DDV*GT%IC28<3;8te7TeLj@d<s18lZ>sv_dq_d5qQLu;aF`w
z4D1D}OeucRjO;gMJHwk&g2#co^T5gt+v0%*z<A({>EGu}W0Lu-6w&=IF3O*I#@G!4
zh5^q2F9ZEt4sb=5opyTg^oH9(yAC8PH<a2Y@<f-@ja`(V{ke<nFklog#sqiSwDb=a
z<!6T?YJ&Gfv|@efmo8m$`{FmUXSR2ujx0)^GoeTMt?tNMBC;kpK2vO?i(n|QzcYgH
zL4Zb=nzMNM+N~2i<5}lB6)#`2<-BRBu_*QJ`8g*#5`gc!K&a8&e2d|b&@YAubrgYr
Y0qRP4Zq9cg?EnA(07*qoM6N<$f^HH>M*si-

diff --git a/browser/themes/osx/notification-64.png b/browser/themes/osx/notification-64.png
deleted file mode 100644
index a01d0ab7764fd0766d4b38208e7e50ce996aba3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3373
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
Dh&Oq7

diff --git a/browser/themes/osx/notification-64@2x.png b/browser/themes/osx/notification-64@2x.png
deleted file mode 100644
index 9adb75fbffca924af685b9f14af4a2ef3519b30b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7338
zcmV;b9983qP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBV3Oi4sRRCwC$T?u$p)%AyfRB7FCqb_Zw
zRxMW4w(_;;r<C%CmMSVDC{}D;KtQ$xvO)HcgzOvH*GV!-CM#JX3E2~p$wNd`6gRZ3
zb*ZA@TDATEe#0I67-l9jFmK)i=Y8Mr`(X0kz2}{C-o59Zd(OFI#&|Bz<+(hU=W@Zd
zZeySqa5L~%AQq?vIshXu0<;5qU<<GWxW>b^Gehu~15X1@faD~oB+Gz{J)AuK1V0Jz
z1BNKf^}yz^C~0d#s+69UC*>FGrQ)(mskEY6Dyyt9{X4g)R7%Utm7?R5rGVfFxgzWa
z0)fdM&YlL>+Kqv~2RZ=BcT=bom%L3XC@GgpA!uii2PN5>lqPKq43XFtFaRtA&hl_s
zn}Yuy5K3Wf2nd!E)3T%zeBsUt-V$shDLqTtxanI(FaXziIIb<>UjP(SK%r5wQW1yu
zQxv=<bmdi2Y*M<k&UX`)U=X<1!+C88e-co=9)d~E$Z@&gEkRo$ASA*(8mt4nJW^0g
z_!|O$095$+2TR%cIv8~|PC;*|8?3Bp=pguSN1rPxua+WX5+(FaBm&>_NW=ZY|2~k(
z`980x%pt**Rn{6CTiQ#cz56!3_x`_@{`bHCT_DGiqeqwQ+yCOm9qnD&<yG~)qqP^G
zl3`jYfQ}5{Y>!mjCj5XKfhKRi%~Eb*iD@}!4_N9McXo7TeemIjk5~wOJ}^gMzWi@r
ze);7CLnC`aD{HoQ*lRmID_`RD1A0;c&k8|d!H)$V1%@d6jNHOeg>R_Y-uCM2Z>$u8
zy%(4cTmhV8**<<d3%Crp37E%c{{8QNKhV`X5Dz69w$%se5K0h18a<LyM)>Cg$$+#e
zG*T+i=|>fQZ9{V{hjk%%3f1Ac8uxkuKLX}b5ng-a&<ZM(t-iKp7l`Q~;3<!^Trd1v
zfMyCmCLskzSk<V)uWxEKeD?Y0i^TAL!O8Y56yZAHo=-phZ1MKy9p$$AOxc!01sDNl
zd8FprA%ED%KS)Z?&Nn$`Mnm=XrUoJWJ2<Snf)*+fmFcUmzrMeDXGejpzPBc(Q3<+%
z%RLf2HQ`?<3@Z%zTcmsp`Hl!*Usc!p?)&dQ3Sr#_jB_PTXm30)<3IoT&w`e=&RknG
zgl>tY5)=dDJd!*a;rn37_X%hLusM?=>GV~mwYMXXp4k@&A<cBP@GYi<Uw!?}H}^L*
zx0PC>p{TS{@(m1?K>rgSX*wr(FJKuk?Bj<aKdZoD!4r)wZ8`|&Pu47a1r*^Ht`KVK
zo9nI7l9g9X|G;j%%TGO$bx8RBlYu<oTPvT&o}+*fHuTQB@BM{KJa^EGe#UZ1NrzIo
zp|-~wO<Q5G;(hV~&(d%d;r|}!;(Sl0>GTGtgio}0_M}lD?xb5x2Y0@B;N^9o!DvYn
z-@|Wn7?t2IkCd$oej*UWuYMz3x|wjOI4gMb*Z<++!w*3i6W#p|oNnkeYTMPFZjCm+
z6W*^CIL9M#*|o;U{|2BAkU}E2N(H4ArY+Z#K}*}NYzW~7wcZ7NU;M=vUp@f0@eXVB
zg+;|lc+bZ?Qa>j6alqriF!$CI(=tz5@MgSz=*`C=gb8ZC7yAFjO9x+F4SGf_>EjX>
z@7j%bKJU9O{40P0e)WvI%PA~1E%8nTRdtOGVE)Z&znicJ{tqjWB5QO;$E9!-c<Q?>
z{Cj|2)7l=)C@wRcvhaz%f#E1HUK3vy=$OP+0k(<<E$J*QsgS&VH+O*t6TfSMp9CcH
zt7m{^Moyv0I(8984!!x-eOh{7D8a8gx_XnX(aU`d@ZrzjCE?EoIw<_`=y-eu<*pRI
zWT<Uu0>h_hOaadM=;MzUVP!ICNiU<5v2EN0et4bff<F%kr{I0CZ_jvpR|?(?EWJ|I
zSo%4j1XDXYds3{?yd^e~qre?!tngR+_}>ZaSS^-!w1A88;!0p}cw~hZdB7FP2Ol0@
zgcZP$CCv;f<&=143g6rRMqp(9#!aTUd>VQR!ua;v|NOO9dBIVjc}GXCHQIy1qldw#
zi_b&_NDB^+F$HNVEPSb=x_$@4x7_@GXFD?r9DMclW!7j<&B&F|*3vUT;C^Fe|DF~Q
z6mH71a|h}hTXnXAJwVGuU;&T_=z&5Y90(NH48)9r6d*%}3IKxh>lSTHazF`wSyk6i
zYe{<%yq+8UgUU{8!2|aKzn1+LoeE>mT?)|D+8$|xw%-6dgs@x+ZdS?uzZ1BA6a~1T
zfA?^>HTr1`;`u91N8wKaa)CO)OZ+woU;mK1gio~Y>{xDvwz+_D9Rw8~9VewAQ;3@}
z+j0s_F6Ve8iV_Ja+oWXV``JS(o=wZl`xaSwMW%kaP0cnKm5jdHM-$@v|N7t$u>OZF
z=_g%y_QBIh@aF;>fnk0Dcmal5Un2hY5ECewljklV&VQ~2eN%zm3?HMV?W%rYxev9r
zcV_I_yU(wue|HpYkCq}+I(eDoi>+StsRPE@83nGcYiudA);6|^Gqo@H^?u`k2Y?O$
z-n>wTKo26^`fdhA@E)XQ<<Qm1P$+ldnZ5h2m(e&L(1%3CNUo#<F5H1vUVVL~JYnRU
zZ@yWuv!gqef2Xm#0cmOEk3C~>$haraTKf^v@w@TtL=6ky_YS}Sm}1^z5%EfI9zw2Z
zfc;e5b74eGype{DyMQ5dSRU#P8W#C&4mHu{%6<liMnXl#&@|w3zB4e3iqP7&D}(oB
zV0ys_&;}YN+L;Dsl4i^HO{;<RzB9Eb_~}3a1<&C=9Q)aM999M4BYU3R$Ou_+?;OsN
z?o<G{S$oXezvzD~94pnFQ(f6dc~xC2qJQUG<`jrfup7Sm>Z^s7HT8|Wm;3=857`+7
zuB@qVGFbLec+54tQEP(FF$o^n9JU2>ebI45!=M@b<daWln4iIN#^2Rn-e}NQ*0joL
z#!%|=KDzq`qL~?FN2t?YeCg#ixOXHM+uA5YW3Y4YS-ZOXqOJ84z9qI?RiQt<-q#D5
z1r!1j!M%DWVH8qJEr4_@JznUC=I0UZVz73fl0cq*t&D#EOjziy?gRORi$+=EasU5!
z)%db`e|Sthd1o^!3E}DwTI*+PVyY3(ovnu8&jpqM^=82b21iP%7|v-(*+OSee<WXC
zv@s5uFvIrlR{}7gs?G0#QL4e!?IV_tQ_QHP;&9JJ5Uf9+$-qbnek`|j@8_R?aV@-n
zgO+_Urx4Hm%3VSq3;YrY0s5X6Lwyh`Xt8=0hw{;2l=eO#Ywv2lfFsYj5?G6uivE9K
zHcVX!B!SjKxZih#r-%i-0|wpzp9>6*D7EJls;+A^Sa}x-ev7{<E%>RxTA<PVwXYS<
z5;`~>Wenyl<3}HT{B40GM7qx63%FYW3QP1l@m@DNL%+icP}@-8gwOx-x`yTwJ{J|6
zWOF#D@wlVCGtOFnp^-6ht`_)Jz+7N6&|((4X?};lK0Y}ewerfGW(*P_TI5!7a74^s
z-7oxdDW^bJ$^H>aevcCE!^li^LIJ$Gdiulo97j=mc0gx$-!g0cp?+bFs{}t8m@gMN
z!FqWy$g#`LFFqy4z@t@Yp8t8pCZq<ap#Vs`GBGSNCSkckQ%s^Wd>`07yx2UPV>NKU
zt^4-ve}0Cw{t{C&2WgC-l+ah<L0}$G3P=P~sj=s5Dr=Snp)(Z86@UW7$oo!A%Sdol
z+s+`XptzC!C#7ZjDbYSY6sH0<-um0$r<$J)iHz~JGg?fBYq`&|zjWA9klR(x3xD0l
z%Ya-!B3Pz`?oeu?5~!|gSTFA%n<n{6^<@uPxkYX4AE9R9O0=JznV0Wm@W-U$vWh-F
z3!^mA&VA?5z_jcy?^u-3?am5+3SgSwgYmVqSdr3<uc>Q1Zue>%J{2_-AUnUPll{Z{
zr-%ZiY|E~9QUS)7mRGeMdp66i^1vgQW3A7S@aRR(2>%iapI<z;E#1ZV?M<z-<#gan
zG^nEh#lv`iul%CY5GC5j$To!b$2+40@Q}9f*=^Z*c0GHB+U;Ac^%;|p?Cq%Vy@0F@
z0YN6C&Yg^}tf~8roR;i7)f9kJ-X$1zy_IMmBOBXysvdAbaapTrdde%Rw09q-(KXik
zj7v_7a#R5pa%V0R1qc{%>rRv#YL1J5!5*-|-82w+Si&Oec$%T6{t?C6_x5|l83ll`
z-I;F^W|_|3eK4dKTI(|rL;2{!U%O!<6rh6<D_qCB8)fB&pIK;qi5heen}Q?ewe0Me
ztyKH|LE(80PswXHoP|-t$mifJv-@0IN7rwy^@kNrwIdxZ4P~soN=(np&A<9M1<>h>
z)S@LKI&Rs^2Vb3ne~&29eppnj5&WL)paM*xN0QH#R#e5<yZ71W_W#6Me^}8pjn;`5
zmI{rW|I}i7TypwUIZgO2OD$Sr;*-PZl?20gD$zbiS@3+7gW+-uxs>B`@b`O<vSRpw
zwf?el3p++rfawf8P>bP$>BpsE7nPJJszysfN->vT^^GlgO0-XbVwKekzF#z&0wA_8
z!~7iFy?2eG0B05I^g|~oKweSzXvUu(Ytqs{Q482Zm?5VLUth3Vv|u0I#4u#y`YP2&
zBto}WuH6uBPcHcT71$Fo@_u;r22r4L)T&^GrRDvWeP!kA`t3dx7!uw@tyB}yaY=W}
zX{xBMU8NQ+Nk}~d^Dlkl(3^MQ|3)SH;B?FSMd;@qI|=|@%rM=LV3{IE%F@FB-)Y$w
zMgXHdEt|~KtkhP3$e8$L$9uIJ7pg@IjV|!zc7|<LRM%B0)eqwh(2o&V42+e@WGt|Z
zCz7#bJ@0+y+2_`pBc<(KMWy9Cttp#51(?Oa3$+y>DlRElPFHhl+wE%7gTo@$FgO&u
zaluOVLsvUwK<I$SfF(cyf8*9V?<udUWe|x&$*TE9Wi6I{zz!I&`G9X=$SSpkPsAmq
z9+$}Q(#r>bgx^Qhq9-^!s+e>fJ^IP-Fs$|})epaL?DCnF;9DRZ-t>1YhX>v`^wu&c
zz@?5T06eH2mVK}dn-8F)1ZKOa4J-q<TUfN`A;YCpEqWriChlIbcEbct1BkXsRJuQ=
znuQ^Xiggc?w`H4tgBP#=+2@}3W@U1Ry@pT#%eM1%Wt}!3fR#~3EmRv&0ON`^KHrlm
zz&Omm2DRv+AqaYIAsruod}IN>qCR)^jlO!RbV&N(F*MAQI@eJJKooPYmG;_fK7fdk
zW-TZHOTB>M$2o&w`6j7F4-F?A47^e(<Ii!lOQh0$Vyfxx=<12#;SnNT>~2SgeqP|8
z7n4;_Xt%Vy*5*S<A?nnE0$?MXfeQ=ew80<0T1}e#gTgAz4wkRK{(3&*`RbME2bOzh
zXHQ?$7him_NC=))$**_j7#g7f7jgw-*?x)MV0#k@8x8$hPyiw@Br;4+8<I3<s!0#C
zg22?tLJ6k){U2{XMvK~Yg0JX6mQXlL!wbRlFsYxN?0E!hkX~=CADzB(o4u{Z{v3XR
z8bH{VSW83jN_fD!)uM-n85H1QS>E2Ad-v`4hG8{)D(%9!ZR;Bx3PBFw{X+166v?5d
zRN@UI)}7Y+gICqI#}OLR#o<>AK<vA;VztkuG6k53GAKGVX+n-enVcTZ%Q*8d0DK#E
zwk=&*Wh?v&L6}a=g6FAWSD&ijzs+O{jeOWzzty$dSJ-hJl(uU{0hrPZ1vt(n+`g+j
zSWTK32n(8iB2$7(c~so~7Y?jJ5=o~+f=5Ufm4^BMLhy6Mv2iXf>KG9f7ig{j<{j;K
z+g5<$(k87a0D)by<HDB?ynJx3n)Gn%77DP^GGm8Fy<vH{WJmih?ppR*dlo})gHd|M
zj|V{s!OsS+a>S*3G8bwC<yfNwzJ#CK-aOEiS7=EAg2SRZ!SL}iX8)w5+@PwGdi!o_
z15IaHCU1(ld%>rleYObBdS9F@5`zk(vB>6$K-rfKvg#kRgwiN_yi0Uka)%}Dh^*>m
zXt~XYutdn@>DXEUPx5+dwa*Osyo-t%iE7fsLm5ERAFS=ai{;v%EDwtom?=+pSMmaV
z7sVl2$C7rW+!^eicTiDP8%n2#R=}uP_`<`E-xqjgk(x9yFAuAMLOX#N<CvKvmT=c{
z$>@v&$2AJzJ)3k|(vIX(`>AM%dU;$+3PAX63hl)UO^`A8dQ1ZiYSI)C9F9@ITlK>u
zY+cwo_P0iN+pezVb{`xvO1EiE0Wg=5+4JPFZe6|o5o*%Jzzooop;ZM43fod^g>K`a
zxBhnPs5$7^GVIfm0<bz3;^m6ubfR{^9IU+u)T9eFi>L%QX-)W`=}KfXpFl5C%C?Vc
zgV4yTsH)TRG)gTYASgmw{<QavGCHqD4c{y^X`+z@nsT(J0HEpN<n-(l=xu6kOLpjh
zYiznia1%jGV9C|xPp^-bCrSR}?SC#|?w*=-@sJA8HCsyxfNU<kHCl&^Bab@N01^u3
zYfS+N)XX)4*;8anFb!61j+!(vObawM0u!|H^{>AsC_L%}I^p2!#9o7A=N)n*0(;Rr
zw59;a6(F<Y<T>yd1(vEk3izXrFX&pW5e3+Yn2r-@M7DK?T?deb0-W2tqb*r$3cw1T
zsB$%em;8l{)|;_(%}|rB)MLAZMmb$73IBY!&iky<h>|f+I^}tM4aEzy@(M=)NlVz8
zU>XH-fw5+z^~jMUi}Q*~deo#VY|B>CRSlf2q5>?7h>1IaHUyZof=@R()fmsA!Lq?r
z7guXo?;A*FFOb^;eFM9L)uf3_RY6y{O2VInrE(8Fr<SzgRIw<BhkyBU5Ia}CT2ugG
zcy$36n|<)uVVj5DHdPgt=NMoOPTCf$pa6l~s<xyF_EA4}Dd(M3qhRVCFa}$-s04Uh
zGCDz~uvfkF?t4qI<JG4oT~WyK16{j;+uSJpX~^d^()Vvkk68Pk+<}+e(AYgZ5}-u|
zFcnHfwKBZ?12TGVA0FA`hrf@gN!zB-NYd3$!MH*A-v{cEN_PSs_!#=(F<odbw|}yu
zz-$B&)@xA-#IlfI+l@j2&gNDud;^(k+XJX9O4_>3v?(O~u|O>16HI+t(gBBFJZ-sC
z>V$g(sE)A$4I0^r)_|hP(y~?ST7XLhy+34(oxZYKuO?j_p_t4Gx_SYZPX}moEZ~FX
zrzuLwvVZL7bbRvZr}sJJ`gK4F?rdmoP1T|T(CQV8t^+PKuL_V%u?S(-4QkTH<Q74j
z5qJ{ta*^=80Dpi<v{w6u0nd|Gu5*dDp`r5;tG)p1$p$Sd0g5e}>;W*O2$(2BwtxGt
z4?cVtMr^a%BLU0oQCL7WaMdXa|9l{Y?ICR5YM<E5(}_USaV{Hjcy`U(|9t0B7#2NR
zR034KGG)<%F$KW6A}VL*;g3FAqV`C@QHp8b%a19+ZeSg7-boDkvpC(c9hUI1))yRN
zyZFv7KkC+eY{~O49(WqA#Q`lU0sRA9hl5EKv<Vpd#sJJCM~*&-2%>7W>0<#19*iYM
z1KI|@z)iq-JAywCSODnx9F?5a*sZk>J8k%d123<_J5N`{>g47N)0Or=|H2yNo%d%z
zv$cjeFnI-)VC7l^@H3$VGnsW$yS)k3=ZbqsduC37Q4RXGVM+*#j4{(_Mjwy?_yMZ{
zA0Qm40F37Qe6g}fp}}XPZFu}5L~@C8JCk%NG8^W#Hx50Ch@5r~Z>|Qk*_e}G+=US4
z7DOpmVNNT8@G_9lkbp4jsP5i@;KAV$e}r0l<20?6hu-|#<L|!r{v(GEf3!qo+5Dc$
zY7wn_yJeIvtmMU<)}Dhx!<D=lN5saW6iqffisgBQC2gQ(M2Yt!xPgTFfF>i+G&THB
z8IA)L#eDFFz4jWLcO)@E1-MXg&y!GsyWnDcsH%2*-bpYD$DiqTQMhC{Dq2Pj4jBV5
zy{vlY-FKJDGG<N%Ou9JFVhWok5-#r&%(C0Y(N8{EjEtYvs16o^y1PiL(>GE%U9AjU
zEo@ClF)2hyM6?u&jU|S3#UluYM&xMEL-@&p<|$*`b#cpBSegsqCwK~9X)%~HY>hz7
zO#={g7EZSgJow6M%W<mJqEVQCuMiXyC~gC86~entgjoMbBvx>qzkr7>2`A75XSO_r
zp?Ho^=qp7C_f5bI@ox8>pcF@sJ~*;xuMfXC6p*g9_0DdB5y}}ZXq!65-Io|ze`#hE
zM+CTHeUTm&Lk8_^?~LX!je2&L0>4kpRksO-|8&pZXRk#C%U>Y`{C6<q?!xf*XJ8Ew
z3?zs-QU~aP?G~s7N@U0c5`is1plD|)Fdvxi#QTjG%E5%qn`s1FjvO2%;4b&$2!Rz+
zr@MrYzPi9OZ`Fiv=_e3h={+{S=(~lWui&t3PJ)CmLWHr_Yika4F-Cy7r}(bp#mF<2
zwR+?V!JI!%83<5G=M<-u@R7Wu`|$ALCE`Q6S~J0jVni@!#E?PP2xeJzNI)2=a$^St
z4NO6new#vAq1!YcBEwaR+L|cEAU7Z`DNTw8k`R+GM<V7*{>_Z7*dvI>t{gW=a9paX
zolPN;{4L1U89G8CE*B%jALYvM?7sbLF*0PA>J61JYCE|CI29C?=<87*aGk7%z@=kO
z=PS2B7fS1v7BP(-C4pMQ_3&nLXY49B7|6d6Q`~V!!NWbf0bg$+mZ1HP(v66oUKEAS
zdj5q2t7Prns_0VBT^DSHCzTewX^%XoU=Zb8{zAdHc|^Qej0`j?|6mp%m#Qxucxffq
z?J$lrP-{pBgR%<Fs!9}rEW&S@C<GmP@Re7W%Zf)3cLJA;Ia96!FCCoj4h7&cQ_R<1
zDo&5wpSX+_K7~!>=yG<Ru%9N4InyrM3$SK8loUR;MO#_Xiy>|rdT%Pjg<^HV<?VFg
zsG1>L^8Q#D%wxx#sTb!ly`e^@qynJ$QlMKMB%aH;tG=;0JUuH{QUaN|1-&r*=A6-A
z(dmA*cXltKD^v;K<jfrU9z0yu@P*Bo8!%KGl~90PUA_Kl8h)P3F+1QQ1TnNIp#a$3
zTjb%e_7z|poFlnPC;;{r=6g7N8eG^o@>fCu5HalQ;qGa0AsA!65(?nsAJq25iZv5F
z9M<@S!irOH687%2%pA#;K%pe*i506K^Ke-EcEI_Cy0Y3dYzny&+$DT+#hU&no?3m4
zhs)YlfUyWIOXsejtHI16C_oEvnTOLFzM5Khu2Dh(m^Q_v5hy?-@M90BHF{yMe3lXl
zK(N9X15Tg-J-{3fx3xJ9T!C<>UZs?PfhVY-K_ws(fJq*%YfAwpA}FF#DFq;yKE~>v
zLJ1alxUR7akuY&eDu5Y0g%hJeh==1EyIR}YA5YE5mfQi9n5pw{Tw@nP#BOz$0)$4!
z7%>e@^l)8UcEDxWz-dcGzQ59lO-Q93aI1&w+ERcCW#v^mcPKy#s%fuW<Nbt(>zXqJ
zo5ES~BRw;B5P>3$pYKO*;Vz(qK*mkuF_bhE>hx6vV*U+CG%X<zU0sYk#azNryFCk8
z#c2exbrPFecE%Dob0`Xt!r@4@p5@`V_C|r}F31da6xVq;t~~{~MwU-_m%v<+tvg3#
z49^mYnzswwCKPA72&=wDfZ^3Q2>e`R|6VJOWo1bA#U74(F3;t;zT4OT12vu5rgZGt
Qp8x;=07*qoM6N<$f&qT!i~s-t

diff --git a/browser/themes/osx/preferences/aboutPermissions.css b/browser/themes/osx/preferences/aboutPermissions.css
index 3f03c2836f28..c07c88a20920 100644
--- a/browser/themes/osx/preferences/aboutPermissions.css
+++ b/browser/themes/osx/preferences/aboutPermissions.css
@@ -105,7 +105,7 @@
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 .pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
@@ -133,9 +133,6 @@
   .pref-icon[type="geo"] {
     list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
   }
-  .pref-icon[type="desktop-notification"] {
-    list-style-image: url(chrome://browser/skin/notification-64@2x.png);
-  }
 }
 
 .pref-title {
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index 430a9d489639..44bed3c76da4 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -127,6 +127,8 @@
   skin/classic/browser/notification-pluginAlert@2x.png         (../shared/plugins/notification-pluginAlert@2x.png)
   skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
   skin/classic/browser/notification-pluginBlocked@2x.png       (../shared/plugins/notification-pluginBlocked@2x.png)
+  skin/classic/browser/web-notifications-icon.svg              (../shared/web-notifications-icon.svg)
+  skin/classic/browser/web-notifications-tray.svg              (../shared/web-notifications-tray.svg)
   skin/classic/browser/webRTC-shareDevice-16.png               (../shared/webrtc/webRTC-shareDevice-16.png)
   skin/classic/browser/webRTC-shareDevice-16@2x.png            (../shared/webrtc/webRTC-shareDevice-16@2x.png)
   skin/classic/browser/webRTC-shareDevice-64.png               (../shared/webrtc/webRTC-shareDevice-64.png)
diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
index b16747cefd73..17f2ff10f3b0 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -49,7 +49,7 @@
 }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
@@ -246,7 +246,18 @@
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .pointerLock-notification-icon,
@@ -400,11 +411,6 @@
     -moz-image-region: rect(0, 96px, 32px, 64px);
   }
 
-  .web-notifications-notification-icon,
-  #web-notifications-notification-icon {
-    list-style-image: url(chrome://browser/skin/notification-16@2x.png);
-  }
-
   .pointerLock-notification-icon,
   #pointerLock-notification-icon {
     list-style-image: url(chrome://browser/skin/pointerLock-16@2x.png);
@@ -426,10 +432,6 @@
     list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
   }
 
-  .popup-notification-icon[popupid="web-notifications"] {
-    list-style-image: url(chrome://browser/skin/notification-64@2x.png);
-  }
-
   .popup-notification-icon[popupid="pointerLock"] {
     list-style-image: url(chrome://browser/skin/pointerLock-64@2x.png);
   }
diff --git a/browser/themes/shared/web-notifications-icon.svg b/browser/themes/shared/web-notifications-icon.svg
new file mode 100644
index 000000000000..f7186c727520
--- /dev/null
+++ b/browser/themes/shared/web-notifications-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .icon {
+        fill: #a6a6a6;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path d="M57,48 L46,48 L46,60.016 L32.482,48 L7,48 C5.343,48 4,46.657 4,45 L4,11.031 C4,9.374 5.343,8.031 7,8.031 L57,8.031 C58.657,8.031 60,9.374 60,11.031 L60,45 C60,46.657 58.657,48 57,48 ZM36,16.031 C36,14.927 35.105,14.031 34,14.031 L30,14.031 C28.895,14.031 28,14.927 28,16.031 L28,30.031 C28,31.136 28.895,32.031 30,32.031 L34,32.031 C35.105,32.031 36,31.136 36,30.031 L36,16.031 ZM36,37.5 C36,36.672 35.328,36 34.5,36 L29.5,36 C28.672,36 28,36.672 28,37.5 L28,40.5 C28,41.328 28.672,42 29.5,42 L34.5,42 C35.328,42 36,41.328 36,40.5 L36,37.5 Z" class="icon"/>
+</svg>
diff --git a/browser/themes/shared/web-notifications-tray.svg b/browser/themes/shared/web-notifications-tray.svg
new file mode 100644
index 000000000000..314026a1062c
--- /dev/null
+++ b/browser/themes/shared/web-notifications-tray.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 96 32">
+  <defs>
+    <style>
+      .style-icon-notification {
+        fill: #666666;
+      }
+      .style-icon-notification.hover {
+        fill: #808080;
+      }
+      .style-icon-notification.active {
+        fill: #4d4d4d;
+      }
+    </style>
+    <path id="shape-notifcations-push" d="M27,23.969 L24,23.969 L24,29.977 L17.241,23.969 L5,23.969 C3.343,23.969 2,22.626 2,20.969 L2,6.969 C2,5.312 3.343,3.969 5,3.969 L27,3.969 C28.657,3.969 30,5.312 30,6.969 L30,20.969 C30,22.626 28.657,23.969 27,23.969 ZM18,8.969 C18,7.864 17.105,6.969 16,6.969 C14.895,6.969 14,7.864 14,8.969 L14,13.969 C14,15.073 14.895,15.969 16,15.969 C17.105,15.969 18,15.073 18,13.969 L18,8.969 ZM16.5,17.969 L15.5,17.969 C14.672,17.969 14,18.640 14,19.469 C14,20.297 14.672,20.969 15.5,20.969 L16.5,20.969 C17.328,20.969 18,20.297 18,19.469 C18,18.640 17.328,17.969 16.5,17.969 Z"/>
+  </defs>
+  <use xlink:href="#shape-notifcations-push" class="style-icon-notification"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(32)" class="style-icon-notification hover"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(64)" class="style-icon-notification active"/>
+</svg>
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 80cb81ac4f8a..b9377adbf03f 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -51,8 +51,6 @@ browser.jar:
   skin/classic/browser/menuPanel-small-aero@2x.png
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
-  skin/classic/browser/notification-16.png
-  skin/classic/browser/notification-64.png
   skin/classic/browser/pageInfo.css
   skin/classic/browser/pageInfo.png
   skin/classic/browser/pageInfo-XP.png
diff --git a/browser/themes/windows/notification-16.png b/browser/themes/windows/notification-16.png
deleted file mode 100644
index 281fba16d54cca16c18e8b883ebecd78edaf6efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005WNkl<Zc-oE8
zab(nC9LMqR^Sf&Zx7ra-+>yadW<?Z|P*%$-Sgi%MbR~;ZP?D;glG@d^DQ#1QrL|gQ
zK|#=zNGX9y6k4W|+_~?!H=gm_wAF`~kMH;AdG3C9PW~f(w?|h~=dl=L$nEXeG$|y)
zoawza+GQpWP((9c;W7JKA#s@{S8m>~rTWaYoj$v-vu(gX>fzZ>I*;sMU!izoWCb;Z
zv|lys-?{mne>Q#Q8QQBZxHLGNqB_xvRet>&ITR2>5id<#oWluM7`RKz25iSxTtF^(
zy>FO6v!4^#XfF0#OwUECn#V(ILk*@7hj<Ch3+9xn$=h_>gqo!yQ{4>-R8S7)I6eh)
z5%ogoGM}V%Qk|uEjb*{^1=29||C+z(PIB^1R8l8gpi?XtU^*@6opC`c8V_Z6n2<eB
z%`N#b)acCKM`rp65~xFjufeVf-4euA%2^c|arw)G^~~clzC{VgaX8pla18g*BKVwH
zx84akQ|Ql7E0M%<C`veiA87K2)*^#3jny3Z*wFFaNs!Y$*SAo^etdGIdlv_0iT^F4
zaABt75HEA;;<cpAk*jN*Rb6oOU>E<leL)!uaZ>(~KQ$;HuQPoVs{jB107*qoM6N<$
Ef+igBwEzGB

diff --git a/browser/themes/windows/notification-64.png b/browser/themes/windows/notification-64.png
deleted file mode 100644
index cedd80d70eec1819625f04b57ff8217577e0e5a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3294
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

diff --git a/browser/themes/windows/preferences/aboutPermissions.css b/browser/themes/windows/preferences/aboutPermissions.css
index 5e158f6114c2..f5a276ea6556 100644
--- a/browser/themes/windows/preferences/aboutPermissions.css
+++ b/browser/themes/windows/preferences/aboutPermissions.css
@@ -99,7 +99,7 @@
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 .pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);