From f579c98b654dd2909f653ca92c53ee573dd4a9b3 Mon Sep 17 00:00:00 2001
From: roytam1 <roytam@gmail.com>
Date: Sat, 21 Jan 2023 00:07:37 +0800
Subject: [PATCH] import changes from `dev' branch of rmottola/Arctic-Fox: -
 Bug 1195755: Don't assert recursion depth sanity on Mac, because there is
 none. r=me (e25096acc1) - Bug 1217940 - remove BindingUtils.h from
 CycleCollectedJSRuntime.cpp; r=mccr8 (012fad0b80) - Bug 1118285 - The
 browser.newtab.url preference is abused and should be removed. (ca573649c6) -
 Bug 1209591 - allow loadURI consumers to expose whether an error page was
 immediately loaded as result of an error, r=smaug,mak (c033d86f07) - Bug
 1167132 - Part 14: [NetworkManager] Move network information into a separate
 interface (NetStats). r=ethan (87acc048cc) - Bug 1167132 - Part 15:
 [NetworkManager] Move network information into a separate interface
 (NetworkInterfaceList). r=echen (a2a96e481e) - Bug 1205240 - Add JSON
 Validation code in order to prevent invalid file. r=seanlin (8c7261ba8c) -
 Bug 1215429 - Add import statement in order to access file object in chrome
 code of TVSimulatorService. r=seanlin (5ba9e78581) - Bug 1217093 - Remove
 for-each from dom/. r=smaug (5af3efbd62) - var-let (576b2489ec) - Bug 1183440
 - Replaces Promise.defer() with the Promise constructor in push tests.
 r=kitcambridge (16dfaa59b3) - Bug 1191453 - Drop subscriptions for a site
 when the user revokes push permissions. r=mt,MattN (5edd10e5ad) - Bug
 1159641, Part 1 - Skip the permission check in
 `pushManager.getSubscription()`. r=mt (d399c496d7) - Bug 1159641, Part 2 -
 Use tasks in the Push permissions test. r=mt (132484c355) - Bug 1206302 - Use
 DOMException for Push errors. r=mt (5a675714fa) - Bug 1193365 - Disable push
 debug. r=kitcambridge (1dc20e69b0) - Bug 1219063, Part 1 - Use transactions
 for updating Push subscription permissions. r=mt (8c28453942) - Bug 1219063,
 Part 2 - Remove obsolete "push" permission. r=mt (84a36931cd) - Bug 1217065 -
 Unconditionally ack incoming updates. r=dragana,benbangert (e0bfa4454f) - Bug
 1212593 - Fix PushService behavior when we are switching between push
 servers. r=kcambridge (0afa39e743) - Bug 1206163 - Retry failed register
 requests on reconnect. r=dragana (6ed1258b15) - Bug 1218591 - Reset the
 WebSocket retry counter when the server replies. r=dragana (64e800db60) - Bug
 1210943 - Drop subscriptions unconditionally if the UAID changes.
 r=benbangert (52f538a7de) - Bug 1214366 - Part 1: Don't preprocess
 PushServiceWebSocket.jsm. r=kitcambridge (a78b9fc838) - Bug 1214366 - Part 3:
 Use getLastVisited equivalent in PushService.jsm. r=kitcambridge,rnewman
 (bc7004ad32) - Bug 1210896, Part 1 - Use Console.jsm to log Push errors. r=mt
 (04335cc37f) - Bug 1216683 - For the WebSocket version unregister should
 return true even if we are offline. r=kitcambridge (0f6e397a03) - Bug
 1210896, Part 2 - Use JS errors to reject internal Push promises. r=mt
 (3546b2f7c8) - Bug 1223481 - Use the "potentially trustworthy origin" helper
 to validate Push server URLs. r=dragana (0c21f551f3) - Bug 1223202 - Only
 send subscription change events if the Push permission is granted. r=mt
 (afeaf0dceb) - Bug 1201128 - Don't send channel IDs in the Push handshake.
 r=nsm (dbbadb5c16) - var-let (a35cb6aeca) - Bug 1210211 - Part 1: Delay
 updating push quota. r=kitcambridge (53f5735ff0) - Bug 1210211 - Part 2:
 Notify Push service of visible notifications. r=baku (9182bcb7d1) - Bug
 1170115 - Use clear-origin-data to remove Push records. r=allstars.chh
 (47f1070bab) - Bug 1211418 - Part 1: Ensure Data Consistency after Collision
 of SMS Segment. r=echen. (f2d5221984) - Bug 1211418 - Part 2: Add Test
 Coverage for the Collision of SMS Segment. r=echen. (06f7ba7308) - Bug
 1159132 - Part 1: Use dun apn only when config ro.tethering.dun_required is
 set. r=echen (bbb4fd2798) - Bug 1159132 - Part 2: Set
 ro.tethering.dun_required when running dun test case. r=echen (11fe9344be) -
 Bug 1187262 - Let the flag 'Services.io.offline' reference the state of
 tethering. r=jjong (ee22fd9358) - Bug 1148671 - ipv6 and dual stack support
 on Lollipop. r=hchang (a9f7dc570e) - Bug 1173671 - just warn if we fail to
 remove old default routes. r=echen (b4ab24da9f) - Bug 1175817 -
 [NetworkManager] remove old default routes explicitly. r=echen,smaug
 (3f9a0b98ab) - Bug 1174998 - Part 1: add setMtu() support in NetworkService.
 r=echen,smaug (9621036470) - Bug 1174998 - Part 2: Set MTU for connected
 network interfaces. r=echen (397c898942) - Bug 1197667 - [NetworkManager]
 Part 1: add missing implementation for 'allNetworkInfo'. r=echen (a49fd3498b)
 - Bug 1197667 - [NetworkManager] Part 2: add test case for 'allNetworkInfo'.
 r=echen (942a52b0d4) - Bug 1057091 - Add USB tethring command supporting IPv6
 outgoing interface. r=hchang (9210eb5a1d) - Bug 1177236 - Usage alert doesn't
 work when tethering is enabled. r=ethan (4bdd8ae226) - Bug 1168938 - Memory
 safety bug in NetworkUtils::postTetherInterfaceList. r=fabrice (97485ac95c) -
 Bug 1138757 - Part 1: Fix the logic of checking invalid port in CDMA WAP
 Push. r=echen (68dac00e52) - Bug 1138757 - Part 2: Add Test Coverage for CDMA
 Wap Push. r=echen (9d54278aa9) - Bug 1209891 - Do Not Reply Read-Report if a
 MMS Message Was Marked from Unread to Read Multiple Times. r=echen
 (421550db06) - var-let (2ed380bb64) - bug 1175005: performance regression.
 backout_f081c464c1e2 (28e1ee74b9) - Bug 1207665 - Block Intel GMA 3150 for
 d3d11/d2d on all drivers. (bug 1207665 part 1, r=jrmuizel). r=jrmuizel
 (bb8eac6fa8) - Bug 1188105: Parse bad driver versions. r=botond (8c856cac36)
 - Bug 1075089 - Move popup menu frame offset to LookAndFeel and fix default
 offset for OS X. r=Enn (e1f7d0c418) - Bug 1134385. Delete main thread
 assertion in CompositorVsyncDispatcher. r=kats (0945e91185) - some profiler
 stuff (d3d68abdad) - Bug 1156283 - Avoid shutdown observer race when shutting
 down gfx on Mac. r=roc (f66195546b)

---
 docshell/base/nsDocShell.cpp                  |  39 +-
 docshell/base/nsDocShell.h                    |   8 +
 docshell/base/nsIDocShell.idl                 |  13 +-
 docshell/base/nsIWebNavigation.idl            |  10 +-
 dom/apps/PermissionsTable.jsm                 |   2 +-
 dom/base/DOMException.cpp                     |   3 +
 dom/base/domerr.msg                           |   6 +
 dom/base/test/chrome/title_window.xul         |   2 +-
 dom/base/test/file_XHR_anon.sjs               |   2 +-
 .../test/test_ipc_messagemanager_blob.html    |   2 +-
 .../BrowserElementPromptService.jsm           |   2 +-
 dom/events/test/test_bug336682_2.xul          |   2 +-
 dom/events/test/test_bug822898.html           |   4 +-
 dom/html/test/test_checked.html               |  24 +-
 .../push/nsIPushNotificationService.idl       |  18 +
 dom/media/tests/mochitest/network.js          |   2 +-
 dom/mobilemessage/gonk/MmsService.js          |   2 +-
 dom/mobilemessage/gonk/MobileMessageDB.jsm    |  61 +-
 dom/mobilemessage/gonk/SmsService.js          |  33 +-
 .../tests/marionette/manifest.ini             |   1 +
 .../test_mmdb_ports_in_cdma_wappush.js        |  74 ++
 .../marionette/test_mmdb_upgradeSchema_22.js  |   2 +-
 .../marionette/test_mt_sms_concatenation.js   |  34 +-
 dom/network/NetworkStatsService.jsm           |  34 +-
 dom/network/NetworkStatsServiceProxy.js       |  20 +-
 .../nsINetworkStatsServiceProxy.idl           |   8 +-
 .../tests/unit_stats/test_networkstats_db.js  |   2 +-
 .../unit_stats/test_networkstats_service.js   |   4 +-
 .../test_networkstats_service_proxy.js        |  50 +-
 dom/notification/Notification.cpp             |  34 +
 dom/payment/Payment.jsm                       |   4 +-
 dom/push/Push.js                              | 242 ++---
 dom/push/PushClient.js                        |  56 +-
 dom/push/PushDB.jsm                           | 150 ++--
 dom/push/PushManager.cpp                      |  98 ++-
 dom/push/PushNotificationService.js           |  29 +-
 dom/push/PushRecord.jsm                       |  99 ++-
 dom/push/PushService.jsm                      | 828 +++++++++++-------
 dom/push/PushServiceHttp2.jsm                 | 220 ++---
 dom/push/PushServiceWebSocket.jsm             | 483 +++++-----
 dom/push/moz.build                            |   5 +-
 dom/push/test/test_multiple_register.html     |   1 -
 .../test/test_serviceworker_lifetime.html     |   2 +-
 dom/push/test/xpcshell/head.js                |  13 +-
 .../test/xpcshell/test_clearAll_successful.js |   1 -
 .../test/xpcshell/test_clear_origin_data.js   | 144 +++
 dom/push/test/xpcshell/test_drop_expired.js   | 153 ++++
 .../test/xpcshell/test_notification_ack.js    |  12 +-
 .../test/xpcshell/test_notification_data.js   | 193 ++++
 .../xpcshell/test_notification_duplicate.js   |  14 +-
 .../test/xpcshell/test_notification_error.js  |  19 +-
 .../xpcshell/test_notification_incomplete.js  |  14 +-
 .../test_notification_version_string.js       |  15 +-
 dom/push/test/xpcshell/test_permissions.js    | 268 ++++++
 dom/push/test/xpcshell/test_quota_exceeded.js |  12 +-
 dom/push/test/xpcshell/test_quota_observer.js |  56 +-
 .../test/xpcshell/test_reconnect_retry.js     |  72 ++
 .../xpcshell/test_register_5xxCode_http2.js   |   5 -
 dom/push/test/xpcshell/test_register_case.js  |   6 +-
 .../xpcshell/test_register_error_http2.js     |  30 +-
 dom/push/test/xpcshell/test_register_flush.js |  12 +-
 .../xpcshell/test_register_invalid_channel.js |   5 +-
 .../test_register_invalid_endpoint.js         |   5 +-
 .../xpcshell/test_register_invalid_json.js    |  11 +-
 dom/push/test/xpcshell/test_register_no_id.js |  11 +-
 .../xpcshell/test_register_request_queue.js   |  19 +-
 .../test/xpcshell/test_register_rollback.js   |  12 +-
 .../test/xpcshell/test_register_success.js    |   8 -
 .../xpcshell/test_register_success_http2.js   |   8 -
 .../test/xpcshell/test_register_timeout.js    |  27 +-
 .../test/xpcshell/test_register_wrong_id.js   |  11 +-
 .../test/xpcshell/test_register_wrong_type.js |  13 +-
 .../test_registration_missing_scope.js        |   3 -
 .../xpcshell/test_registration_success.js     |  12 +-
 .../test_resubscribe_4xxCode_http2.js         |   1 -
 .../test_resubscribe_5xxCode_http2.js         |   1 -
 ...subscribe_listening_for_msg_error_http2.js |   1 -
 dom/push/test/xpcshell/test_retry_ws.js       |  71 ++
 .../xpcshell/test_unregister_empty_scope.js   |   5 +-
 .../test/xpcshell/test_unregister_error.js    |   7 +-
 .../xpcshell/test_unregister_invalid_json.js  |   6 +-
 .../test/xpcshell/test_unregister_success.js  |   7 +-
 ...test_updateRecordNoEncryptionKeys_http2.js |   1 -
 .../test_updateRecordNoEncryptionKeys_ws.js   |   3 +-
 .../test/xpcshell/test_webapps_cleardata.js   |  88 --
 dom/push/test/xpcshell/xpcshell.ini           |  12 +-
 dom/security/nsContentSecurityManager.cpp     |   3 +-
 dom/simplepush/PushService.jsm                |  12 +-
 dom/svg/test/test_SVGxxxListIndexing.xhtml    |   6 +-
 dom/svg/test/test_pathAnimInterpolation.xhtml |  10 +-
 .../gonk/NetworkInterfaceListService.js       |  12 +-
 dom/system/gonk/NetworkManager.js             |  62 +-
 dom/system/gonk/NetworkService.js             | 100 ++-
 dom/system/gonk/NetworkUtils.cpp              | 267 +++++-
 dom/system/gonk/NetworkUtils.h                |  23 +-
 dom/system/gonk/TetheringService.js           | 110 ++-
 dom/system/gonk/nsINetworkInterface.idl       |   7 +-
 .../gonk/nsINetworkInterfaceListService.idl   |   9 +-
 dom/system/gonk/nsINetworkService.idl         |  39 +-
 dom/system/gonk/nsITetheringService.idl       |  13 +-
 dom/system/gonk/ril_worker.js                 |   3 +-
 dom/system/gonk/tests/marionette/head.js      |  29 +
 dom/system/gonk/tests/marionette/manifest.ini |   1 +
 .../tests/marionette/test_all_network_info.js | 106 +++
 .../test_network_interface_list_service.js    |  30 +-
 dom/tethering/tests/marionette/head.js        |   9 +
 dom/tethering/tests/marionette/manifest.ini   |   2 +
 .../marionette/test_wifi_tethering_dun.js     |   1 +
 dom/tv/TVSimulatorService.js                  | 117 ++-
 dom/tv/TVTuner.cpp                            |   2 +-
 dom/voicemail/test/marionette/head.js         |   6 +-
 dom/webidl/NetworkOptions.webidl              |   3 +-
 dom/wifi/WifiWorker.js                        |   3 +-
 .../test/extensions/bootstrap/bootstrap.js    |   2 +-
 dom/workers/test/test_extensionBootstrap.xul  |   4 +-
 embedding/browser/nsIWebBrowserChrome3.idl    |   5 +-
 gfx/tests/gtest/TestGfxWidgets.cpp            |  29 +
 js/xpconnect/src/xpc.msg                      |   1 +
 layout/xul/nsMenuPopupFrame.cpp               |  41 +-
 layout/xul/nsMenuPopupFrame.h                 |   7 -
 media/mtransport/gonk_addrs.cpp               |  16 +-
 modules/libpref/init/all.js                   |  11 +-
 .../tests/unit/test_single_finger_desktop.py  |   5 +-
 toolkit/content/tests/chrome/popup_trigger.js |  23 +-
 .../content/tests/chrome/test_bug624329.xul   |  19 +-
 .../tests/chrome/test_contextmenu_list.xul    |  36 +-
 .../content/tests/chrome/window_largemenu.xul |  18 +-
 widget/GfxDriverInfo.cpp                      |   6 +
 widget/GfxDriverInfo.h                        |  16 +-
 widget/GfxInfoX11.cpp                         |  29 -
 widget/GfxInfoX11.h                           |   2 -
 widget/LookAndFeel.h                          |   9 +-
 widget/VsyncDispatcher.cpp                    |  11 +-
 widget/cocoa/nsLookAndFeel.mm                 |   6 +
 widget/gonk/nsLookAndFeel.cpp                 |   5 +
 widget/gtk/nsLookAndFeel.cpp                  |   4 +
 widget/nsBaseWidget.cpp                       |   1 +
 widget/nsXPLookAndFeel.cpp                    |   6 +
 widget/qt/nsLookAndFeel.cpp                   |   5 +
 widget/uikit/nsLookAndFeel.mm                 |   4 +
 widget/windows/GfxInfo.cpp                    |  12 +
 widget/windows/nsLookAndFeel.cpp              |   4 +
 xpcom/base/CycleCollectedJSRuntime.cpp        |   3 +-
 xpcom/base/ErrorList.h                        |  12 +
 xpcom/base/nsError.h                          |   1 +
 xpfe/appshell/nsContentTreeOwner.cpp          |  18 +
 xpfe/appshell/nsIXULBrowserWindow.idl         |   5 +-
 147 files changed, 3784 insertions(+), 1679 deletions(-)
 create mode 100644 dom/mobilemessage/tests/marionette/test_mmdb_ports_in_cdma_wappush.js
 create mode 100644 dom/push/test/xpcshell/test_clear_origin_data.js
 create mode 100644 dom/push/test/xpcshell/test_drop_expired.js
 create mode 100644 dom/push/test/xpcshell/test_notification_data.js
 create mode 100644 dom/push/test/xpcshell/test_permissions.js
 create mode 100644 dom/push/test/xpcshell/test_reconnect_retry.js
 create mode 100644 dom/push/test/xpcshell/test_retry_ws.js
 delete mode 100644 dom/push/test/xpcshell/test_webapps_cleardata.js
 create mode 100644 dom/system/gonk/tests/marionette/test_all_network_info.js

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6a62edb57f..0150474de1 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4630,7 +4630,10 @@ nsDocShell::LoadURIWithOptions(const char16_t* aURI,
   // what happens
 
   if (NS_ERROR_MALFORMED_URI == rv) {
-    DisplayLoadError(rv, uri, aURI, nullptr);
+    if (DisplayLoadError(rv, uri, aURI, nullptr) &&
+        (aLoadFlags & LOAD_FLAGS_ERROR_LOAD_CHANGES_RV) != 0) {
+      return NS_ERROR_LOAD_SHOWED_ERRORPAGE;
+    }
   }
 
   if (NS_FAILED(rv) || !uri) {
@@ -4695,8 +4698,10 @@ nsDocShell::LoadURIWithOptions(const char16_t* aURI,
 NS_IMETHODIMP
 nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
                              const char16_t* aURL,
-                             nsIChannel* aFailedChannel)
+                             nsIChannel* aFailedChannel,
+                             bool* aDisplayedErrorPage)
 {
+  *aDisplayedErrorPage = false;
   // Get prompt and string bundle servcies
   nsCOMPtr<nsIPrompt> prompter;
   nsCOMPtr<nsIStringBundle> stringBundle;
@@ -5068,8 +5073,10 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
 
   if (UseErrorPages()) {
     // Display an error page
-    LoadErrorPage(aURI, aURL, errorPage.get(), error.get(),
-                  messageStr.get(), cssClass.get(), aFailedChannel);
+    nsresult loadedPage = LoadErrorPage(aURI, aURL, errorPage.get(),
+                                        error.get(), messageStr.get(),
+                                        cssClass.get(), aFailedChannel);
+    *aDisplayedErrorPage = NS_SUCCEEDED(loadedPage);
   } else {
     // The prompter reqires that our private window has a document (or it
     // asserts). Satisfy that assertion now since GetDoc will force
@@ -10325,7 +10332,10 @@ nsDocShell::InternalLoad2(nsIURI* aURI,
 
   if (NS_FAILED(rv)) {
     nsCOMPtr<nsIChannel> chan(do_QueryInterface(req));
-    DisplayLoadError(rv, aURI, nullptr, chan);
+    if (DisplayLoadError(rv, aURI, nullptr, chan) &&
+        (aFlags & LOAD_FLAGS_ERROR_LOAD_CHANGES_RV) != 0) {
+      return NS_ERROR_LOAD_SHOWED_ERRORPAGE;
+    }
   }
 
   return rv;
@@ -11713,7 +11723,7 @@ nsDocShell::ShouldAddToSessionHistory(nsIURI* aURI)
   // should just do a spec compare, rather than two gets of the scheme and
   // then the path.  -Gagan
   nsresult rv;
-  nsAutoCString buf, pref;
+  nsAutoCString buf;
 
   rv = aURI->GetScheme(buf);
   if (NS_FAILED(rv)) {
@@ -11731,16 +11741,17 @@ nsDocShell::ShouldAddToSessionHistory(nsIURI* aURI)
     }
   }
 
-  rv = Preferences::GetDefaultCString("browser.newtab.url", &pref);
-
-  if (NS_FAILED(rv)) {
-    return true;
+  // Check if the webbrowser chrome wants us to proceed - by default it ensures
+  // aURI is not the newtab URI.
+  nsCOMPtr<nsIWebBrowserChrome3> browserChrome3 = do_GetInterface(mTreeOwner);
+  if (browserChrome3) {
+    bool shouldAdd;
+    rv = browserChrome3->ShouldAddToSessionHistory(this, aURI, &shouldAdd);
+    NS_ENSURE_SUCCESS(rv, true);
+    return shouldAdd;
   }
 
-  rv = aURI->GetSpec(buf);
-  NS_ENSURE_SUCCESS(rv, true);
-
-  return !buf.Equals(pref);
+  return true;
 }
 
 nsresult
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 20b378945f..6ef1b9f706 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -733,6 +733,14 @@ protected:
    */
   void MaybeInitTiming();
 
+  bool DisplayLoadError(nsresult aError, nsIURI* aURI, const char16_t* aURL,
+                        nsIChannel* aFailedChannel)
+  {
+    bool didDisplayLoadError = false;
+    DisplayLoadError(aError, aURI, aURL, aFailedChannel, &didDisplayLoadError);
+    return didDisplayLoadError;
+  }
+
 public:
   // Event type dispatched by RestorePresentation
   class RestorePresentationEvent : public nsRunnable
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index ed24b62afb..16e80f0bf9 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -46,7 +46,7 @@ interface nsITabParent;
  
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(9f2babc4-4c2a-4cf7-929f-a1efc325b0df)]
+[scriptable, builtinclass, uuid(b1df6e41-c8dd-45c2-bc18-dd330d986214)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -449,11 +449,14 @@ interface nsIDocShell : nsIDocShellTreeItem
    * @param  aURI           nsIURI of the page where the error happened
    * @param  aURL           wstring of the page where the error happened
    * @param  aFailedChannel The channel related to this error
+   *
+   * Returns whether or not we displayed an error page (note: will always
+   * return false if in-content error pages are disabled!)
    */
-  void displayLoadError(in nsresult aError,
-                        in nsIURI aURI,
-                        in wstring aURL,
-                        [optional] in nsIChannel aFailedChannel);
+  boolean displayLoadError(in nsresult aError,
+                           in nsIURI aURI,
+                           in wstring aURL,
+                           [optional] in nsIChannel aFailedChannel);
 
   /**
    * The channel that failed to load and resulted in an error page.
diff --git a/docshell/base/nsIWebNavigation.idl b/docshell/base/nsIWebNavigation.idl
index d826289958..d12e669b2f 100644
--- a/docshell/base/nsIWebNavigation.idl
+++ b/docshell/base/nsIWebNavigation.idl
@@ -16,7 +16,7 @@ interface nsIURI;
  * location, stop or restart an in process load, or determine where the object
  * has previously gone.
  */
-[scriptable, uuid(e186891c-b053-4fe7-a268-a1c80234b8a2)]
+[scriptable, uuid(3ade79d4-8cb9-4952-b18d-4f9b63ca0d31)]
 interface nsIWebNavigation : nsISupports
 {
   /**
@@ -184,6 +184,12 @@ interface nsIWebNavigation : nsISupports
    */
   const unsigned long LOAD_FLAGS_DISALLOW_INHERIT_OWNER = 0x40000;
 
+  /**
+   * Overwrite the returned error code with a specific result code
+   * when an error page is displayed.
+   */
+  const unsigned long LOAD_FLAGS_ERROR_LOAD_CHANGES_RV = 0x80000;
+
   /**
    * This flag specifies that the URI may be submitted to a third-party
    * server for correction. This should only be applied to non-sensitive
@@ -196,8 +202,6 @@ interface nsIWebNavigation : nsISupports
    */
   const unsigned long LOAD_FLAGS_FIXUP_SCHEME_TYPOS = 0x200000;
 
-  /* Note that flag 0x80000 is available. */
-
   /**
    * Loads a given URI.  This will give priority to loading the requested URI
    * in the object implementing	this interface.  If it can't be loaded here
diff --git a/dom/apps/PermissionsTable.jsm b/dom/apps/PermissionsTable.jsm
index 60a4791b74..d7c9047bef 100644
--- a/dom/apps/PermissionsTable.jsm
+++ b/dom/apps/PermissionsTable.jsm
@@ -596,7 +596,7 @@ this.expandPermissions = function expandPermissions(aPermName, aAccess) {
 
     // Add the same suffix to each of the additions.
     if (tableEntry.additional) {
-      for each (let additional in tableEntry.additional) {
+      for (let additional of tableEntry.additional) {
         permArr = permArr.concat(appendAccessToPermName(additional, requestedSuffixes));
       }
     }
diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp
index 8e2b2ffc0e..c5ea640b09 100644
--- a/dom/base/DOMException.cpp
+++ b/dom/base/DOMException.cpp
@@ -87,6 +87,9 @@ enum DOM4ErrorTypeCodeMap {
   BtAuthFailureError       = 0,
   BtRmtDevDownError        = 0,
   BtAuthRejectedError      = 0,
+
+  /* Push API errors */
+  PermissionDeniedError    = 0,
 };
 
 #define DOM4_MSG_DEF(name, message, nsresult) {(nsresult), name, #name, message},
diff --git a/dom/base/domerr.msg b/dom/base/domerr.msg
index bf6e5b0379..5c8a63d87a 100644
--- a/dom/base/domerr.msg
+++ b/dom/base/domerr.msg
@@ -151,5 +151,11 @@ DOM4_MSG_DEF(InvalidStateError, "A mutation operation was attempted on a file st
 DOM4_MSG_DEF(AbortError, "A request was aborted, for example through a call to FileHandle.abort.", NS_ERROR_DOM_FILEHANDLE_ABORT_ERR)
 DOM4_MSG_DEF(QuotaExceededError, "The current file handle exceeded its quota limitations.", NS_ERROR_DOM_FILEHANDLE_QUOTA_ERR)
 
+/* Push API errors. */
+DOM4_MSG_DEF(InvalidStateError, "Invalid service worker registration.", NS_ERROR_DOM_PUSH_INVALID_REGISTRATION_ERR)
+DOM4_MSG_DEF(PermissionDeniedError, "User denied permission to use the Push API.", NS_ERROR_DOM_PUSH_DENIED_ERR)
+DOM4_MSG_DEF(AbortError, "Error retrieving push subscription.", NS_ERROR_DOM_PUSH_ABORT_ERR)
+DOM4_MSG_DEF(NetworkError, "Push service unreachable.", NS_ERROR_DOM_PUSH_SERVICE_UNREACHABLE)
+
 DOM_MSG_DEF(NS_ERROR_DOM_JS_EXCEPTION, "A callback threw an exception")
 DOM_MSG_DEF(NS_ERROR_DOM_DOMEXCEPTION, "A DOMException was thrown")
diff --git a/dom/base/test/chrome/title_window.xul b/dom/base/test/chrome/title_window.xul
index da2ee24b67..5db180f8bf 100644
--- a/dom/base/test/chrome/title_window.xul
+++ b/dom/base/test/chrome/title_window.xul
@@ -21,7 +21,7 @@
   <script type="application/javascript">
     <![CDATA[
     var imports = [ "SimpleTest", "is", "isnot", "ok" ];
-    for each (var name in imports) {
+    for (var name of imports) {
       window[name] = window.opener.wrappedJSObject[name];
     }
 
diff --git a/dom/base/test/file_XHR_anon.sjs b/dom/base/test/file_XHR_anon.sjs
index c6f400ec9b..755c4cdf3e 100644
--- a/dom/base/test/file_XHR_anon.sjs
+++ b/dom/base/test/file_XHR_anon.sjs
@@ -13,7 +13,7 @@ function handleRequest(request, response) {
     invalidHeaders.push("Authorization");
   }
 
-  for each (let header in invalidHeaders) {
+  for (let header of invalidHeaders) {
     if (request.hasHeader(header)) {
       response.setStatusLine(null, 500, "Server Error");
       headers[header.toLowerCase()] = request.getHeader(header);
diff --git a/dom/base/test/test_ipc_messagemanager_blob.html b/dom/base/test/test_ipc_messagemanager_blob.html
index 707d50a5bd..c8872c93ee 100644
--- a/dom/base/test/test_ipc_messagemanager_blob.html
+++ b/dom/base/test/test_ipc_messagemanager_blob.html
@@ -119,7 +119,7 @@
         mm.loadFrameScript("data:,(" + childFrameScript.toString() + ")();",
                            false);
 
-        for each (let message in messages) {
+        for (let message of messages) {
           mm.sendAsyncMessage("test:ipcClonedMessage", message);
         }
       });
diff --git a/dom/browser-element/BrowserElementPromptService.jsm b/dom/browser-element/BrowserElementPromptService.jsm
index ae42a933ec..797cb0fc36 100644
--- a/dom/browser-element/BrowserElementPromptService.jsm
+++ b/dom/browser-element/BrowserElementPromptService.jsm
@@ -338,7 +338,7 @@ BrowserElementAuthPrompt.prototype = {
         prompt.authInfo.password = password;
       }
 
-      for each (let consumer in prompt.consumers) {
+      for (let consumer of prompt.consumers) {
         if (!consumer.callback) {
           // Not having a callback means that consumer didn't provide it
           // or canceled the notification.
diff --git a/dom/events/test/test_bug336682_2.xul b/dom/events/test/test_bug336682_2.xul
index bd7c591b68..303348c2ec 100644
--- a/dom/events/test/test_bug336682_2.xul
+++ b/dom/events/test/test_bug336682_2.xul
@@ -38,7 +38,7 @@ addLoadEvent(function() {
     }
   }
 
-  for each(var event in ["online", "offline"]) {
+  for (var event of ["online", "offline"]) {
     document.documentElement.addEventListener(
       event,
       makeHandler("document.body.addEventListener('%1', ..., false)",
diff --git a/dom/events/test/test_bug822898.html b/dom/events/test/test_bug822898.html
index 8c3f1312d5..bb34f26d96 100644
--- a/dom/events/test/test_bug822898.html
+++ b/dom/events/test/test_bug822898.html
@@ -67,12 +67,12 @@ function createTestEventValue(name) {
       is(ev.pointerId, pointerId, "Correct pointerId");
     }
 
-    for each (let target in [document, window, testTarget, parent])
+    for (let target of [document, window, testTarget, parent])
       target.addEventListener(name, check, false);
 
     testTarget.dispatchEvent(event);
 
-    for each (let target in [document, window, testTarget, parent])
+    for (let target of [document, window, testTarget, parent])
       target.removeEventListener(name, check, false);
 
 
diff --git a/dom/html/test/test_checked.html b/dom/html/test/test_checked.html
index 2f66c59292..398840c7d9 100644
--- a/dom/html/test/test_checked.html
+++ b/dom/html/test/test_checked.html
@@ -29,12 +29,12 @@ and
 <script class="testbody" type="text/javascript; version=1.7">
 
 /** Test for Bug 418756 and 617528 **/
-let group1;
-let group2;
-let group3;
+var group1;
+var group2;
+var group3;
 
-let tags = ["input", "menuitem"];
-for each (let tag in tags) {
+var tags = ["input", "menuitem"];
+for (let tag of tags) {
 
 function bounce(node) {
   let n = node.nextSibling;
@@ -43,10 +43,10 @@ function bounce(node) {
   p.insertBefore(node, n);
 }
 
-let createdNodes = [];
+var createdNodes = [];
 
 function cleanup() {
-  for each (let node in createdNodes) {
+  for (let node of createdNodes) {
     if (node.parentNode) {
       node.parentNode.removeChild(node);
     }
@@ -55,12 +55,12 @@ function cleanup() {
   createdNodes = [];
 }
 
-let typeMapper = {
+var typeMapper = {
  'c': 'checkbox',
  'r': 'radio'
 };
 
-let id = 0;
+var id = 0;
 
 // type can be 'c' for 'checkbox' and 'r' for 'radio'
 function createNode(type, name, checked) {
@@ -75,11 +75,11 @@ function createNode(type, name, checked) {
   return node;
 }
 
-let types = ['c', 'r'];
+var types = ['c', 'r'];
 
 // First make sure that setting .checked makes .defaultChecked changes no
 // longer affect .checked.
-for each (let type in types) {
+for (let type of types) {
   let n = createNode(type, '', false);
   is(n.defaultChecked, false, "Bogus defaultChecked on " + typeMapper[type]);
   is(n.checked, false, "Bogus checked on " + typeMapper[type]);
@@ -109,7 +109,7 @@ cleanup();
 
 // Now check that bouncing a control that's the only one of its kind has no
 // effect
-for each (let type in types) {
+for (let type of types) {
   let n = createNode(type, 'test1', true);
   $(tag == "input" ? "f1" : "m1").appendChild(n);
   n.checked = false;
diff --git a/dom/interfaces/push/nsIPushNotificationService.idl b/dom/interfaces/push/nsIPushNotificationService.idl
index da947aaf1b..0ce0ecea4e 100644
--- a/dom/interfaces/push/nsIPushNotificationService.idl
+++ b/dom/interfaces/push/nsIPushNotificationService.idl
@@ -57,3 +57,21 @@ interface nsIPushNotificationService : nsISupports
    */
   jsval clearForDomain(in string domain);
 };
+
+[scriptable, uuid(a2555e70-46f8-4b52-bf02-d978b979d143)]
+interface nsIPushQuotaManager : nsISupports
+{
+  /**
+   * Informs the quota manager that a notification
+   * for the given origin has been shown. Used to
+   * determine if push quota should be relaxed.
+   */
+  void notificationForOriginShown(in string origin);
+
+  /**
+   * Informs the quota manager that a notification
+   * for the given origin has been closed. Used to
+   * determine if push quota should be relaxed.
+   */
+  void notificationForOriginClosed(in string origin);
+};
diff --git a/dom/media/tests/mochitest/network.js b/dom/media/tests/mochitest/network.js
index b1f2cfd639..7e6b40e134 100644
--- a/dom/media/tests/mochitest/network.js
+++ b/dom/media/tests/mochitest/network.js
@@ -25,7 +25,7 @@ function isNetworkReady() {
     for (var i = 0; i < num; i++) {
       var ips = {};
       var prefixLengths = {};
-      var length = itfList.getInterface(i).getAddresses(ips, prefixLengths);
+      var length = itfList.getInterfaceInfo(i).getAddresses(ips, prefixLengths);
 
       for (var j = 0; j < length; j++) {
         var ip = ips.value[j];
diff --git a/dom/mobilemessage/gonk/MmsService.js b/dom/mobilemessage/gonk/MmsService.js
index 9f00e0e5c6..6183103fa5 100644
--- a/dom/mobilemessage/gonk/MmsService.js
+++ b/dom/mobilemessage/gonk/MmsService.js
@@ -1647,7 +1647,7 @@ MmsService.prototype = {
 
     savable.receivers = [];
     // We don't have Bcc in recevied MMS message.
-    for each (let type in ["cc", "to"]) {
+    for (let type of ["cc", "to"]) {
       if (intermediate.headers[type]) {
         if (intermediate.headers[type] instanceof Array) {
           for (let index in intermediate.headers[type]) {
diff --git a/dom/mobilemessage/gonk/MobileMessageDB.jsm b/dom/mobilemessage/gonk/MobileMessageDB.jsm
index e5ea48003d..58ad1e16fd 100644
--- a/dom/mobilemessage/gonk/MobileMessageDB.jsm
+++ b/dom/mobilemessage/gonk/MobileMessageDB.jsm
@@ -673,7 +673,7 @@ MobileMessageDB.prototype = {
         stores = txn.objectStore(storeNames[0]);
       } else {
         stores = [];
-        for each (let storeName in storeNames) {
+        for (let storeName of storeNames) {
           if (DEBUG) debug("Retrieving object store " + storeName);
           stores.push(txn.objectStore(storeName));
         }
@@ -1460,7 +1460,7 @@ MobileMessageDB.prototype = {
               let timestamp = messageRecord.timestamp;
               // Setup participantIdsIndex.
               messageRecord.participantIdsIndex = [];
-              for each (let id in participantIds) {
+              for (let id of participantIds) {
                 messageRecord.participantIdsIndex.push([id, timestamp]);
               }
               if (threadRecord) {
@@ -2857,7 +2857,7 @@ MobileMessageDB.prototype = {
         aMessageRecord.threadIdIndex = [threadId, timestamp];
         // Setup participantIdsIndex.
         aMessageRecord.participantIdsIndex = [];
-        for each (let id in participantIds) {
+        for (let id of participantIds) {
           aMessageRecord.participantIdsIndex.push([id, timestamp]);
         }
 
@@ -3827,8 +3827,35 @@ MobileMessageDB.prototype = {
         }
 
         if (segmentRecord.segments[seq]) {
-          if (DEBUG) debug("Got duplicated segment no. " + seq);
-          return;
+          if (segmentRecord.encoding == RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET &&
+              segmentRecord.encoding == aSmsSegment.encoding &&
+              segmentRecord.segments[seq].length == aSmsSegment.data.length &&
+              segmentRecord.segments[seq].every(function(aElement, aIndex) {
+                return aElement == aSmsSegment.data[aIndex];
+              })) {
+            if (DEBUG) {
+              debug("Got duplicated binary segment no: " + seq);
+            }
+            return;
+          }
+
+          if (segmentRecord.encoding != RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET &&
+              aSmsSegment.encoding != RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET &&
+              segmentRecord.segments[seq] == aSmsSegment.body) {
+            if (DEBUG) {
+              debug("Got duplicated text segment no: " + seq);
+            }
+            return;
+          }
+
+          // Update mandatory properties to ensure that the segments could be
+          // concatenated properly.
+          segmentRecord.encoding = aSmsSegment.encoding;
+          segmentRecord.originatorPort = aSmsSegment.originatorPort;
+          segmentRecord.destinationPort = aSmsSegment.destinationPort;
+          segmentRecord.teleservice = aSmsSegment.teleservice;
+          // Decrease the counter for this collided segment.
+          segmentRecord.receivedSegments--;
         }
 
         segmentRecord.timestamp = aSmsSegment.timestamp;
@@ -3847,11 +3874,11 @@ MobileMessageDB.prototype = {
         // save it into the segmentRecord.
         if (aSmsSegment.teleservice === RIL.PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
             && seq === 1) {
-          if (aSmsSegment.originatorPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
+          if (aSmsSegment.originatorPort !== Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
             segmentRecord.originatorPort = aSmsSegment.originatorPort;
           }
 
-          if (aSmsSegment.destinationPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
+          if (aSmsSegment.destinationPort !== Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
             segmentRecord.destinationPort = aSmsSegment.destinationPort;
           }
         }
@@ -4099,8 +4126,11 @@ MobileMessageDB.prototype = {
    * @param {boolean} value
    *        The updated <code>read</code> value.
    * @param {boolean} aSendReadReport
-   *        <code>true</code> to update the <code>isReadReportSent</code>
-   *        property if the message is MMS.
+   *        <code>true</code> to reply the read report of an incoming MMS
+   *        message whose <code>isReadReportSent</code> is 'false'.
+   *        Note: <code>isReadReportSent</code> will be set to 'true' no
+   *        matter aSendReadReport is true or not when a message was marked
+   *        from UNREAD to READ. See bug 1180470 for the new UX policy.
    * @param {nsIMobileMessageCallback} aRequest
    *        The callback object.
    */
@@ -4153,17 +4183,18 @@ MobileMessageDB.prototype = {
         messageRecord.read = value ? FILTER_READ_READ : FILTER_READ_UNREAD;
         messageRecord.readIndex = [messageRecord.read, messageRecord.timestamp];
         let readReportMessageId, readReportTo;
-        if (aSendReadReport &&
-            messageRecord.type == "mms" &&
+        if (messageRecord.type == "mms" &&
             messageRecord.delivery == DELIVERY_RECEIVED &&
             messageRecord.read == FILTER_READ_READ &&
             messageRecord.headers["x-mms-read-report"] &&
             !messageRecord.isReadReportSent) {
           messageRecord.isReadReportSent = true;
 
-          let from = messageRecord.headers["from"];
-          readReportTo = from && from.address;
-          readReportMessageId = messageRecord.headers["message-id"];
+          if (aSendReadReport) {
+            let from = messageRecord.headers["from"];
+            readReportTo = from && from.address;
+            readReportMessageId = messageRecord.headers["message-id"];
+          }
         }
 
         if (DEBUG) debug("Message.read set to: " + value);
@@ -4240,7 +4271,7 @@ MobileMessageDB.prototype = {
   }
 };
 
-let FilterSearcherHelper = {
+var FilterSearcherHelper = {
 
   /**
    * @param index
diff --git a/dom/mobilemessage/gonk/SmsService.js b/dom/mobilemessage/gonk/SmsService.js
index eb3d854835..4005bc2a8e 100644
--- a/dom/mobilemessage/gonk/SmsService.js
+++ b/dom/mobilemessage/gonk/SmsService.js
@@ -551,12 +551,35 @@ SmsService.prototype = {
       options.receivedSegments = 0;
       options.segments = [];
     } else if (options.segments[seq]) {
-      // Duplicated segment?
-      if (DEBUG) {
-        debug("Got duplicated segment no." + seq +
-              " of a multipart SMS: " + JSON.stringify(aSegment));
+      if (options.encoding == Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET &&
+          options.encoding == aSegment.encoding &&
+          options.segments[seq].length == aSegment.data.length &&
+          options.segments[seq].every(function(aElement, aIndex) {
+            return aElement == aSegment.data[aIndex];
+          })) {
+        if (DEBUG) {
+          debug("Got duplicated binary segment no: " + seq);
+        }
+        return null;
       }
-      return null;
+
+      if (options.encoding != Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET &&
+          aSegment.encoding != Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET &&
+          options.segments[seq] == aSegment.body) {
+        if (DEBUG) {
+          debug("Got duplicated text segment no: " + seq);
+        }
+        return null;
+      }
+
+      // Update mandatory properties to ensure that the segments could be
+      // concatenated properly.
+      options.encoding = aSegment.encoding;
+      options.originatorPort = aSegment.originatorPort;
+      options.destinationPort = aSegment.destinationPort;
+      options.teleservice = aSegment.teleservice;
+      // Decrease the counter for this collided segment.
+      options.receivedSegments--;
     }
 
     if (options.receivedSegments > 0) {
diff --git a/dom/mobilemessage/tests/marionette/manifest.ini b/dom/mobilemessage/tests/marionette/manifest.ini
index 284d79ba2d..121e8a3e7d 100644
--- a/dom/mobilemessage/tests/marionette/manifest.ini
+++ b/dom/mobilemessage/tests/marionette/manifest.ini
@@ -43,6 +43,7 @@ qemu = true
 [test_mmdb_full_storage.js]
 [test_mmdb_upgradeSchema_current_structure.js]
 [test_mmdb_upgradeSchema_22.js]
+[test_mmdb_ports_in_cdma_wappush.js]
 [test_replace_short_message_type.js]
 [test_mt_sms_concatenation.js]
 [test_error_of_mms_manual_retrieval.js]
diff --git a/dom/mobilemessage/tests/marionette/test_mmdb_ports_in_cdma_wappush.js b/dom/mobilemessage/tests/marionette/test_mmdb_ports_in_cdma_wappush.js
new file mode 100644
index 0000000000..53fc932a23
--- /dev/null
+++ b/dom/mobilemessage/tests/marionette/test_mmdb_ports_in_cdma_wappush.js
@@ -0,0 +1,74 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+MARIONETTE_HEAD_JS = 'mmdb_head.js';
+
+const DBNAME = "test_mmdb_ports_in_cdma_wappush:" + newUUID();
+
+const TEST_PDU = [
+  {
+    sender: "+0987654321",
+    iccId: "1029384756",
+    segmentRef: 0,
+    segmentSeq: 1, // 1st segment
+    segmentMaxSeq: 2,
+    encoding: 0x04, // 8-bit encoding
+    data: [0, 1, 2],
+    teleservice: 0x1004, // PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
+    // Port numbers are only provided in 1st segment from CDMA SMS PDUs.
+    originatorPort: 9200, // WDP_PORT_PUSH (server-side)
+    destinationPort: 2948 // WDP_PORT_PUSH (client-side)
+  },
+  {
+    sender: "+0987654321",
+    iccId: "1029384756",
+    segmentRef: 0,
+    segmentSeq: 2, // 2nd segment
+    segmentMaxSeq: 2,
+    encoding: 0x04, // 8-bit encoding
+    data: [3, 4, 5],
+    teleservice: 0x1004, // PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
+    // Port numbers are only provided in 1st segment from CDMA SMS PDUs.
+    originatorPort: Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID,
+    destinationPort: Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID
+  }
+];
+
+function testSaveCdmaWapPush(aMmdb, aReverse) {
+  log("testSaveCdmaWapPush(), aReverse: " + aReverse);
+
+  let testPDUs = aReverse ? Array.from(TEST_PDU).reverse() : TEST_PDU;
+  let lengthOfFullData = 0;
+  let promises = [];
+
+  for (let pdu of testPDUs) {
+    lengthOfFullData += pdu.data.length;
+    promises.push(saveSmsSegment(aMmdb, pdu));
+  };
+
+  return Promise.all(promises)
+    .then((aResults) => {
+      // Complete message shall be returned after 2 segments are saved.
+      let completeMsg = aResults[1][1];
+
+      is(completeMsg.originatorPort, TEST_PDU[0].originatorPort, "originatorPort");
+      is(completeMsg.destinationPort, TEST_PDU[0].destinationPort, "destinationPort");
+
+      is(completeMsg.fullData.length, lengthOfFullData, "fullData.length");
+      for (let i = 0; i < lengthOfFullData; i++) {
+        is(completeMsg.fullData[i], i, "completeMsg.fullData[" + i + "]");
+      }
+    });
+}
+
+startTestBase(function testCaseMain() {
+
+  let mmdb = newMobileMessageDB();
+  return initMobileMessageDB(mmdb, DBNAME, 0)
+
+    .then(() => testSaveCdmaWapPush(mmdb, false))
+    .then(() => testSaveCdmaWapPush(mmdb, true))
+
+    .then(() => closeMobileMessageDB(mmdb));
+});
diff --git a/dom/mobilemessage/tests/marionette/test_mmdb_upgradeSchema_22.js b/dom/mobilemessage/tests/marionette/test_mmdb_upgradeSchema_22.js
index b315a4467c..af9c16f8ca 100644
--- a/dom/mobilemessage/tests/marionette/test_mmdb_upgradeSchema_22.js
+++ b/dom/mobilemessage/tests/marionette/test_mmdb_upgradeSchema_22.js
@@ -171,7 +171,7 @@ let LEGACY = {
         aMessageRecord.threadIdIndex = [threadId, timestamp];
         // Setup participantIdsIndex.
         aMessageRecord.participantIdsIndex = [];
-        for each (let id in participantIds) {
+        for (let id of participantIds) {
           aMessageRecord.participantIdsIndex.push([id, timestamp]);
         }
 
diff --git a/dom/mobilemessage/tests/marionette/test_mt_sms_concatenation.js b/dom/mobilemessage/tests/marionette/test_mt_sms_concatenation.js
index aae6313ea0..f7c11a9aae 100644
--- a/dom/mobilemessage/tests/marionette/test_mt_sms_concatenation.js
+++ b/dom/mobilemessage/tests/marionette/test_mt_sms_concatenation.js
@@ -25,8 +25,8 @@ function byteValueToHexString(aValue) {
   return str.length == 1 ? "0" + str : str;
 }
 
-let ref_num = 0;
-function buildTextPdus(aDcs) {
+var ref_num = 0;
+function buildTextPdus(aDcs, aInsertDuplication = false) {
   ref_num++;
 
   let IEI_CONCATE_1 = "0003" + byteValueToHexString(ref_num) + "0301";
@@ -42,14 +42,24 @@ function buildTextPdus(aDcs) {
   let PDU_COMMON = PDU_SMSC_NONE + PDU_FIRST_OCTET + PDU_SENDER +
     PDU_PID_NORMAL + aDcs + PDU_TIMESTAMP + PDU_UDL + PDU_UDHL;
 
-  return [
+  let pdus = [
     PDU_COMMON + IEI_CONCATE_1 + PDU_UD_A,
     PDU_COMMON + IEI_CONCATE_2 + PDU_UD_B,
     PDU_COMMON + IEI_CONCATE_3 + PDU_UD_C
   ];
+
+  if (aInsertDuplication) {
+    log("Insert Duplicated text PDU");
+    // The 2nd PDU_UD_A is expected to be ignored.
+    pdus.unshift(PDU_COMMON + IEI_CONCATE_1 + PDU_UD_A);
+    // Expected to be replaced with PDU_UD_A;
+    pdus.unshift(PDU_COMMON + IEI_CONCATE_1 + PDU_UD_C);
+  }
+
+  return pdus;
 }
 
-function buildBinaryPdus(aDcs) {
+function buildBinaryPdus(aDcs, aInsertDuplication = false) {
   ref_num++;
   let IEI_PORT = "05040B8423F0";
 
@@ -81,10 +91,20 @@ function buildBinaryPdus(aDcs) {
     return udl + ud;
   }
 
-  return [
+  let pdus = [
     PDU_COMMON + construstBinaryUserData(PDU_DATA1, 1),
     PDU_COMMON + construstBinaryUserData(PDU_DATA2, 2)
   ];
+
+  if (aInsertDuplication) {
+    log("Insert Duplicated binary PDU");
+    // The 2nd PDU_DATA1 is expected to be ignored.
+    pdus.unshift(PDU_COMMON + construstBinaryUserData(PDU_DATA1, 1));
+    // Expected to be replaced with PDU_DATA1;
+    pdus.unshift(PDU_COMMON + construstBinaryUserData(PDU_DATA2, 1));
+  }
+
+  return pdus;
 }
 
 function verifyTextMessage(aMessage, aMessageClass) {
@@ -104,12 +124,16 @@ function verifyBinaryMessage(aMessage) {
 function testText(aDcs, aClass) {
   log("testText(): aDcs = " + aDcs + ", aClass = " + aClass);
   return sendMultipleRawSmsToEmulatorAndWait(buildTextPdus(aDcs))
+    .then((results) => verifyTextMessage(results[0].message, aClass))
+    .then(() => sendMultipleRawSmsToEmulatorAndWait(buildTextPdus(aDcs, true)))
     .then((results) => verifyTextMessage(results[0].message, aClass));
 }
 
 function testBinary(aDcs) {
   log("testBinary(): aDcs = " + aDcs);
   return sendMultipleRawSmsToEmulatorAndWait(buildBinaryPdus(aDcs))
+    .then((results) => verifyBinaryMessage(results[0].message))
+    .then(() => sendMultipleRawSmsToEmulatorAndWait(buildBinaryPdus(aDcs, true)))
     .then((results) => verifyBinaryMessage(results[0].message));
 }
 
diff --git a/dom/network/NetworkStatsService.jsm b/dom/network/NetworkStatsService.jsm
index f86b81d662..eba4d70e96 100644
--- a/dom/network/NetworkStatsService.jsm
+++ b/dom/network/NetworkStatsService.jsm
@@ -26,8 +26,8 @@ const NET_NETWORKSTATSSERVICE_CID = Components.ID("{18725604-e9ac-488a-8aa0-2471
 const TOPIC_BANDWIDTH_CONTROL = "netd-bandwidth-control"
 
 const TOPIC_CONNECTION_STATE_CHANGED = "network-connection-state-changed";
-const NET_TYPE_WIFI = Ci.nsINetworkInterface.NETWORK_TYPE_WIFI;
-const NET_TYPE_MOBILE = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE;
+const NET_TYPE_WIFI = Ci.nsINetworkInfo.NETWORK_TYPE_WIFI;
+const NET_TYPE_MOBILE = Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE;
 
 // Networks have different status that NetworkStats API needs to be aware of.
 // Network is present and ready, so NetworkManager provides the whole info.
@@ -192,10 +192,10 @@ this.NetworkStatsService = {
         // the stats are updated for the new interface without waiting to
         // complete the updating period.
 
-        let network = aSubject.QueryInterface(Ci.nsINetworkInterface);
-        debug("Network " + network.name + " of type " + network.type + " status change");
+        let networkInfo = aSubject.QueryInterface(Ci.nsINetworkInfo);
+        debug("Network " + networkInfo.name + " of type " + networkInfo.type + " status change");
 
-        let netId = this.convertNetworkInterface(network);
+        let netId = this.convertNetworkInfo(networkInfo);
         if (!netId) {
           break;
         }
@@ -269,33 +269,33 @@ this.NetworkStatsService = {
     return networks;
   },
 
-  convertNetworkInterface: function(aNetwork) {
-    if (aNetwork.type != NET_TYPE_MOBILE &&
-        aNetwork.type != NET_TYPE_WIFI) {
+  convertNetworkInfo: function(aNetworkInfo) {
+    if (aNetworkInfo.type != NET_TYPE_MOBILE &&
+        aNetworkInfo.type != NET_TYPE_WIFI) {
       return null;
     }
 
     let id = '0';
-    if (aNetwork.type == NET_TYPE_MOBILE) {
-      if (!(aNetwork instanceof Ci.nsIRilNetworkInterface)) {
-        debug("Error! Mobile network should be an nsIRilNetworkInterface!");
+    if (aNetworkInfo.type == NET_TYPE_MOBILE) {
+      if (!(aNetworkInfo instanceof Ci.nsIRilNetworkInfo)) {
+        debug("Error! Mobile network should be an nsIRilNetworkInfo!");
         return null;
       }
 
-      let rilNetwork = aNetwork.QueryInterface(Ci.nsIRilNetworkInterface);
+      let rilNetwork = aNetworkInfo.QueryInterface(Ci.nsIRilNetworkInfo);
       id = rilNetwork.iccId;
     }
 
-    let netId = this.getNetworkId(id, aNetwork.type);
+    let netId = this.getNetworkId(id, aNetworkInfo.type);
 
     if (!this._networks[netId]) {
       this._networks[netId] = Object.create(null);
       this._networks[netId].network = { id: id,
-                                        type: aNetwork.type };
+                                        type: aNetworkInfo.type };
     }
 
     this._networks[netId].status = NETWORK_STATUS_READY;
-    this._networks[netId].interfaceName = aNetwork.name;
+    this._networks[netId].interfaceName = aNetworkInfo.name;
     return netId;
   },
 
@@ -738,10 +738,10 @@ this.NetworkStatsService = {
   /*
    * Function responsible for receiving stats which are not from netd.
    */
-  saveStats: function saveStats(aAppId, aIsInBrowser, aServiceType, aNetwork,
+  saveStats: function saveStats(aAppId, aIsInBrowser, aServiceType, aNetworkInfo,
                                 aTimeStamp, aRxBytes, aTxBytes, aIsAccumulative,
                                 aCallback) {
-    let netId = this.convertNetworkInterface(aNetwork);
+    let netId = this.convertNetworkInfo(aNetworkInfo);
     if (!netId) {
       if (aCallback) {
         aCallback(false, "Invalid network type");
diff --git a/dom/network/NetworkStatsServiceProxy.js b/dom/network/NetworkStatsServiceProxy.js
index 2990c1f349..e7f4681e17 100644
--- a/dom/network/NetworkStatsServiceProxy.js
+++ b/dom/network/NetworkStatsServiceProxy.js
@@ -29,19 +29,19 @@ NetworkStatsServiceProxy.prototype = {
    * Function called in the protocol layer (HTTP, FTP, WebSocket ...etc)
    * to pass the per-app stats to NetworkStatsService.
    */
-  saveAppStats: function saveAppStats(aAppId, aIsInBrowser, aNetwork, aTimeStamp,
+  saveAppStats: function saveAppStats(aAppId, aIsInBrowser, aNetworkInfo, aTimeStamp,
                                       aRxBytes, aTxBytes, aIsAccumulative,
                                       aCallback) {
-    if (!aNetwork) {
+    if (!aNetworkInfo) {
       if (DEBUG) {
-        debug("|aNetwork| is not specified. Failed to save stats. Returning.");
+        debug("|aNetworkInfo| is not specified. Failed to save stats. Returning.");
       }
       return;
     }
 
     if (DEBUG) {
       debug("saveAppStats: " + aAppId + " " + aIsInBrowser + " " +
-            aNetwork.type + " " + aTimeStamp + " " +
+            aNetworkInfo.type + " " + aTimeStamp + " " +
             aRxBytes + " " + aTxBytes + " " + aIsAccumulative);
     }
 
@@ -49,7 +49,7 @@ NetworkStatsServiceProxy.prototype = {
       aCallback = aCallback.notify;
     }
 
-    NetworkStatsService.saveStats(aAppId, aIsInBrowser, "", aNetwork,
+    NetworkStatsService.saveStats(aAppId, aIsInBrowser, "", aNetworkInfo,
                                   aTimeStamp, aRxBytes, aTxBytes,
                                   aIsAccumulative, aCallback);
   },
@@ -58,18 +58,18 @@ NetworkStatsServiceProxy.prototype = {
    * Function called in the points of different system services
    * to pass the per-service stats to NetworkStatsService.
    */
-  saveServiceStats: function saveServiceStats(aServiceType, aNetwork,
+  saveServiceStats: function saveServiceStats(aServiceType, aNetworkInfo,
                                               aTimeStamp, aRxBytes, aTxBytes,
                                               aIsAccumulative, aCallback) {
-    if (!aNetwork) {
+    if (!aNetworkInfo) {
       if (DEBUG) {
-        debug("|aNetwork| is not specified. Failed to save stats. Returning.");
+        debug("|aNetworkInfo| is not specified. Failed to save stats. Returning.");
       }
       return;
     }
 
     if (DEBUG) {
-      debug("saveServiceStats: " + aServiceType + " " + aNetwork.type + " " +
+      debug("saveServiceStats: " + aServiceType + " " + aNetworkInfo.type + " " +
             aTimeStamp + " " + aRxBytes + " " + aTxBytes + " " +
             aIsAccumulative);
     }
@@ -78,7 +78,7 @@ NetworkStatsServiceProxy.prototype = {
       aCallback = aCallback.notify;
     }
 
-    NetworkStatsService.saveStats(0, false, aServiceType ,aNetwork, aTimeStamp,
+    NetworkStatsService.saveStats(0, false, aServiceType , aNetworkInfo, aTimeStamp,
                                   aRxBytes, aTxBytes, aIsAccumulative,
                                   aCallback);
   },
diff --git a/dom/network/interfaces/nsINetworkStatsServiceProxy.idl b/dom/network/interfaces/nsINetworkStatsServiceProxy.idl
index 897b357ba8..fba2ce9ffd 100644
--- a/dom/network/interfaces/nsINetworkStatsServiceProxy.idl
+++ b/dom/network/interfaces/nsINetworkStatsServiceProxy.idl
@@ -4,7 +4,7 @@
 
 #include "nsISupports.idl"
 
-interface nsINetworkInterface;
+interface nsINetworkInfo;
 
 [scriptable, function, uuid(5f821529-1d80-4ab5-a933-4e1b3585b6bc)]
 interface nsINetworkStatsServiceProxyCallback : nsISupports
@@ -16,7 +16,7 @@ interface nsINetworkStatsServiceProxyCallback : nsISupports
   void notify(in boolean aResult, in jsval aMessage);
 };
 
-[scriptable, uuid(98fd8f69-784e-4626-aa59-56d6436a3c24)]
+[scriptable, uuid(f4f3e901-e102-499d-9d37-dc9951f52df7)]
 interface nsINetworkStatsServiceProxy : nsISupports
 {
   /*
@@ -32,7 +32,7 @@ interface nsINetworkStatsServiceProxy : nsISupports
    */
   void saveAppStats(in unsigned long aAppId,
                     in boolean aIsInBrowser,
-                    in nsINetworkInterface aNetwork,
+                    in nsINetworkInfo aNetworkInfo,
                     in unsigned long long aTimeStamp,
                     in unsigned long long aRxBytes,
                     in unsigned long long aTxBytes,
@@ -50,7 +50,7 @@ interface nsINetworkStatsServiceProxy : nsISupports
    * @param aCallback an optional callback
    */
   void saveServiceStats(in string aServiceType,
-                        in nsINetworkInterface aNetwork,
+                        in nsINetworkInfo aNetworkInfo,
                         in unsigned long long aTimeStamp,
                         in unsigned long long aRxBytes,
                         in unsigned long long aTxBytes,
diff --git a/dom/network/tests/unit_stats/test_networkstats_db.js b/dom/network/tests/unit_stats/test_networkstats_db.js
index 16f2030508..ef4669ab3f 100644
--- a/dom/network/tests/unit_stats/test_networkstats_db.js
+++ b/dom/network/tests/unit_stats/test_networkstats_db.js
@@ -936,7 +936,7 @@ add_test(function test_addAlarm() {
   netStatsDb.addAlarm(alarms[0], function(error, result) {
     do_check_eq(error, null);
     alarmsDbId = result;
-    netStatsDb.getAlarms(Ci.nsINetworkInterface.NETWORK_TYPE_WIFI, exampleManifestURL, function(error, result) {
+    netStatsDb.getAlarms(Ci.nsINetworkInfo.NETWORK_TYPE_WIFI, exampleManifestURL, function(error, result) {
       do_check_eq(error, null);
       do_check_eq(result.length, 1);
       do_check_eq(result[0].id, alarmsDbId);
diff --git a/dom/network/tests/unit_stats/test_networkstats_service.js b/dom/network/tests/unit_stats/test_networkstats_service.js
index 17738859e0..20bbcae61d 100644
--- a/dom/network/tests/unit_stats/test_networkstats_service.js
+++ b/dom/network/tests/unit_stats/test_networkstats_service.js
@@ -260,7 +260,7 @@ add_test(function test_fireAlarm() {
   NetworkStatsService._networks[wifiId].status = NETWORK_STATUS_STANDBY;
 
   NetworkStatsService._db.addAlarm(alarm, function addSuccessCb(error, newId) {
-    NetworkStatsService._db.getAlarms(Ci.nsINetworkInterface.NETWORK_TYPE_WIFI,
+    NetworkStatsService._db.getAlarms(Ci.nsINetworkInfo.NETWORK_TYPE_WIFI,
                                       testManifestURL, function onGet(error, result) {
       do_check_eq(error, null);
       do_check_eq(result.length, 1);
@@ -272,7 +272,7 @@ add_test(function test_fireAlarm() {
       result[0].manifestURL = testManifestURL;
 
       NetworkStatsService._fireAlarm(result[0], false);
-      NetworkStatsService._db.getAlarms(Ci.nsINetworkInterface.NETWORK_TYPE_WIFI,
+      NetworkStatsService._db.getAlarms(Ci.nsINetworkInfo.NETWORK_TYPE_WIFI,
                                         testManifestURL, function onGet(error, result) {
         do_check_eq(error, undefined);
         do_check_eq(result.length, 0);
diff --git a/dom/network/tests/unit_stats/test_networkstats_service_proxy.js b/dom/network/tests/unit_stats/test_networkstats_service_proxy.js
index 04006c68ab..c4a18557cc 100644
--- a/dom/network/tests/unit_stats/test_networkstats_service_proxy.js
+++ b/dom/network/tests/unit_stats/test_networkstats_service_proxy.js
@@ -9,24 +9,24 @@ XPCOMUtils.defineLazyServiceGetter(this, "nssProxy",
                                    "@mozilla.org/networkstatsServiceProxy;1",
                                    "nsINetworkStatsServiceProxy");
 
-function mokConvertNetworkInterface() {
-  NetworkStatsService.convertNetworkInterface = function(aNetwork) {
-    if (aNetwork.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE &&
-        aNetwork.type != Ci.nsINetworkInterface.NETWORK_TYPE_WIFI) {
+function mokConvertNetworkInfo() {
+  NetworkStatsService.convertNetworkInfo = function(aNetworkInfo) {
+    if (aNetworkInfo.type != Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE &&
+        aNetworkInfo.type != Ci.nsINetworkInfo.NETWORK_TYPE_WIFI) {
       return null;
     }
 
     let id = '0';
-    if (aNetwork.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) {
+    if (aNetworkInfo.type == Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE) {
       id = '1234'
     }
 
-    let netId = this.getNetworkId(id, aNetwork.type);
+    let netId = this.getNetworkId(id, aNetworkInfo.type);
 
     if (!this._networks[netId]) {
       this._networks[netId] = Object.create(null);
       this._networks[netId].network = { id: id,
-                                        type: aNetwork.type };
+                                        type: aNetworkInfo.type };
     }
 
     return netId;
@@ -37,13 +37,12 @@ add_test(function test_saveAppStats() {
   var cachedStats = NetworkStatsService.cachedStats;
   var timestamp = NetworkStatsService.cachedStatsDate.getTime();
 
-  // Create to fake nsINetworkInterfaces. As nsINetworkInterface can not
-  // be instantiated, these two vars will emulate it by filling the properties
-  // that will be used.
-  var wifi = {type: Ci.nsINetworkInterface.NETWORK_TYPE_WIFI, id: "0"};
-  var mobile = {type: Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE, id: "1234"};
+  // Create to fake nsINetworkInfos. As nsINetworkInfo can not be instantiated,
+  // these two vars will emulate it by filling the properties that will be used.
+  var wifi = {type: Ci.nsINetworkInfo.NETWORK_TYPE_WIFI, id: "0"};
+  var mobile = {type: Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE, id: "1234"};
 
-  // Insert fake mobile network interface in NetworkStatsService
+  // Insert fake mobile network info in NetworkStatsService
   var mobileNetId = NetworkStatsService.getNetworkId(mobile.id, mobile.type);
 
   do_check_eq(Object.keys(cachedStats).length, 0);
@@ -83,13 +82,12 @@ add_test(function test_saveAppStats() {
 add_test(function test_saveServiceStats() {
   var timestamp = NetworkStatsService.cachedStatsDate.getTime();
 
-  // Create to fake nsINetworkInterfaces. As nsINetworkInterface can not
-  // be instantiated, these two vars will emulate it by filling the properties
-  // that will be used.
-  var wifi = {type: Ci.nsINetworkInterface.NETWORK_TYPE_WIFI, id: "0"};
-  var mobile = {type: Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE, id: "1234"};
+  // Create to fake nsINetworkInfos. As nsINetworkInfo can not be instantiated,
+  // these two vars will emulate it by filling the properties that will be used.
+  var wifi = {type: Ci.nsINetworkInfo.NETWORK_TYPE_WIFI, id: "0"};
+  var mobile = {type: Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE, id: "1234"};
 
-  // Insert fake mobile network interface in NetworkStatsService
+  // Insert fake mobile network info in NetworkStatsService
   var mobileNetId = NetworkStatsService.getNetworkId(mobile.id, mobile.type);
 
   NetworkStatsService.updateCachedStats(function (success, msg) {
@@ -138,7 +136,7 @@ add_test(function test_saveStatsWithDifferentDates() {
   var today = NetworkStatsService.cachedStatsDate;
   var tomorrow = new Date(today.getTime() + (24 * 60 * 60 * 1000));
 
-  var mobile = {type: Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE, id: "1234"};
+  var mobile = {type: Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE, id: "1234"};
 
   NetworkStatsService.updateCachedStats(function (success, message) {
     do_check_eq(success, true);
@@ -173,7 +171,7 @@ add_test(function test_saveStatsWithDifferentDates() {
 add_test(function test_saveStatsWithMaxCachedTraffic() {
   var timestamp = NetworkStatsService.cachedStatsDate.getTime();
   var maxtraffic = NetworkStatsService.maxCachedTraffic;
-  var wifi = {type: Ci.nsINetworkInterface.NETWORK_TYPE_WIFI, id: "0"};
+  var wifi = {type: Ci.nsINetworkInfo.NETWORK_TYPE_WIFI, id: "0"};
 
   NetworkStatsService.updateCachedStats(function (success, message) {
     do_check_eq(success, true);
@@ -199,11 +197,11 @@ add_test(function test_saveAppStats() {
   var cachedStats = NetworkStatsService.cachedStats;
   var timestamp = NetworkStatsService.cachedStatsDate.getTime();
 
-  // Create to fake nsINetworkInterfaces. As nsINetworkInterface can not
+  // Create to fake nsINetworkInfo. As nsINetworkInfo can not
   // be instantiated, these two vars will emulate it by filling the properties
   // that will be used.
-  var wifi = {type: Ci.nsINetworkInterface.NETWORK_TYPE_WIFI, id: "0"};
-  var mobile = {type: Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE, id: "1234"};
+  var wifi = {type: Ci.nsINetworkInfo.NETWORK_TYPE_WIFI, id: "0"};
+  var mobile = {type: Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE, id: "1234"};
 
   // Insert fake mobile network interface in NetworkStatsService
   var mobileNetId = NetworkStatsService.getNetworkId(mobile.id, mobile.type);
@@ -232,9 +230,9 @@ function run_test() {
 
   Cu.import("resource://gre/modules/NetworkStatsService.jsm");
 
-  // Function convertNetworkInterface of NetworkStatsService causes errors when dealing
+  // Function convertNetworkInfo of NetworkStatsService causes errors when dealing
   // with RIL to get the iccid, so overwrite it.
-  mokConvertNetworkInterface();
+  mokConvertNetworkInfo();
 
   run_next_test();
 }
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 5d05aef2e3..a7bd694f23 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -51,6 +51,10 @@
 #include "nsIDOMDesktopNotification.h"
 #endif
 
+#ifndef MOZ_SIMPLEPUSH
+#include "nsIPushNotificationService.h"
+#endif
+
 namespace mozilla {
 namespace dom {
 
@@ -651,6 +655,8 @@ protected:
   {
     AssertIsOnMainThread();
   }
+
+  nsresult AdjustPushQuota(const char* aTopic);
 };
 
 NS_IMPL_ISUPPORTS(NotificationObserver, nsIObserver)
@@ -1172,11 +1178,39 @@ NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
     ContentChild::GetSingleton()->SendOpenNotificationSettings(
       IPC::Principal(mPrincipal));
     return NS_OK;
+  } else if (!strcmp("alertshow", aTopic) ||
+             !strcmp("alertfinished", aTopic)) {
+    Unused << NS_WARN_IF(NS_FAILED(AdjustPushQuota(aTopic)));
   }
 
   return mObserver->Observe(aSubject, aTopic, aData);
 }
 
+nsresult
+NotificationObserver::AdjustPushQuota(const char* aTopic)
+{
+#ifdef MOZ_SIMPLEPUSH
+  return NS_ERROR_NOT_IMPLEMENTED;
+#else
+  nsCOMPtr<nsIPushQuotaManager> pushQuotaManager =
+    do_GetService("@mozilla.org/push/NotificationService;1");
+  if (!pushQuotaManager) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoCString origin;
+  nsresult rv = mPrincipal->GetOrigin(origin);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (!strcmp("alertshow", aTopic)) {
+    return pushQuotaManager->NotificationForOriginShown(origin.get());
+  }
+  return pushQuotaManager->NotificationForOriginClosed(origin.get());
+#endif
+}
+
 NS_IMETHODIMP
 MainThreadNotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
                                         const char16_t* aData)
diff --git a/dom/payment/Payment.jsm b/dom/payment/Payment.jsm
index 6ab9351bf9..be4abd1f36 100644
--- a/dom/payment/Payment.jsm
+++ b/dom/payment/Payment.jsm
@@ -45,7 +45,7 @@ let PaymentManager =  {
       }
     } catch(e) {}
 
-    for each (let msgname in PAYMENT_IPC_MSG_NAMES) {
+    for (let msgname of PAYMENT_IPC_MSG_NAMES) {
       ppmm.addMessageListener(msgname, this);
     }
 
@@ -401,7 +401,7 @@ let PaymentManager =  {
 
   observe: function observe(subject, topic, data) {
     if (topic == "xpcom-shutdown") {
-      for each (let msgname in PAYMENT_IPC_MSG_NAMES) {
+      for (let msgname of PAYMENT_IPC_MSG_NAMES) {
         ppmm.removeMessageListener(msgname, this);
       }
       this.registeredProviders = null;
diff --git a/dom/push/Push.js b/dom/push/Push.js
index f1035bc2ec..dd6e87159e 100644
--- a/dom/push/Push.js
+++ b/dom/push/Push.js
@@ -4,14 +4,6 @@
 
 "use strict";
 
-// Don't modify this, instead set dom.push.debug.
-let gDebuggingEnabled = true;
-
-function debug(s) {
-  if (gDebuggingEnabled)
-    dump("-*- Push.js: " + s + "\n");
-}
-
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
@@ -21,6 +13,14 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "Push",
+  });
+});
+
 const PUSH_CID = Components.ID("{cde1d019-fad8-4044-b141-65fb4fb7a245}");
 
 /**
@@ -29,7 +29,7 @@ const PUSH_CID = Components.ID("{cde1d019-fad8-4044-b141-65fb4fb7a245}");
  * one actually performing all operations.
  */
 function Push() {
-  debug("Push Constructor");
+  console.debug("Push()");
 }
 
 Push.prototype = {
@@ -44,11 +44,7 @@ Push.prototype = {
                                           Ci.nsIObserver]),
 
   init: function(aWindow) {
-    // Set debug first so that all debugging actually works.
-    // NOTE: We don't add an observer here like in PushService. Flipping the
-    // pref will require a reload of the app/page, which seems acceptable.
-    gDebuggingEnabled = Services.prefs.getBoolPref("dom.push.debug");
-    debug("init()");
+    console.debug("init()");
 
     this._window = aWindow;
 
@@ -60,127 +56,69 @@ Push.prototype = {
   },
 
   setScope: function(scope){
-    debug('setScope ' + scope);
+    console.debug("setScope()", scope);
     this._scope = scope;
   },
 
   askPermission: function (aAllowCallback, aCancelCallback) {
-    debug("askPermission");
+    console.debug("askPermission()");
 
-    let principal = this._window.document.nodePrincipal;
-    let type = "push";
-    let permValue =
-      Services.perms.testExactPermissionFromPrincipal(principal, type);
+    return this.createPromise((resolve, reject) => {
+      let permissionDenied = () => {
+        reject(new this._window.DOMException(
+          "User denied permission to use the Push API",
+          "PermissionDeniedError"
+        ));
+      };
 
-    if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
-        aAllowCallback();
-      return;
-    }
+      let permission = Ci.nsIPermissionManager.UNKNOWN_ACTION;
+      try {
+        permission = this._testPermission();
+      } catch (e) {
+        permissionDenied();
+        return;
+      }
 
-    if (permValue == Ci.nsIPermissionManager.DENY_ACTION) {
-      aCancelCallback();
-      return;
-    }
-
-    // Create an array with a single nsIContentPermissionType element.
-    type = {
-      type: "push",
-      access: null,
-      options: [],
-      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
-    };
-    let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
-    typeArray.appendElement(type, false);
-
-    // create a nsIContentPermissionRequest
-    let request = {
-      types: typeArray,
-      principal: principal,
-      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
-      allow: function() {
-        aAllowCallback();
-      },
-      cancel: function() {
-        aCancelCallback();
-      },
-      window: this._window
-    };
-
-    // Using askPermission from nsIDOMWindowUtils that takes care of the
-    // remoting if needed.
-    let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIDOMWindowUtils);
-    windowUtils.askPermission(request);
-  },
-
-  getEndpointResponse: function(fn) {
-    debug("GetEndpointResponse " + fn.toSource());
-    let that = this;
-    let p = this.createPromise(function(resolve, reject) {
-      this.askPermission(
-        () => {
-          fn(that._scope, that._principal, {
-            QueryInterface: XPCOMUtils.generateQI([Ci.nsIPushEndpointCallback]),
-            onPushEndpoint: function(ok, endpoint, keyLen, key) {
-              if (ok === Cr.NS_OK) {
-                if (endpoint) {
-                  let sub;
-                  if (keyLen) {
-                    let publicKey = new ArrayBuffer(keyLen);
-                    let keyView = new Uint8Array(publicKey);
-                    keyView.set(key);
-                    sub = new that._window.PushSubscription(endpoint,
-                                                            that._scope,
-                                                            publicKey);
-                  } else {
-                    sub = new that._window.PushSubscription(endpoint,
-                                                            that._scope,
-                                                            null);
-                  }
-                  sub.setPrincipal(that._principal);
-                  resolve(sub);
-                } else {
-                  resolve(null);
-                }
-              } else {
-                reject("AbortError");
-              }
-            }
-          });
-        },
-
-        () => {
-          reject("PermissionDeniedError");
-        }
-      );
-    }.bind(this));
-    return p;
+      if (permission == Ci.nsIPermissionManager.ALLOW_ACTION) {
+        resolve();
+      } else if (permission == Ci.nsIPermissionManager.DENY_ACTION) {
+        permissionDenied();
+      } else {
+        this._requestPermission(resolve, permissionDenied);
+      }
+    });
   },
 
   subscribe: function() {
-    debug("subscribe()");
+    console.debug("subscribe()", this._scope);
+
     let histogram = Services.telemetry.getHistogramById("PUSH_API_USED");
     histogram.add(true);
-    return this.getEndpointResponse(this._client.subscribe.bind(this._client));
+    return this.askPermission().then(() =>
+      this.createPromise((resolve, reject) => {
+        let callback = new PushEndpointCallback(this, resolve, reject);
+        this._client.subscribe(this._scope, this._principal, callback);
+      })
+    );
   },
 
   getSubscription: function() {
-    debug("getSubscription()" + this._scope);
-    return this.getEndpointResponse(this._client.getSubscription.bind(this._client));
+    console.debug("getSubscription()", this._scope);
+
+    return this.createPromise((resolve, reject) => {
+      let callback = new PushEndpointCallback(this, resolve, reject);
+      this._client.getSubscription(this._scope, this._principal, callback);
+    });
   },
 
   permissionState: function() {
-    debug("permissionState()" + this._scope);
+    console.debug("permissionState()", this._scope);
 
-    let p = this.createPromise((resolve, reject) => {
-      let permission = Ci.nsIPermissionManager.DENY_ACTION;
+    return this.createPromise((resolve, reject) => {
+      let permission = Ci.nsIPermissionManager.UNKNOWN_ACTION;
 
       try {
-        let permissionManager = Cc["@mozilla.org/permissionmanager;1"]
-                                .getService(Ci.nsIPermissionManager);
-        permission =
-          permissionManager.testExactPermissionFromPrincipal(this._principal,
-                                                             "push");
+        permission = this._testPermission();
       } catch(e) {
         reject();
         return;
@@ -194,8 +132,82 @@ Push.prototype = {
       }
       resolve(pushPermissionStatus);
     });
-    return p;
   },
+
+  _testPermission: function() {
+    return Services.perms.testExactPermissionFromPrincipal(
+      this._principal, "desktop-notification");
+  },
+
+  _requestPermission: function(allowCallback, cancelCallback) {
+    // Create an array with a single nsIContentPermissionType element.
+    type = {
+      type: "push",
+      access: null,
+      options: [],
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType]),
+    };
+    let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
+    typeArray.appendElement(type, false);
+
+    // create a nsIContentPermissionRequest
+    let request = {
+      types: typeArray,
+      principal: principal,
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
+      allow: function() {
+        allowCallback();
+      },
+      cancel: function() {
+        cancelCallback();
+      },
+      window: this._window,
+    };
+
+    // Using askPermission from nsIDOMWindowUtils that takes care of the
+    // remoting if needed.
+    let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIDOMWindowUtils);
+    windowUtils.askPermission(request);
+  },
+};
+
+function PushEndpointCallback(pushManager, resolve, reject) {
+  this.pushManager = pushManager;
+  this.resolve = resolve;
+  this.reject = reject;
 }
 
+PushEndpointCallback.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPushEndpointCallback]),
+  onPushEndpoint: function(ok, endpoint, keyLen, key) {
+    let {pushManager} = this;
+    if (!Components.isSuccessCode(ok)) {
+      this.reject(new pushManager._window.DOMException(
+        "Error retrieving push subscription",
+        "AbortError"
+      ));
+      return;
+    }
+ 
+    if (!endpoint) {
+      this.resolve(null);
+      return;
+    }
+
+    let publicKey = null;
+    if (keyLen) {
+      publicKey = new ArrayBuffer(keyLen);
+      let keyView = new Uint8Array(publicKey);
+      keyView.set(key);
+    }
+
+    let sub = new pushManager._window.PushSubscription(endpoint,
+                                                       pushManager._scope,
+                                                       publicKey);
+    sub.setPrincipal(pushManager._principal);
+    this.resolve(sub);
+  },
+};
+
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Push]);
diff --git a/dom/push/PushClient.js b/dom/push/PushClient.js
index c538856539..3727042136 100644
--- a/dom/push/PushClient.js
+++ b/dom/push/PushClient.js
@@ -4,14 +4,6 @@
 
 "use strict";
 
-// Don't modify this, instead set dom.push.debug.
-let gDebuggingEnabled = true;
-
-function debug(s) {
-  if (gDebuggingEnabled)
-    dump("-*- PushClient.js: " + s + "\n");
-}
-
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
@@ -20,6 +12,14 @@ const Cr = Components.results;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "PushClient",
+  });
+});
+
 const kMessages = [
   "PushService:Register:OK",
   "PushService:Register:KO",
@@ -30,7 +30,7 @@ const kMessages = [
 ];
 
 this.PushClient = function PushClient() {
-  debug("PushClient created!");
+  console.debug("PushClient()");
   this._cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
                  .getService(Ci.nsISyncMessageSender);
   this._requests = {};
@@ -71,7 +71,7 @@ PushClient.prototype = {
   },
 
   subscribe: function(scope, principal, callback) {
-    debug("subscribe() " + scope);
+    console.debug("subscribe()", scope);
     let requestId = this.addRequest(callback);
     this._cpmm.sendAsyncMessage("Push:Register", {
                                 scope: scope,
@@ -80,7 +80,7 @@ PushClient.prototype = {
   },
 
   unsubscribe: function(scope, principal, callback) {
-    debug("unsubscribe() " + scope);
+    console.debug("unsubscribe()", scope);
     let requestId = this.addRequest(callback);
     this._cpmm.sendAsyncMessage("Push:Unregister", {
                                 scope: scope,
@@ -89,9 +89,10 @@ PushClient.prototype = {
   },
 
   getSubscription: function(scope, principal, callback) {
-    debug("getSubscription()" + scope);
+    console.debug("getSubscription()", scope);
     let requestId = this.addRequest(callback);
-    debug("Going to send  " + scope + " " + principal + " " + requestId);
+    console.debug("getSubscription: Going to send", scope, principal,
+      requestId);
     this._cpmm.sendAsyncMessage("Push:Registration", {
                                 scope: scope,
                                 requestID: requestId,
@@ -99,6 +100,10 @@ PushClient.prototype = {
   },
 
   _deliverPushEndpoint: function(request, registration) {
+    if (!registration) {
+      request.onPushEndpoint(Cr.NS_OK, "", 0, null);
+      return;
+    }
     if (registration.p256dhKey) {
       let key = new Uint8Array(registration.p256dhKey);
       request.onPushEndpoint(Cr.NS_OK,
@@ -112,38 +117,31 @@ PushClient.prototype = {
   },
 
   receiveMessage: function(aMessage) {
+    console.debug("receiveMessage()", aMessage);
 
     let json = aMessage.data;
     let request = this.takeRequest(json.requestID);
 
     if (!request) {
+      console.error("receiveMessage: Unknown request ID", json.requestID);
       return;
     }
 
-    debug("receiveMessage(): " + JSON.stringify(aMessage))
     switch (aMessage.name) {
       case "PushService:Register:OK":
-        this._deliverPushEndpoint(request, json);
-        break;
-      case "PushService:Register:KO":
-        request.onPushEndpoint(Cr.NS_ERROR_FAILURE, "", 0, null);
-        break;
       case "PushService:Registration:OK":
-      {
-        let endpoint = "";
-        if (!json.registration) {
-          request.onPushEndpoint(Cr.NS_OK, "", 0, null);
-        } else {
-          this._deliverPushEndpoint(request, json.registration);
-        }
+        this._deliverPushEndpoint(request, json.result);
         break;
-      }
+
+      case "PushService:Register:KO":
       case "PushService:Registration:KO":
         request.onPushEndpoint(Cr.NS_ERROR_FAILURE, "", 0, null);
         break;
+
       case "PushService:Unregister:OK":
         if (typeof json.result !== "boolean") {
-          debug("Expected boolean result from PushService!");
+          console.error("receiveMessage: Expected boolean for unregister response",
+            json.result);
           request.onUnsubscribe(Cr.NS_ERROR_FAILURE, false);
           return;
         }
@@ -154,7 +152,7 @@ PushClient.prototype = {
         request.onUnsubscribe(Cr.NS_ERROR_FAILURE, false);
         break;
       default:
-        debug("NOT IMPLEMENTED! receiveMessage for " + aMessage.name);
+        console.error("receiveMessage: NOT IMPLEMENTED!", aMessage.name);
     }
   },
 };
diff --git a/dom/push/PushDB.jsm b/dom/push/PushDB.jsm
index 60a4f33621..a5dae69222 100644
--- a/dom/push/PushDB.jsm
+++ b/dom/push/PushDB.jsm
@@ -5,26 +5,24 @@
 
 "use strict";
 
-// Don't modify this, instead set dom.push.debug.
-let gDebuggingEnabled = false;
-
-function debug(s) {
-  if (gDebuggingEnabled) {
-    dump("-*- PushDB.jsm: " + s + "\n");
-  }
-}
-
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.importGlobalProperties(["indexedDB"]);
 
-const prefs = new Preferences("dom.push.");
-
 this.EXPORTED_SYMBOLS = ["PushDB"];
 
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "PushDB",
+  });
+});
+
 this.PushDB = function PushDB(dbName, dbVersion, dbStoreName, keyPath, model) {
-  debug("PushDB()");
+  console.debug("PushDB()");
   this._dbStoreName = dbStoreName;
   this._keyPath = keyPath;
   this._model = model;
@@ -32,8 +30,6 @@ this.PushDB = function PushDB(dbName, dbVersion, dbStoreName, keyPath, model) {
   // set the indexeddb database
   this.initDBHelper(dbName, dbVersion,
                     [dbStoreName]);
-  gDebuggingEnabled = prefs.get("debug");
-  prefs.observe("debug", this);
 };
 
 this.PushDB.prototype = {
@@ -90,7 +86,7 @@ this.PushDB.prototype = {
    */
 
   put: function(aRecord) {
-    debug("put()" + JSON.stringify(aRecord));
+    console.debug("put()", aRecord);
     if (!this.isValidRecord(aRecord)) {
       return Promise.reject(new TypeError(
         "Scope, originAttributes, and quota are required! " +
@@ -107,8 +103,8 @@ this.PushDB.prototype = {
           aTxn.result = undefined;
 
           aStore.put(aRecord).onsuccess = aEvent => {
-            debug("Request successful. Updated record ID: " +
-                  aEvent.target.result);
+            console.debug("put: Request successful. Updated record",
+              aEvent.target.result);
             aTxn.result = this.toPushRecord(aRecord);
           };
         },
@@ -123,30 +119,18 @@ this.PushDB.prototype = {
    *        The ID of record to be deleted.
    */
   delete: function(aKeyID) {
-    debug("delete()");
+    console.debug("delete()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
         "readwrite",
         this._dbStoreName,
         function txnCb(aTxn, aStore) {
-          debug("Going to delete " + aKeyID);
-          aStore.delete(aKeyID);
-        },
-        resolve,
-        reject
-      )
-    );
-  },
-
-  clearAll: function clear() {
-    return new Promise((resolve, reject) =>
-      this.newTxn(
-        "readwrite",
-        this._dbStoreName,
-        function (aTxn, aStore) {
-          debug("Going to clear all!");
-          aStore.clear();
+          console.debug("delete: Removing record", aKeyID);
+          aStore.get(aKeyID).onsuccess = event => {
+            aTxn.result = event.target.result;
+            aStore.delete(aKeyID);
+          };
         },
         resolve,
         reject
@@ -157,7 +141,7 @@ this.PushDB.prototype = {
   // testFn(record) is called with a database record and should return true if
   // that record should be deleted.
   clearIf: function(testFn) {
-    debug("clearIf()");
+    console.debug("clearIf()");
     return new Promise((resolve, reject) =>
       this.newTxn(
         "readwrite",
@@ -168,10 +152,12 @@ this.PushDB.prototype = {
           aStore.openCursor().onsuccess = event => {
             let cursor = event.target.result;
             if (cursor) {
-              if (testFn(this.toPushRecord(cursor.value))) {
+              let record = this.toPushRecord(cursor.value);
+              if (testFn(record)) {
                 let deleteRequest = cursor.delete();
                 deleteRequest.onerror = e => {
-                  debug("Failed to delete entry even when test succeeded!");
+                  console.error("clearIf: Error removing record",
+                    record.keyID, e);
                 }
               }
               cursor.continue();
@@ -185,7 +171,7 @@ this.PushDB.prototype = {
   },
 
   getByPushEndpoint: function(aPushEndpoint) {
-    debug("getByPushEndpoint()");
+    console.debug("getByPushEndpoint()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
@@ -196,8 +182,9 @@ this.PushDB.prototype = {
 
           let index = aStore.index("pushEndpoint");
           index.get(aPushEndpoint).onsuccess = aEvent => {
-            aTxn.result = this.toPushRecord(aEvent.target.result);
-            debug("Fetch successful " + aEvent.target.result);
+            let record = this.toPushRecord(aEvent.target.result);
+            console.debug("getByPushEndpoint: Got record", record);
+            aTxn.result = record;
           };
         },
         resolve,
@@ -207,7 +194,7 @@ this.PushDB.prototype = {
   },
 
   getByKeyID: function(aKeyID) {
-    debug("getByKeyID()");
+    console.debug("getByKeyID()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
@@ -217,8 +204,52 @@ this.PushDB.prototype = {
           aTxn.result = undefined;
 
           aStore.get(aKeyID).onsuccess = aEvent => {
-            aTxn.result = this.toPushRecord(aEvent.target.result);
-            debug("Fetch successful " + aEvent.target.result);
+            let record = this.toPushRecord(aEvent.target.result);
+            console.debug("getByKeyID: Got record", record);
+            aTxn.result = record;
+          };
+        },
+        resolve,
+        reject
+      )
+    );
+  },
+
+  /**
+   * Reduces all records associated with an origin to a single value.
+   *
+   * @param {String} origin The origin, matched as a prefix against the scope.
+   * @param {String} originAttributes Additional origin attributes. Requires
+   *  an exact match.
+   * @param {Function} callback A function with the signature `(result,
+   *  record, cursor)`, where `result` is the value returned by the previous
+   *  invocation, `record` is the registration, and `cursor` is an `IDBCursor`.
+   * @param {Object} [initialValue] The value to use for the first invocation.
+   * @returns {Promise} Resolves with the value of the last invocation.
+   */
+  reduceByOrigin: function(origin, originAttributes, callback, initialValue) {
+    console.debug("forEachOrigin()");
+
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readwrite",
+        this._dbStoreName,
+        (aTxn, aStore) => {
+          aTxn.result = initialValue;
+
+          let index = aStore.index("identifiers");
+          let range = IDBKeyRange.bound(
+            [origin, originAttributes],
+            [origin + "\x7f", originAttributes]
+          );
+          index.openCursor(range).onsuccess = event => {
+            let cursor = event.target.result;
+            if (!cursor) {
+              return;
+            }
+            let record = this.toPushRecord(cursor.value);
+            aTxn.result = callback(aTxn.result, record, cursor);
+            cursor.continue();
           };
         },
         resolve,
@@ -229,12 +260,11 @@ this.PushDB.prototype = {
 
   // Perform a unique match against { scope, originAttributes }
   getByIdentifiers: function(aPageRecord) {
-    debug("getByIdentifiers() { " + aPageRecord.scope + ", " +
-          JSON.stringify(aPageRecord.originAttributes) + " }");
+    console.debug("getByIdentifiers()", aPageRecord);
     if (!aPageRecord.scope || aPageRecord.originAttributes == undefined) {
-      return Promise.reject(
-               new TypeError("Scope and originAttributes are required! " +
-                             JSON.stringify(aPageRecord)));
+      console.error("getByIdentifiers: Scope and originAttributes are required",
+        aPageRecord);
+      return Promise.reject(new TypeError("Invalid page record"));
     }
 
     return new Promise((resolve, reject) =>
@@ -289,7 +319,7 @@ this.PushDB.prototype = {
   },
 
   getAllKeyIDs: function() {
-    debug("getAllKeyIDs()");
+    console.debug("getAllKeyIDs()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
@@ -309,7 +339,7 @@ this.PushDB.prototype = {
   },
 
   _getAllByPushQuota: function(range) {
-    debug("getAllByPushQuota()");
+    console.debug("getAllByPushQuota()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
@@ -334,12 +364,12 @@ this.PushDB.prototype = {
   },
 
   getAllUnexpired: function() {
-    debug("getAllUnexpired()");
+    console.debug("getAllUnexpired()");
     return this._getAllByPushQuota(IDBKeyRange.lowerBound(1));
   },
 
   getAllExpired: function() {
-    debug("getAllExpired()");
+    console.debug("getAllExpired()");
     return this._getAllByPushQuota(IDBKeyRange.only(0));
   },
 
@@ -365,16 +395,17 @@ this.PushDB.prototype = {
 
             let record = aEvent.target.result;
             if (!record) {
-              debug("update: Key ID " + aKeyID + " does not exist");
+              console.error("update: Record does not exist", aKeyID);
               return;
             }
             let newRecord = aUpdateFunc(this.toPushRecord(record));
             if (!this.isValidRecord(newRecord)) {
-              debug("update: Ignoring invalid update for key ID " + aKeyID);
+              console.error("update: Ignoring invalid update",
+                aKeyID, newRecord);
               return;
             }
             aStore.put(newRecord).onsuccess = aEvent => {
-              debug("update: Update successful for key ID " + aKeyID);
+              console.debug("update: Update successful", aKeyID, newRecord);
               aTxn.result = newRecord;
             };
           };
@@ -386,7 +417,7 @@ this.PushDB.prototype = {
   },
 
   drop: function() {
-    debug("drop()");
+    console.debug("drop()");
 
     return new Promise((resolve, reject) =>
       this.newTxn(
@@ -400,9 +431,4 @@ this.PushDB.prototype = {
       )
     );
   },
-
-  observe: function observe(aSubject, aTopic, aData) {
-    if ((aTopic == "nsPref:changed") && (aData == "dom.push.debug"))
-      gDebuggingEnabled = prefs.get("debug");
-  }
 };
diff --git a/dom/push/PushManager.cpp b/dom/push/PushManager.cpp
index bbfc9c386c..5a4044b0cd 100644
--- a/dom/push/PushManager.cpp
+++ b/dom/push/PushManager.cpp
@@ -33,6 +33,39 @@ namespace dom {
 
 using namespace workers;
 
+namespace {
+
+nsresult
+GetPermissionState(nsIPrincipal* aPrincipal,
+                            PushPermissionState& aState)
+{
+  nsCOMPtr<nsIPermissionManager> permManager =
+    mozilla::services::GetPermissionManager();
+
+  if (!permManager) {
+    return NS_ERROR_FAILURE;
+  }
+  uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
+  nsresult rv = permManager->TestExactPermissionFromPrincipal(
+                  aPrincipal,
+                  "desktop-notification",
+                  &permission);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  if (permission == nsIPermissionManager::ALLOW_ACTION) {
+    aState = PushPermissionState::Granted;
+  } else if (permission == nsIPermissionManager::DENY_ACTION) {
+    aState = PushPermissionState::Denied;
+  } else {
+    aState = PushPermissionState::Prompt;
+  }
+  return NS_OK;
+}
+
+} // anonymous namespace
+
 class UnsubscribeResultCallback final : public nsIUnsubscribeResultCallback
 {
 public:
@@ -393,12 +426,13 @@ public:
       do_CreateInstance("@mozilla.org/push/PushClient;1");
     if (!client) {
       callback->OnUnsubscribe(NS_ERROR_FAILURE, false);
+      return NS_OK;
     }
 
     nsCOMPtr<nsIPrincipal> principal = mProxy->GetWorkerPrivate()->GetPrincipal();
     if (NS_WARN_IF(NS_FAILED(client->Unsubscribe(mScope, principal, callback)))) {
       callback->OnUnsubscribe(NS_ERROR_FAILURE, false);
-      return NS_ERROR_FAILURE;
+      return NS_OK;
     }
     return NS_OK;
   }
@@ -488,7 +522,7 @@ public:
         promise->MaybeResolve(sub);
       }
     } else {
-      promise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
+      promise->MaybeReject(NS_ERROR_DOM_PUSH_ABORT_ERR);
     }
 
     mProxy->CleanUp(aCx);
@@ -580,22 +614,20 @@ public:
 
     RefPtr<GetSubscriptionCallback> callback = new GetSubscriptionCallback(mProxy, mScope);
 
-    nsCOMPtr<nsIPermissionManager> permManager =
-      mozilla::services::GetPermissionManager();
-    if (!permManager) {
+    nsCOMPtr<nsIPrincipal> principal = mProxy->GetWorkerPrivate()->GetPrincipal();
+
+    PushPermissionState state;
+    nsresult rv = GetPermissionState(principal, state);
+    if (NS_FAILED(rv)) {
       callback->OnPushEndpoint(NS_ERROR_FAILURE, EmptyString(), 0, nullptr);
       return NS_OK;
     }
 
-    nsCOMPtr<nsIPrincipal> principal = mProxy->GetWorkerPrivate()->GetPrincipal();
-
-    uint32_t permission = nsIPermissionManager::DENY_ACTION;
-    nsresult rv = permManager->TestExactPermissionFromPrincipal(
-                    principal,
-                    "push",
-                    &permission);
-
-    if (NS_WARN_IF(NS_FAILED(rv)) || permission != nsIPermissionManager::ALLOW_ACTION) {
+    if (state != PushPermissionState::Granted) {
+      if (mAction == WorkerPushManager::GetSubscriptionAction) {
+        callback->OnPushEndpoint(NS_OK, EmptyString(), 0, nullptr);
+        return NS_OK;
+      }
       callback->OnPushEndpoint(NS_ERROR_FAILURE, EmptyString(), 0, nullptr);
       return NS_OK;
     }
@@ -616,7 +648,7 @@ public:
 
     if (NS_WARN_IF(NS_FAILED(rv))) {
       callback->OnPushEndpoint(NS_ERROR_FAILURE, EmptyString(), 0, nullptr);
-      return rv;
+      return NS_OK;
     }
 
     return NS_OK;
@@ -646,7 +678,7 @@ WorkerPushManager::PerformSubscriptionAction(SubscriptionAction aAction, ErrorRe
 
   RefPtr<PromiseWorkerProxy> proxy = PromiseWorkerProxy::Create(worker, p);
   if (!proxy) {
-    p->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
+    p->MaybeReject(NS_ERROR_DOM_PUSH_ABORT_ERR);
     return p.forget();
   }
 
@@ -728,35 +760,11 @@ public:
       return NS_OK;
     }
 
-    nsCOMPtr<nsIPermissionManager> permManager =
-      mozilla::services::GetPermissionManager();
-
-    nsresult rv = NS_ERROR_FAILURE;
-    PushPermissionState state = PushPermissionState::Denied;
-
-    if (permManager) {
-      uint32_t permission = nsIPermissionManager::DENY_ACTION;
-      rv = permManager->TestExactPermissionFromPrincipal(
-             mProxy->GetWorkerPrivate()->GetPrincipal(),
-             "push",
-             &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!");
-        }
-      }
-    }
+    PushPermissionState state;
+    nsresult rv = GetPermissionState(
+      mProxy->GetWorkerPrivate()->GetPrincipal(),
+      state
+    );
 
     AutoJSAPI jsapi;
     jsapi.Init();
diff --git a/dom/push/PushNotificationService.js b/dom/push/PushNotificationService.js
index 9ecc8f671d..4b827eccf7 100644
--- a/dom/push/PushNotificationService.js
+++ b/dom/push/PushNotificationService.js
@@ -36,10 +36,11 @@ PushNotificationService.prototype = {
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(PushNotificationService),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
                                          Ci.nsISupportsWeakReference,
-                                         Ci.nsIPushNotificationService]),
+                                         Ci.nsIPushNotificationService,
+                                         Ci.nsIPushQuotaManager,]),
 
   register: function register(scope, originAttributes) {
-    return PushService._register({
+    return PushService.register({
       scope: scope,
       originAttributes: originAttributes,
       maxQuota: Infinity,
@@ -47,11 +48,11 @@ PushNotificationService.prototype = {
   },
 
   unregister: function unregister(scope, originAttributes) {
-    return PushService._unregister({scope, originAttributes});
+    return PushService.unregister({scope, originAttributes});
   },
 
   registration: function registration(scope, originAttributes) {
-    return PushService._registration({scope, originAttributes});
+    return PushService.registration({scope, originAttributes});
   },
 
   clearAll: function clearAll() {
@@ -74,6 +75,26 @@ PushNotificationService.prototype = {
         }
         break;
     }
+  },
+
+  // nsIPushQuotaManager methods
+
+  notificationForOriginShown: function(origin) {
+    if (!isParent) {
+      Services.cpmm.sendAsyncMessage("Push:NotificationForOriginShown", origin);
+      return;
+    }
+
+    PushService._notificationForOriginShown(origin);
+  },
+
+  notificationForOriginClosed: function(origin) {
+    if (!isParent) {
+      Services.cpmm.sendAsyncMessage("Push:NotificationForOriginClosed", origin);
+      return;
+    }
+
+    PushService._notificationForOriginClosed(origin);
   }
 };
 
diff --git a/dom/push/PushRecord.jsm b/dom/push/PushRecord.jsm
index d32d90a2ad..07b0f8ac58 100644
--- a/dom/push/PushRecord.jsm
+++ b/dom/push/PushRecord.jsm
@@ -9,10 +9,14 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
+Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "Messaging",
+                                  "resource://gre/modules/Messaging.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
                                   "resource://gre/modules/PlacesUtils.jsm");
 
@@ -26,18 +30,6 @@ this.EXPORTED_SYMBOLS = ["PushRecord"];
 
 const prefs = new Preferences("dom.push.");
 
-// History transition types that can fire a `pushsubscriptionchange` event
-// when the user visits a site with expired push registrations. Visits only
-// count if the user sees the origin in the address bar. This excludes embedded
-// resources, downloads, and framed links.
-const QUOTA_REFRESH_TRANSITIONS_SQL = [
-  Ci.nsINavHistoryService.TRANSITION_LINK,
-  Ci.nsINavHistoryService.TRANSITION_TYPED,
-  Ci.nsINavHistoryService.TRANSITION_BOOKMARK,
-  Ci.nsINavHistoryService.TRANSITION_REDIRECT_PERMANENT,
-  Ci.nsINavHistoryService.TRANSITION_REDIRECT_TEMPORARY
-].join(",");
-
 function PushRecord(props) {
   this.pushEndpoint = props.pushEndpoint;
   this.scope = props.scope;
@@ -52,8 +44,15 @@ function PushRecord(props) {
 
 PushRecord.prototype = {
   setQuota(suggestedQuota) {
-    this.quota = (!isNaN(suggestedQuota) && suggestedQuota >= 0) ?
-                 suggestedQuota : prefs.get("maxQuotaPerSubscription");
+    if (!isNaN(suggestedQuota) && suggestedQuota >= 0) {
+      this.quota = suggestedQuota;
+    } else {
+      this.resetQuota();
+    }
+  },
+
+  resetQuota() {
+    this.quota = prefs.get("maxQuotaPerSubscription");
   },
 
   updateQuota(lastVisit) {
@@ -68,25 +67,15 @@ PushRecord.prototype = {
       this.quota = 0;
       return;
     }
-    let currentQuota;
     if (lastVisit > this.lastPush) {
       // If the user visited the site since the last time we received a
       // notification, reset the quota.
       let daysElapsed = (Date.now() - lastVisit) / 24 / 60 / 60 / 1000;
-      currentQuota = Math.min(
+      this.quota = Math.min(
         Math.round(8 * Math.pow(daysElapsed, -0.8)),
         prefs.get("maxQuotaPerSubscription")
       );
-      Services.telemetry.getHistogramById("PUSH_API_QUOTA_RESET_TO").add(currentQuota - 1);
-    } else {
-      // The user hasn't visited the site since the last notification.
-      currentQuota = this.quota;
-    }
-    this.quota = Math.max(currentQuota - 1, 0);
-    // We check for ctime > 0 to skip older records that did not have ctime.
-    if (this.isExpired() && this.ctime > 0) {
-      let duration = Date.now() - this.ctime;
-      Services.telemetry.getHistogramById("PUSH_API_QUOTA_EXPIRATION_TIME").add(duration / 1000);
+      Services.telemetry.getHistogramById("PUSH_API_QUOTA_RESET_TO").add(this.quota);
     }
   },
 
@@ -96,6 +85,15 @@ PushRecord.prototype = {
     this.lastPush = Date.now();
   },
 
+  reduceQuota() {
+    this.quota = Math.max(this.quota - 1, 0);
+    // We check for ctime > 0 to skip older records that did not have ctime.
+    if (this.isExpired() && this.ctime > 0) {
+      let duration = Date.now() - this.ctime;
+      Services.telemetry.getHistogramById("PUSH_API_QUOTA_EXPIRATION_TIME").add(duration / 1000);
+    }
+  },
+
   /**
    * Queries the Places database for the last time a user visited the site
    * associated with a push registration.
@@ -107,9 +105,34 @@ PushRecord.prototype = {
   getLastVisit() {
     if (!this.quotaApplies() || this.isTabOpen()) {
       // If the registration isn't subject to quota, or the user already
-      // has the site open, skip the Places query.
+      // has the site open, skip expensive database queries.
       return Promise.resolve(Date.now());
     }
+
+    if (AppConstants.MOZ_ANDROID_HISTORY) {
+      return Messaging.sendRequestForResult({
+        type: "History:GetPrePathLastVisitedTimeMilliseconds",
+        prePath: this.uri.prePath,
+      }).then(result => {
+        if (result == 0) {
+          return -Infinity;
+        }
+        return result;
+      });
+    }
+
+    // Places History transition types that can fire a
+    // `pushsubscriptionchange` event when the user visits a site with expired push
+    // registrations. Visits only count if the user sees the origin in the address
+    // bar. This excludes embedded resources, downloads, and framed links.
+    const QUOTA_REFRESH_TRANSITIONS_SQL = [
+      Ci.nsINavHistoryService.TRANSITION_LINK,
+      Ci.nsINavHistoryService.TRANSITION_TYPED,
+      Ci.nsINavHistoryService.TRANSITION_BOOKMARK,
+      Ci.nsINavHistoryService.TRANSITION_REDIRECT_PERMANENT,
+      Ci.nsINavHistoryService.TRANSITION_REDIRECT_TEMPORARY
+    ].join(",");
+
     return PlacesUtils.withConnectionWrapper("PushRecord.getLastVisit", db => {
       // We're using a custom query instead of `nsINavHistoryQueryOptions`
       // because the latter doesn't expose a way to filter by transition type:
@@ -180,6 +203,14 @@ PushRecord.prototype = {
     return permission == Ci.nsIPermissionManager.ALLOW_ACTION;
   },
 
+  quotaChanged() {
+    if (!this.hasPermission()) {
+      return Promise.resolve(false);
+    }
+    return this.getLastVisit()
+      .then(lastVisit => lastVisit > this.lastPush);
+  },
+
   quotaApplies() {
     return Number.isFinite(this.quota);
   },
@@ -188,7 +219,12 @@ PushRecord.prototype = {
     return this.quota === 0;
   },
 
-  toRegistration() {
+  matchesOriginAttributes(pattern) {
+    return ChromeUtils.originAttributesMatchPattern(
+      this.principal.originAttributes, pattern);
+  },
+
+  toSubscription() {
     return {
       pushEndpoint: this.pushEndpoint,
       lastPush: this.lastPush,
@@ -196,13 +232,6 @@ PushRecord.prototype = {
       p256dhKey: this.p256dhPublicKey,
     };
   },
-
-  toRegister() {
-    return {
-      pushEndpoint: this.pushEndpoint,
-      p256dhKey: this.p256dhPublicKey,
-    };
-  },
 };
 
 // Define lazy getters for the principal and scope URI. IndexedDB can't store
diff --git a/dom/push/PushService.jsm b/dom/push/PushService.jsm
index 186db4fffc..d6e2f7e4e2 100644
--- a/dom/push/PushService.jsm
+++ b/dom/push/PushService.jsm
@@ -5,15 +5,6 @@
 
 "use strict";
 
-// Don't modify this, instead set dom.push.debug.
-var gDebuggingEnabled = false;
-
-function debug(s) {
-  if (gDebuggingEnabled) {
-    dump("-*- PushService.jsm: " + s + "\n");
-  }
-}
-
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
@@ -36,14 +27,26 @@ const CONNECTION_PROTOCOLS = [PushServiceWebSocket, PushServiceHttp2];
 XPCOMUtils.defineLazyModuleGetter(this, "AlarmService",
                                   "resource://gre/modules/AlarmService.jsm");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gContentSecurityManager",
+                                   "@mozilla.org/contentsecuritymanager;1",
+                                   "nsIContentSecurityManager");
+
 this.EXPORTED_SYMBOLS = ["PushService"];
 
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "PushService",
+  });
+});
+
 const prefs = new Preferences("dom.push.");
-// Set debug first so that all debugging actually works.
-gDebuggingEnabled = prefs.get("debug");
 
 const kCHILD_PROCESS_MESSAGES = ["Push:Register", "Push:Unregister",
                                  "Push:Registration", "Push:RegisterEventNotificationListener",
+                                 "Push:NotificationForOriginShown",
+                                 "Push:NotificationForOriginClosed",
                                  "child-process-shutdown"];
 
 const PUSH_SERVICE_UNINIT = 0;
@@ -96,18 +99,23 @@ this.PushService = {
   _db: null,
   _options: null,
   _alarmID: null,
+  _visibleNotifications: new Map(),
+
+  // Callback that is called after attempting to
+  // reduce the quota for a record. Used for testing purposes.
+  _updateQuotaTestCallback: null,
 
   _childListeners: [],
 
   // When serverURI changes (this is used for testing), db is cleaned up and a
   // a new db is started. This events must be sequential.
-  _serverURIProcessQueue: null,
-  _serverURIProcessEnqueue: function(op) {
-    if (!this._serverURIProcessQueue) {
-      this._serverURIProcessQueue = Promise.resolve();
+  _stateChangeProcessQueue: null,
+  _stateChangeProcessEnqueue: function(op) {
+    if (!this._stateChangeProcessQueue) {
+      this._stateChangeProcessQueue = Promise.resolve();
     }
 
-    this._serverURIProcessQueue = this._serverURIProcessQueue
+    this._stateChangeProcessQueue = this._stateChangeProcessQueue
                                     .then(op)
                                     .catch(_ => {});
   },
@@ -120,7 +128,7 @@ this.PushService = {
   _activated: null,
   _checkActivated: function() {
     if (this._state < PUSH_SERVICE_ACTIVATING) {
-      return Promise.reject({state: 0, error: "Service not active"});
+      return Promise.reject(new Error("Push service not active"));
     } else if (this._state > PUSH_SERVICE_ACTIVATING) {
       return Promise.resolve();
     } else {
@@ -152,7 +160,7 @@ this.PushService = {
   },
 
   _setState: function(aNewState) {
-    debug("new state: " + aNewState + " old state: " + this._state);
+    console.debug("setState()", "new state", aNewState, "old state", this._state);
 
     if (this._state == aNewState) {
       return;
@@ -164,7 +172,7 @@ this.PushService = {
       this._state = aNewState;
       if (this._notifyActivated) {
         if (aNewState < PUSH_SERVICE_ACTIVATING) {
-          this._notifyActivated.reject({state: 0, error: "Service not active"});
+          this._notifyActivated.reject(new Error("Push service not active"));
         } else {
           this._notifyActivated.resolve();
         }
@@ -176,7 +184,7 @@ this.PushService = {
   },
 
   _changeStateOfflineEvent: function(offline, calledFromConnEnabledEvent) {
-    debug("changeStateOfflineEvent: " + offline);
+    console.debug("changeStateOfflineEvent()", offline);
 
     if (this._state < PUSH_SERVICE_ACTIVE_OFFLINE &&
         this._state != PUSH_SERVICE_ACTIVATING &&
@@ -208,7 +216,7 @@ this.PushService = {
   },
 
   _changeStateConnectionEnabledEvent: function(enabled) {
-    debug("changeStateConnectionEnabledEvent: " + enabled);
+    console.debug("changeStateConnectionEnabledEvent()", enabled);
 
     if (this._state < PUSH_SERVICE_CONNECTION_DISABLE &&
         this._state != PUSH_SERVICE_ACTIVATING) {
@@ -237,23 +245,24 @@ this.PushService = {
         break;
       case "network-active-changed":         /* On B2G. */
       case "network:offline-status-changed": /* On desktop. */
-        this._changeStateOfflineEvent(aData === "offline", false);
+        this._stateChangeProcessEnqueue(_ =>
+          this._changeStateOfflineEvent(aData === "offline", false)
+        );
         break;
 
       case "nsPref:changed":
         if (aData == "dom.push.serverURL") {
-          debug("dom.push.serverURL changed! websocket. new value " +
+          console.debug("observe: dom.push.serverURL changed for websocket",
                 prefs.get("serverURL"));
-          this._serverURIProcessEnqueue(_ =>
+          this._stateChangeProcessEnqueue(_ =>
             this._changeServerURL(prefs.get("serverURL"),
                                   CHANGING_SERVICE_EVENT)
           );
 
         } else if (aData == "dom.push.connection.enabled") {
-          this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled"));
-
-        } else if (aData == "dom.push.debug") {
-          gDebuggingEnabled = prefs.get("debug");
+          this._stateChangeProcessEnqueue(_ =>
+            this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled"))
+          );
         }
         break;
 
@@ -261,58 +270,57 @@ this.PushService = {
         this._dropExpiredRegistrations();
         break;
 
-      case "webapps-clear-data":
-        debug("webapps-clear-data");
-
-        let data = aSubject
-                     .QueryInterface(Ci.mozIApplicationClearPrivateDataParams);
-        if (!data) {
-          debug("webapps-clear-data: Failed to get information about " +
-                "application");
-          return;
-        }
-
-        var originAttributes =
-          ChromeUtils.originAttributesToSuffix({ appId: data.appId,
-                                                 inBrowser: data.browserOnly });
-        this._db.getAllByOriginAttributes(originAttributes)
-          .then(records => {
-            records.forEach(record => {
-              this._db.delete(record.keyID)
-                .then(_ => {
-                  // courtesy, but don't establish a connection
-                  // just for it
-                  if (this._ws) {
-                    debug("Had a connection, so telling the server");
-                    this._sendUnregister({channelID: record.channelID})
-                        .catch(function(e) {
-                          debug("Unregister errored " + e);
-                        });
-                  }
-                }, err => {
-                  debug("webapps-clear-data: " + record.scope +
-                        " Could not delete entry " + record.channelID);
-
-                  // courtesy, but don't establish a connection
-                  // just for it
-                  if (this._ws) {
-                    debug("Had a connection, so telling the server");
-                    this._sendUnregister({channelID: record.channelID})
-                        .catch(function(e) {
-                          debug("Unregister errored " + e);
-                        });
-                  }
-                  throw "Database error";
-                });
-            });
-          }, _ => {
-            debug("webapps-clear-data: Error in getAllByOriginAttributes(" + originAttributes + ")");
-          });
+      case "perm-changed":
+        this._onPermissionChange(aSubject, aData).catch(error => {
+          console.error("onPermissionChange: Error updating registrations:",
+            error);
+        })
+        break;
 
+      case "clear-origin-data":
+        this._clearOriginData(data).catch(error => {
+          console.error("clearOriginData: Error clearing origin data:", error);
+        });
         break;
     }
   },
 
+  _clearOriginData: function(data) {
+    console.log("clearOriginData()");
+
+    if (!data) {
+      return Promise.resolve();
+    }
+
+    let pattern = JSON.parse(data);
+    return this._db.clearIf(record => {
+      if (!record.matchesOriginAttributes(pattern)) {
+        return false;
+      }
+      this._backgroundUnregister(record);
+      return true;
+    });
+  },
+
+  /**
+   * Sends an unregister request to the server in the background. If the
+   * service is not connected, this function is a no-op.
+   *
+   * @param {PushRecord} record The record to unregister.
+   */
+  _backgroundUnregister: function(record) {
+    console.debug("backgroundUnregister()");
+
+    if (!this._service.isConnected() || !record) {
+      return;
+    }
+
+    console.debug("backgroundUnregister: Notifying server", record);
+    this._sendUnregister(record).catch(e => {
+      console.error("backgroundUnregister: Error notifying server", e);
+    });
+  },
+
   // utility function used to add/remove observers in startObservers() and
   // stopObservers()
   getNetworkStateChangeEventName: function() {
@@ -324,23 +332,41 @@ this.PushService = {
     }
   },
 
-  _findService: function(serverURI) {
-    var uri;
-    var service;
-    if (serverURI) {
-      for (let connProtocol of CONNECTION_PROTOCOLS) {
-        uri = connProtocol.checkServerURI(serverURI);
-        if (uri) {
-          service = connProtocol;
-          break;
-        }
+  _findService: function(serverURL) {
+    console.debug("findService()");
+
+    let uri;
+    let service;
+
+    if (!serverURL) {
+      console.warn("findService: No dom.push.serverURL found");
+      return [];
+    }
+
+    try {
+      uri = Services.io.newURI(serverURL, null, null);
+    } catch (e) {
+      console.warn("findService: Error creating valid URI from",
+        "dom.push.serverURL", serverURL);
+      return [];
+    }
+
+    if (!gContentSecurityManager.isURIPotentiallyTrustworthy(uri)) {
+      console.warn("findService: Untrusted server URI", uri.spec);
+      return [];
+    }
+
+    for (let connProtocol of CONNECTION_PROTOCOLS) {
+      if (connProtocol.validServerURI(uri)) {
+        service = connProtocol;
+        break;
       }
     }
     return [service, uri];
   },
 
   _changeServerURL: function(serverURI, event) {
-    debug("changeServerURL");
+    console.debug("changeServerURL()");
 
     switch(event) {
       case UNINIT_EVENT:
@@ -354,8 +380,8 @@ this.PushService = {
           return Promise.resolve();
         }
         return this._startService(service, uri, event)
-          .then(_ =>
-            this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled"))
+          .then(_ => this._stateChangeProcessEnqueue(_ =>
+            this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled")))
           );
       }
       case CHANGING_SERVICE_EVENT:
@@ -365,8 +391,8 @@ this.PushService = {
             this._setState(PUSH_SERVICE_ACTIVATING);
             // The service has not been running - start it.
             return this._startService(service, uri, STARTING_SERVICE_EVENT)
-              .then(_ =>
-                this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled"))
+              .then(_ => this._stateChangeProcessEnqueue(_ =>
+                this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled")))
               );
 
           } else {
@@ -378,8 +404,8 @@ this.PushService = {
               .then(_ =>
                  this._startService(service, uri, CHANGING_SERVICE_EVENT)
               )
-              .then(_ =>
-                this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled"))
+              .then(_ => this._stateChangeProcessEnqueue(_ =>
+                this._changeStateConnectionEnabledEvent(prefs.get("connection.enabled")))
               );
 
           }
@@ -412,7 +438,7 @@ this.PushService = {
    *                                        PUSH_SERVICE_CONNECTION_DISABLE.
    */
   init: function(options = {}) {
-    debug("init()");
+    console.debug("init()");
 
     if (this._state > PUSH_SERVICE_UNINIT) {
       return;
@@ -420,30 +446,12 @@ this.PushService = {
 
     this._setState(PUSH_SERVICE_ACTIVATING);
 
-    // Debugging
-    prefs.observe("debug", this);
-
     Services.obs.addObserver(this, "xpcom-shutdown", false);
 
     if (options.serverURI) {
       // this is use for xpcshell test.
 
-      var uri;
-      var service;
-      if (!options.service) {
-        for (let connProtocol of CONNECTION_PROTOCOLS) {
-          uri = connProtocol.checkServerURI(options.serverURI);
-          if (uri) {
-            service = connProtocol;
-            break;
-          }
-        }
-      } else {
-        try {
-          uri  = Services.io.newURI(options.serverURI, null, null);
-          service = options.service;
-        } catch(e) {}
-      }
+      let [service, uri] = this._findService(options.serverURI);
       if (!service) {
         this._setState(PUSH_SERVICE_INIT);
         return;
@@ -461,19 +469,19 @@ this.PushService = {
       // slightly different URLs.
       prefs.observe("serverURL", this);
 
-      this._serverURIProcessEnqueue(_ =>
+      this._stateChangeProcessEnqueue(_ =>
         this._changeServerURL(prefs.get("serverURL"), STARTING_SERVICE_EVENT));
     }
   },
 
   _startObservers: function() {
-    debug("startObservers");
+    console.debug("startObservers()");
 
     if (this._state != PUSH_SERVICE_ACTIVATING) {
       return;
     }
 
-    Services.obs.addObserver(this, "webapps-clear-data", false);
+    Services.obs.addObserver(this, "clear-origin-data", false);
 
     // On B2G the NetworkManager interface fires a network-active-changed
     // event.
@@ -499,12 +507,16 @@ this.PushService = {
     // Used to monitor if the user wishes to disable Push.
     prefs.observe("connection.enabled", this);
 
-    // Used to prune expired registrations and notify dormant service workers.
+    // Prunes expired registrations and notifies dormant service workers.
     Services.obs.addObserver(this, "idle-daily", false);
+
+    // Prunes registrations for sites for which the user revokes push
+    // permissions.
+    Services.obs.addObserver(this, "perm-changed", false);
   },
 
   _startService: function(service, serverURI, event, options = {}) {
-    debug("startService");
+    console.debug("startService()");
 
     if (this._state != PUSH_SERVICE_ACTIVATING) {
       return;
@@ -530,7 +542,7 @@ this.PushService = {
 
     this._service.init(options, this, serverURI);
     this._startObservers();
-    return Promise.resolve();
+    return this._dropExpiredRegistrations();
   },
 
   /**
@@ -543,7 +555,7 @@ this.PushService = {
    *            state is change to PUSH_SERVICE_UNINIT
    */
   _stopService: function(event) {
-    debug("stopService");
+    console.debug("stopService()");
 
     if (this._state < PUSH_SERVICE_ACTIVATING) {
       return;
@@ -576,7 +588,7 @@ this.PushService = {
       return Promise.resolve();
     }
 
-    return this.dropRegistrations()
+    return this.dropUnexpiredRegistrations()
        .then(_ => {
          this._db.close();
          this._db = null;
@@ -587,22 +599,22 @@ this.PushService = {
   },
 
   _stopObservers: function() {
-    debug("stopObservers()");
+    console.debug("stopObservers()");
 
     if (this._state < PUSH_SERVICE_ACTIVATING) {
       return;
     }
 
-    prefs.ignore("debug", this);
     prefs.ignore("connection.enabled", this);
 
     Services.obs.removeObserver(this, this._networkStateChangeEventName);
-    Services.obs.removeObserver(this, "webapps-clear-data");
+    Services.obs.removeObserver(this, "clear-origin-data");
     Services.obs.removeObserver(this, "idle-daily");
+    Services.obs.removeObserver(this, "perm-changed");
   },
 
   uninit: function() {
-    debug("uninit()");
+    console.debug("uninit()");
 
     this._childListeners = [];
 
@@ -615,9 +627,9 @@ this.PushService = {
     prefs.ignore("serverURL", this);
     Services.obs.removeObserver(this, "xpcom-shutdown");
 
-    this._serverURIProcessEnqueue(_ =>
+    this._stateChangeProcessEnqueue(_ =>
             this._changeServerURL("", UNINIT_EVENT));
-    debug("shutdown complete!");
+    console.debug("uninit: shutdown complete!");
   },
 
   /** |delay| should be in milliseconds. */
@@ -647,7 +659,8 @@ this.PushService = {
         }
       }, (alarmID) => {
         this._alarmID = alarmID;
-        debug("Set alarm " + delay + " in the future " + this._alarmID);
+        console.debug("setAlarm: Set alarm", delay, "in the future",
+          this._alarmID);
         this._settingAlarm = false;
 
         if (this._waitingForAlarmSet) {
@@ -660,18 +673,41 @@ this.PushService = {
 
   stopAlarm: function() {
     if (this._alarmID !== null) {
-      debug("Stopped existing alarm " + this._alarmID);
+      console.debug("stopAlarm: Stopped existing alarm", this._alarmID);
       AlarmService.remove(this._alarmID);
       this._alarmID = null;
     }
   },
 
-  dropRegistrations: function() {
-    return this._notifyAllAppsRegister()
-      .then(_ => this._db.drop());
+  /**
+   * Drops all active registrations and notifies the associated service
+   * workers. This function is called when the user switches Push servers,
+   * or when the server invalidates all existing registrations.
+   *
+   * We ignore expired registrations because they're already handled in other
+   * code paths. Registrations that expired after exceeding their quotas are
+   * evicted at startup, or on the next `idle-daily` event. Registrations that
+   * expired because the user revoked the notification permission are evicted
+   * once the permission is reinstated.
+   */
+  dropUnexpiredRegistrations: function() {
+    let subscriptionChanges = [];
+    return this._db.clearIf(record => {
+      if (record.isExpired()) {
+        return false;
+      }
+      subscriptionChanges.push(record);
+      return true;
+    }).then(() => {
+      this.notifySubscriptionChanges(subscriptionChanges);
+    });
   },
 
   _notifySubscriptionChangeObservers: function(record) {
+    if (!record) {
+      return;
+    }
+
     // Notify XPCOM observers.
     Services.obs.notifyObservers(
       null,
@@ -706,31 +742,51 @@ this.PushService = {
     }
   },
 
-  // Fires a push-register system message to all applications that have
-  // registration.
-  _notifyAllAppsRegister: function() {
-    debug("notifyAllAppsRegister()");
-    // records are objects describing the registration as stored in IndexedDB.
-    return this._db.getAllUnexpired().then(records => {
-      records.forEach(record => {
-        this._notifySubscriptionChangeObservers(record);
-      });
-    });
-  },
-
-  dropRegistrationAndNotifyApp: function(aKeyId) {
-    return this._db.getByKeyID(aKeyId).then(record => {
-      this._notifySubscriptionChangeObservers(record);
-      return this._db.delete(aKeyId);
-    });
-  },
-
-  updateRegistrationAndNotifyApp: function(aOldKey, aRecord) {
-    return this._db.delete(aOldKey)
-      .then(_ => this._db.put(aRecord))
+  /**
+   * Drops a registration and notifies the associated service worker. If the
+   * registration does not exist, this function is a no-op.
+   *
+   * @param {String} keyID The registration ID to remove.
+   * @returns {Promise} Resolves once the worker has been notified.
+   */
+  dropRegistrationAndNotifyApp: function(aKeyID) {
+    return this._db.delete(aKeyID)
       .then(record => this._notifySubscriptionChangeObservers(record));
   },
 
+  /**
+   * Replaces an existing registration and notifies the associated service
+   * worker.
+   *
+   * @param {String} aOldKey The registration ID to replace.
+   * @param {PushRecord} aNewRecord The new record.
+   * @returns {Promise} Resolves once the worker has been notified.
+   */
+  updateRegistrationAndNotifyApp: function(aOldKey, aNewRecord) {
+    return this.updateRecordAndNotifyApp(aOldKey, _ => aNewRecord);
+  },
+  /**
+   * Updates a registration and notifies the associated service worker.
+   *
+   * @param {String} keyID The registration ID to update.
+   * @param {Function} updateFunc Returns the updated record.
+   * @returns {Promise} Resolves with the updated record once the worker
+   *  has been notified.
+   */
+  updateRecordAndNotifyApp: function(aKeyID, aUpdateFunc) {
+    return this._db.update(aKeyID, aUpdateFunc)
+      .then(record => {
+        this._notifySubscriptionChangeObservers(record);
+        return record;
+      });
+  },
+
+  notifySubscriptionChanges: function(records) {
+    records.forEach(record => {
+      this._notifySubscriptionChangeObservers(record);
+    });
+  },
+
   ensureP256dhKey: function(record) {
     if (record.p256dhPublicKey && record.p256dhPrivateKey) {
       return Promise.resolve(record);
@@ -750,14 +806,6 @@ this.PushService = {
       });
   },
 
-  updateRecordAndNotifyApp: function(aKeyID, aUpdateFunc) {
-    return this._db.update(aKeyID, aUpdateFunc)
-      .then(record => {
-        this._notifySubscriptionChangeObservers(record);
-        return record;
-      });
-  },
-
   _recordDidNotNotify: function(reason) {
     Services.telemetry.
       getHistogramById("PUSH_API_NOTIFICATION_RECEIVED_BUT_DID_NOT_NOTIFY").
@@ -780,7 +828,7 @@ this.PushService = {
    *  versions.
    */
   receivedPushMessage: function(keyID, message, cryptoParams, updateFunc) {
-    debug("receivedPushMessage()");
+    console.debug("receivedPushMessage()");
     Services.telemetry.getHistogramById("PUSH_API_NOTIFICATION_RECEIVED").add();
 
     let shouldNotify = false;
@@ -808,7 +856,8 @@ this.PushService = {
         // this, we check if the record has expired before *and* after updating
         // the quota.
         if (newRecord.isExpired()) {
-          debug("receivedPushMessage: Ignoring update for expired key ID " + keyID);
+          console.error("receivedPushMessage: Ignoring update for expired key ID",
+            keyID);
           return null;
         }
         newRecord.receivedPush(lastVisit);
@@ -835,31 +884,85 @@ this.PushService = {
         if (shouldNotify) {
           notified = this._notifyApp(record, message);
         }
-        if (record.isExpired()) {
-          this._recordDidNotNotify(kDROP_NOTIFICATION_REASON_EXPIRED);
-          // Drop the registration in the background. If the user returns to the
-          // site, the service worker will be notified on the next `idle-daily`
-          // event.
-          this._sendUnregister(record).catch(error => {
-            debug("receivedPushMessage: Unregister error: " + error);
-          });
-        }
+        // Update quota after the delay, at which point
+        // we check for visible notifications.
+        setTimeout(() => this._updateQuota(keyID),
+          prefs.get("quotaUpdateDelay"));
         return notified;
       });
     }).catch(error => {
-      debug("receivedPushMessage: Error notifying app: " + error);
+      console.error("receivedPushMessage: Error notifying app", error);
     });
   },
 
+  _updateQuota: function(keyID) {
+    console.debug("updateQuota()");
+
+    this._db.update(keyID, record => {
+      // Record may have expired from an earlier quota update.
+      if (record.isExpired()) {
+        console.debug(
+          "updateQuota: Trying to update quota for expired record", record);
+        return null;
+      }
+      // If there are visible notifications, don't apply the quota penalty
+      // for the message.
+      if (!this._visibleNotifications.has(record.uri.prePath)) {
+        record.reduceQuota();
+      }
+      return record;
+    }).then(record => {
+      if (record && record.isExpired()) {
+        this._recordDidNotNotify(kDROP_NOTIFICATION_REASON_EXPIRED);
+        // Drop the registration in the background. If the user returns to the
+        // site, the service worker will be notified on the next `idle-daily`
+        // event.
+        this._backgroundUnregister(record);
+      }
+      if (this._updateQuotaTestCallback) {
+        // Callback so that test may be notified when the quota update is complete.
+        this._updateQuotaTestCallback();
+      }
+    }).catch(error => {
+      console.debug("updateQuota: Error while trying to update quota", error);
+    });
+  },
+
+  _notificationForOriginShown(origin) {
+    console.debug("notificationForOriginShown()", origin);
+    let count;
+    if (this._visibleNotifications.has(origin)) {
+      count = this._visibleNotifications.get(origin);
+    } else {
+      count = 0;
+    }
+    this._visibleNotifications.set(origin, count + 1);
+  },
+
+  _notificationForOriginClosed(origin) {
+    console.debug("notificationForOriginClosed()", origin);
+    let count;
+    if (this._visibleNotifications.has(origin)) {
+      count = this._visibleNotifications.get(origin);
+    } else {
+      console.debug("notificationForOriginClosed: closing notification that has not been shown?");
+      return;
+    }
+    if (count > 1) {
+      this._visibleNotifications.set(origin, count - 1);
+    } else {
+      this._visibleNotifications.delete(origin);
+    }
+  },
+
   _notifyApp: function(aPushRecord, message) {
     if (!aPushRecord || !aPushRecord.scope ||
         aPushRecord.originAttributes === undefined) {
-      debug("notifyApp() something is undefined.  Dropping notification: " +
-        JSON.stringify(aPushRecord) );
+      console.error("notifyApp: Invalid record", aPushRecord);
       return false;
     }
 
-    debug("notifyApp() " + aPushRecord.scope);
+    console.debug("notifyApp()", aPushRecord.scope);
     // Notify XPCOM observers.
     let notification = Cc["@mozilla.org/push/ObserverNotification;1"]
                          .createInstance(Ci.nsIPushObserverNotification);
@@ -886,7 +989,7 @@ this.PushService = {
 
     // If permission has been revoked, trash the message.
     if (!aPushRecord.hasPermission()) {
-      debug("Does not have permission for push.");
+      console.warn("notifyApp: Missing push permission", aPushRecord);
       return false;
     }
 
@@ -911,9 +1014,12 @@ this.PushService = {
 
   _sendRequest: function(action, aRecord) {
     if (this._state == PUSH_SERVICE_CONNECTION_DISABLE) {
-      return Promise.reject({state: 0, error: "Service not active"});
+      return Promise.reject(new Error("Push service disabled"));
     } else if (this._state == PUSH_SERVICE_ACTIVE_OFFLINE) {
-      return Promise.reject({state: 0, error: "NetworkError"});
+      if (this._service.serviceType() == "WebSocket" && action == "unregister") {
+        return Promise.resolve();
+      }
+      return Promise.reject(new Error("Push service offline"));
     }
     return this._service.request(action, aRecord);
   },
@@ -923,7 +1029,7 @@ this.PushService = {
    * navigator.push, identifying the sending page and other fields.
    */
   _registerWithServer: function(aPageRecord) {
-    debug("registerWithServer()" + JSON.stringify(aPageRecord));
+    console.debug("registerWithServer()", aPageRecord);
 
     Services.telemetry.getHistogramById("PUSH_API_SUBSCRIBE_ATTEMPT").add();
     return this._sendRequest("register", aPageRecord)
@@ -931,44 +1037,13 @@ this.PushService = {
             err => this._onRegisterError(err))
       .then(record => {
         this._deletePendingRequest(aPageRecord);
-        return record;
+        return record.toSubscription();
       }, err => {
         this._deletePendingRequest(aPageRecord);
         throw err;
      });
   },
 
-  _register: function(aPageRecord) {
-    debug("_register()");
-    if (!aPageRecord.scope || aPageRecord.originAttributes === undefined) {
-      return Promise.reject({state: 0, error: "NotFoundError"});
-    }
-
-    return this._checkActivated()
-      .then(_ => this._db.getByIdentifiers(aPageRecord))
-      .then(record => {
-        if (!record) {
-          return this._lookupOrPutPendingRequest(aPageRecord);
-        }
-        if (record.isExpired()) {
-          return record.getLastVisit().then(lastVisit => {
-            if (lastVisit > record.lastPush) {
-              // If the user revisited the site, drop the expired push
-              // registration and re-register.
-              return this._db.delete(record.keyID).then(_ => {
-                return this._lookupOrPutPendingRequest(aPageRecord);
-              });
-            }
-            throw {state: 0, error: "NotFoundError"};
-          });
-        }
-        return record;
-      }, error => {
-        debug("getByIdentifiers failed");
-        throw error;
-      });
-  },
-
   _sendUnregister: function(aRecord) {
     Services.telemetry.getHistogramById("PUSH_API_UNSUBSCRIBE_ATTEMPT").add();
     return this._sendRequest("unregister", aRecord).then(function(v) {
@@ -985,7 +1060,7 @@ this.PushService = {
    * from _service.request, causing the promise to be rejected instead.
    */
   _onRegisterSuccess: function(aRecord) {
-    debug("_onRegisterSuccess()");
+    console.debug("_onRegisterSuccess()");
 
     return this._db.put(aRecord)
       .then(record => {
@@ -995,10 +1070,7 @@ this.PushService = {
       .catch(error => {
         Services.telemetry.getHistogramById("PUSH_API_SUBSCRIBE_FAILED").add()
         // Unable to save. Destroy the subscription in the background.
-        this._sendUnregister(aRecord).catch(err => {
-          debug("_onRegisterSuccess: Error unregistering stale subscription" +
-            err);
-        });
+        this._backgroundUnregister(aRecord);
         throw error;
       });
   },
@@ -1008,89 +1080,124 @@ this.PushService = {
    * from _service.request, causing the promise to be rejected instead.
    */
   _onRegisterError: function(reply) {
-    debug("_onRegisterError()");
+    console.debug("_onRegisterError()");
     Services.telemetry.getHistogramById("PUSH_API_SUBSCRIBE_FAILED").add()
     if (!reply.error) {
-      debug("Called without valid error message!");
-      throw "Registration error";
+      console.warn("onRegisterError: Called without valid error message!",
+        reply.error);
+      throw new Error("Registration error");
     }
     throw reply.error;
   },
 
   receiveMessage: function(aMessage) {
-    debug("receiveMessage(): " + aMessage.name);
+    console.debug("receiveMessage()", aMessage.name);
 
     if (kCHILD_PROCESS_MESSAGES.indexOf(aMessage.name) == -1) {
-      debug("Invalid message from child " + aMessage.name);
+      console.debug("receiveMessage: Invalid message from child",
+        aMessage.name);
       return;
     }
 
     if (aMessage.name === "Push:RegisterEventNotificationListener") {
-      debug("Adding child listener");
+      console.debug("receiveMessage: Adding child listener");
       this._childListeners.push(aMessage.target);
       return;
     }
 
     if (aMessage.name === "child-process-shutdown") {
-      debug("Possibly removing child listener");
+      console.debug("receiveMessage: Possibly removing child listener");
       for (var i = this._childListeners.length - 1; i >= 0; --i) {
         if (this._childListeners[i] == aMessage.target) {
-          debug("Removed child listener");
+          console.debug("receiveMessage: Removed child listener");
           this._childListeners.splice(i, 1);
         }
       }
+      console.debug("receiveMessage: Clearing notifications from child");
+      this._visibleNotifications.clear();
+      return;
+    }
+
+    if (aMessage.name === "Push:NotificationForOriginShown") {
+      console.debug("receiveMessage: Notification shown from child");
+      this._notificationForOriginShown(aMessage.data);
+      return;
+    }
+
+    if (aMessage.name === "Push:NotificationForOriginClosed") {
+      console.debug("receiveMessage: Notification closed from child");
+      this._notificationForOriginClosed(aMessage.data);
       return;
     }
 
     if (!aMessage.target.assertPermission("push")) {
-      debug("Got message from a child process that does not have 'push' permission.");
+      console.debug("receiveMessage: Got message from a child process that",
+        "does not have 'push' permission");
       return null;
     }
 
     let mm = aMessage.target.QueryInterface(Ci.nsIMessageSender);
-    let pageRecord = aMessage.data;
 
+    let name = aMessage.name.slice("Push:".length);
+    Promise.resolve().then(_ => {
+      let pageRecord = this._validatePageRecord(aMessage);
+      return this[name.toLowerCase()](pageRecord);
+    }).then(result => {
+      mm.sendAsyncMessage("PushService:" + name + ":OK", {
+        requestID: aMessage.data.requestID,
+        result: result,
+      });
+    }, error => {
+      console.error("receiveMessage: Error handling message", aMessage, error);
+      mm.sendAsyncMessage("PushService:" + name + ":KO", {
+        requestID: aMessage.data.requestID,
+      });
+    }).catch(error => {
+      console.error("receiveMessage: Error sending reply", error);
+    });
+  },
+
+  _validatePageRecord: function(aMessage) {
     let principal = aMessage.principal;
     if (!principal) {
-      debug("No principal passed!");
-      let message = {
-        requestID: pageRecord.requestID,
-        error: "SecurityError"
-      };
-      mm.sendAsyncMessage("PushService:Register:KO", message);
-      return;
+      throw new Error("Missing message principal");
+    }
+
+    let pageRecord = aMessage.data;
+    if (!pageRecord.scope) {
+      throw new Error("Missing page record scope");
     }
 
     pageRecord.originAttributes =
       ChromeUtils.originAttributesToSuffix(principal.originAttributes);
 
-    if (!pageRecord.scope || pageRecord.originAttributes === undefined) {
-      debug("Incorrect identifier values set! " + JSON.stringify(pageRecord));
-      let message = {
-        requestID: pageRecord.requestID,
-        error: "SecurityError"
-      };
-      mm.sendAsyncMessage("PushService:Register:KO", message);
-      return;
-    }
-
-    this[aMessage.name.slice("Push:".length).toLowerCase()](pageRecord, mm);
+    return pageRecord;
   },
 
-  register: function(aPageRecord, aMessageManager) {
-    debug("register(): " + JSON.stringify(aPageRecord));
+  register: function(aPageRecord) {
+    console.debug("register()", aPageRecord);
 
-    this._register(aPageRecord)
+    if (!aPageRecord.scope || aPageRecord.originAttributes === undefined) {
+      return Promise.reject(new Error("Invalid page record"));
+    }
+
+    return this._checkActivated()
+      .then(_ => this._db.getByIdentifiers(aPageRecord))
       .then(record => {
-        let message = record.toRegister();
-        message.requestID = aPageRecord.requestID;
-        aMessageManager.sendAsyncMessage("PushService:Register:OK", message);
-      }, error => {
-        let message = {
-          requestID: aPageRecord.requestID,
-          error
-        };
-        aMessageManager.sendAsyncMessage("PushService:Register:KO", message);
+        if (!record) {
+          return this._lookupOrPutPendingRequest(aPageRecord);
+        }
+        if (record.isExpired()) {
+          return record.quotaChanged().then(isChanged => {
+            if (isChanged) {
+              // If the user revisited the site, drop the expired push
+              // registration and re-register.
+              return this.dropRegistrationAndNotifyApp(record.keyID);
+            }
+            throw new Error("Push subscription expired");
+          }).then(_ => this._lookupOrPutPendingRequest(aPageRecord));
+        }
+        return record.toSubscription();
       });
   },
 
@@ -1119,10 +1226,11 @@ this.PushService = {
    * client acknowledge. On a server, data is cheap, reliable notification is
    * not.
    */
-  _unregister: function(aPageRecord) {
-    debug("_unregister()");
+  unregister: function(aPageRecord) {
+    console.debug("unregister()", aPageRecord);
+
     if (!aPageRecord.scope || aPageRecord.originAttributes === undefined) {
-      return Promise.reject({state: 0, error: "NotFoundError"});
+      return Promise.reject(new Error("Invalid page record"));
     }
 
     return this._checkActivated()
@@ -1139,27 +1247,9 @@ this.PushService = {
       });
   },
 
-  unregister: function(aPageRecord, aMessageManager) {
-    debug("unregister() " + JSON.stringify(aPageRecord));
-
-    this._unregister(aPageRecord)
-      .then(result => {
-          aMessageManager.sendAsyncMessage("PushService:Unregister:OK", {
-            requestID: aPageRecord.requestID,
-            result: result,
-          })
-        }, error => {
-          debug("unregister(): Actual error " + error);
-          aMessageManager.sendAsyncMessage("PushService:Unregister:KO", {
-            requestID: aPageRecord.requestID,
-          })
-        }
-      );
-  },
-
   _clearAll: function _clearAll() {
     return this._checkActivated()
-      .then(_ => this._db.clearAll())
+      .then(_ => this._db.drop())
       .catch(_ => Promise.resolve());
   },
 
@@ -1200,18 +1290,15 @@ this.PushService = {
     return this._checkActivated()
       .then(_ => clear(this._db, domain))
       .catch(e => {
-        debug("Error forgetting about domain! " + e);
+        console.warn("clearForDomain: Error forgetting about domain", e);
         return Promise.resolve();
       });
   },
 
-  /**
-   * Called on message from the child process
-   */
-  _registration: function(aPageRecord) {
-    debug("_registration()");
+  registration: function(aPageRecord) {
+    console.debug("registration()");
     if (!aPageRecord.scope || aPageRecord.originAttributes === undefined) {
-      return Promise.reject({state: 0, error: "NotFoundError"});
+      return Promise.reject(new Error("Invalid page record"));
     }
 
     return this._checkActivated()
@@ -1221,54 +1308,151 @@ this.PushService = {
           return null;
         }
         if (record.isExpired()) {
-          return record.getLastVisit().then(lastVisit => {
-            if (lastVisit > record.lastPush) {
-              return this._db.delete(record.keyID).then(_ => null);
+          return record.quotaChanged().then(isChanged => {
+            if (isChanged) {
+              return this.dropRegistrationAndNotifyApp(record.keyID).then(_ => null);
             }
-            throw {state: 0, error: "NotFoundError"};
+            return null;
           });
         }
-        return record.toRegistration();
+        return record.toSubscription();
       });
   },
 
-  registration: function(aPageRecord, aMessageManager) {
-    debug("registration()");
-
-    return this._registration(aPageRecord)
-      .then(registration =>
-        aMessageManager.sendAsyncMessage("PushService:Registration:OK", {
-          requestID: aPageRecord.requestID,
-          registration
-        }), error =>
-        aMessageManager.sendAsyncMessage("PushService:Registration:KO", {
-          requestID: aPageRecord.requestID,
-          error
-        })
-      );
-  },
-
   _dropExpiredRegistrations: function() {
-    debug("dropExpiredRegistrations()");
+    console.debug("dropExpiredRegistrations()");
 
-    this._db.getAllExpired().then(records => {
-      return Promise.all(records.map(record => {
-        return record.getLastVisit().then(lastVisit => {
-          if (lastVisit > record.lastPush) {
+    return this._db.getAllExpired().then(records => {
+      return Promise.all(records.map(record =>
+        record.quotaChanged().then(isChanged => {
+          if (isChanged) {
             // If the user revisited the site, drop the expired push
             // registration and notify the associated service worker.
-            return this._db.delete(record.keyID).then(() => {
-              this._notifySubscriptionChangeObservers(record);
-            });
+            return this.dropRegistrationAndNotifyApp(record.keyID);
           }
         }).catch(error => {
-          debug("dropExpiredRegistrations: Error dropping registration " +
-            record.keyID + ": " + error);
-        });
-      }));
-    }).catch(error => {
-      debug("dropExpiredRegistrations: Error dropping registrations: " +
-        error);
+          console.error("dropExpiredRegistrations: Error dropping registration",
+            record.keyID, error);
+        })
+      ));
     });
   },
+
+  _onPermissionChange: function(subject, data) {
+    console.debug("onPermissionChange()");
+
+    if (data == "cleared") {
+      // If the permission list was cleared, drop all registrations
+      // that are subject to quota.
+      return this._db.clearIf(record => {
+        if (record.quotaApplies()) {
+          if (!record.isExpired()) {
+            // Drop the registration in the background.
+            this._backgroundUnregister(record);
+          }
+          return true;
+        }
+        return false;
+      });
+    }
+
+    let permission = subject.QueryInterface(Ci.nsIPermission);
+    if (permission.type != "desktop-notification") {
+      return Promise.resolve();
+    }
+
+    return this._updatePermission(permission, data);
+  },
+
+  _updatePermission: function(permission, type) {
+    console.debug("updatePermission()");
+
+    let isAllow = permission.capability ==
+                  Ci.nsIPermissionManager.ALLOW_ACTION;
+    let isChange = type == "added" || type == "changed";
+
+    if (isAllow && isChange) {
+      // Permission set to "allow". Drop all expired registrations for this
+      // site, notify the associated service workers, and reset the quota
+      // for active registrations.
+      return this._reduceByPrincipal(
+        permission.principal,
+        (subscriptionChanges, record, cursor) => {
+          this._permissionAllowed(subscriptionChanges, record, cursor);
+          return subscriptionChanges;
+        },
+        []
+      ).then(subscriptionChanges => {
+        this.notifySubscriptionChanges(subscriptionChanges);
+      });
+    } else if (isChange || (isAllow && type == "deleted")) {
+      // Permission set to "block" or "always ask," or "allow" permission
+      // removed. Expire all registrations for this site.
+      return this._reduceByPrincipal(
+        permission.principal,
+        (memo, record, cursor) => this._permissionDenied(record, cursor)
+      );
+    }
+
+    return Promise.resolve();
+  },
+
+  _reduceByPrincipal: function(principal, callback, initialValue) {
+    return this._db.reduceByOrigin(
+      principal.URI.prePath,
+      ChromeUtils.originAttributesToSuffix(principal.originAttributes),
+      callback,
+      initialValue
+    );
+  },
+
+  /**
+   * The update function called for each registration record if the push
+   * permission is revoked. We only expire the record so we can notify the
+   * service worker as soon as the permission is reinstated. If we just
+   * deleted the record, the worker wouldn't be notified until the next visit
+   * to the site.
+   *
+   * @param {PushRecord} record The record to expire.
+   * @param {IDBCursor} cursor The IndexedDB cursor.
+   */
+  _permissionDenied: function(record, cursor) {
+    console.debug("permissionDenied()");
+
+    if (!record.quotaApplies() || record.isExpired()) {
+      // Ignore already-expired records.
+      return;
+    }
+    // Drop the registration in the background.
+    this._backgroundUnregister(record);
+    record.setQuota(0);
+    cursor.update(record);
+  },
+
+  /**
+   * The update function called for each registration record if the push
+   * permission is granted. If the record has expired, it will be dropped;
+   * otherwise, its quota will be reset to the default value.
+   *
+   * @param {Array} subscriptionChanges A list of records whose associated
+   *  service workers should be notified once the transaction has committed.
+   * @param {PushRecord} record The record to update.
+   * @param {IDBCursor} cursor The IndexedDB cursor.
+   */
+  _permissionAllowed: function(subscriptionChanges, record, cursor) {
+    console.debug("permissionAllowed()");
+
+    if (!record.quotaApplies()) {
+      return;
+    }
+    if (record.isExpired()) {
+      // If the registration has expired, drop and notify the worker
+      // unconditionally.
+      subscriptionChanges.push(record);
+      cursor.delete();
+      return;
+    }
+    record.resetQuota();
+    cursor.update(record);
+  },
 };
diff --git a/dom/push/PushServiceHttp2.jsm b/dom/push/PushServiceHttp2.jsm
index 1f67197989..34c9bfcc5e 100644
--- a/dom/push/PushServiceHttp2.jsm
+++ b/dom/push/PushServiceHttp2.jsm
@@ -28,18 +28,16 @@ const {
 
 this.EXPORTED_SYMBOLS = ["PushServiceHttp2"];
 
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "PushServiceHttp2",
+  });
+});
+
 const prefs = new Preferences("dom.push.");
 
-// Don't modify this, instead set dom.push.debug.
-// Set debug first so that all debugging actually works.
-var gDebuggingEnabled = prefs.get("debug");
-
-function debug(s) {
-  if (gDebuggingEnabled) {
-    dump("-*- PushServiceHttp2.jsm: " + s + "\n");
-  }
-}
-
 const kPUSHHTTP2DB_DB_NAME = "pushHttp2";
 const kPUSHHTTP2DB_DB_VERSION = 5; // Change this if the IndexedDB format changes
 const kPUSHHTTP2DB_STORE_NAME = "pushHttp2";
@@ -53,7 +51,7 @@ const kPUSHHTTP2DB_STORE_NAME = "pushHttp2";
  * It's easier to stop listening than to have checks at specific points.
  */
 var PushSubscriptionListener = function(pushService, uri) {
-  debug("Creating a new pushSubscription listener.");
+  console.debug("PushSubscriptionListener()");
   this._pushService = pushService;
   this.uri = uri;
 };
@@ -73,12 +71,12 @@ PushSubscriptionListener.prototype = {
   },
 
   onStartRequest: function(aRequest, aContext) {
-    debug("PushSubscriptionListener onStartRequest()");
+    console.debug("PushSubscriptionListener: onStartRequest()");
     // We do not do anything here.
   },
 
   onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-    debug("PushSubscriptionListener onDataAvailable()");
+    console.debug("PushSubscriptionListener: onDataAvailable()");
     // Nobody should send data, but just to be sure, otherwise necko will
     // complain.
     if (aCount === 0) {
@@ -93,7 +91,7 @@ PushSubscriptionListener.prototype = {
   },
 
   onStopRequest: function(aRequest, aContext, aStatusCode) {
-    debug("PushSubscriptionListener onStopRequest()");
+    console.debug("PushSubscriptionListener: onStopRequest()");
     if (!this._pushService) {
         return;
     }
@@ -104,7 +102,7 @@ PushSubscriptionListener.prototype = {
   },
 
   onPush: function(associatedChannel, pushChannel) {
-    debug("PushSubscriptionListener onPush()");
+    console.debug("PushSubscriptionListener: onPush()");
     var pushChannelListener = new PushChannelListener(this);
     pushChannel.asyncOpen(pushChannelListener, pushChannel);
   },
@@ -119,7 +117,7 @@ PushSubscriptionListener.prototype = {
  * OnDataAvailable and send to the app in OnStopRequest.
  */
 var PushChannelListener = function(pushSubscriptionListener) {
-  debug("Creating a new push channel listener.");
+  console.debug("PushChannelListener()");
   this._mainListener = pushSubscriptionListener;
   this._message = [];
   this._ackUri = null;
@@ -132,7 +130,7 @@ PushChannelListener.prototype = {
   },
 
   onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-    debug("push channel listener onDataAvailable()");
+    console.debug("PushChannelListener: onDataAvailable()");
 
     if (aCount === 0) {
       return;
@@ -148,7 +146,8 @@ PushChannelListener.prototype = {
   },
 
   onStopRequest: function(aRequest, aContext, aStatusCode) {
-    debug("push channel listener onStopRequest()  status code:" + aStatusCode);
+    console.debug("PushChannelListener: onStopRequest()", "status code",
+      aStatusCode);
     if (Components.isSuccessCode(aStatusCode) &&
         this._mainListener &&
         this._mainListener._pushService) {
@@ -228,14 +227,14 @@ PushServiceDelete.prototype = {
     if (Components.isSuccessCode(aStatusCode)) {
        this._resolve();
     } else {
-       this._reject({status: 0, error: "NetworkError"});
+       this._reject(new Error("Error removing subscription: " + aStatusCode));
     }
   }
 };
 
 var SubscriptionListener = function(aSubInfo, aResolve, aReject,
                                     aServerURI, aPushServiceHttp2) {
-  debug("Creating a new subscription listener.");
+  console.debug("SubscriptionListener()");
   this._subInfo = aSubInfo;
   this._resolve = aResolve;
   this._reject = aReject;
@@ -250,7 +249,7 @@ SubscriptionListener.prototype = {
   onStartRequest: function(aRequest, aContext) {},
 
   onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-    debug("subscription listener onDataAvailable()");
+    console.debug("SubscriptionListener: onDataAvailable()");
 
     // We do not expect any data, but necko will complain if we do not consume
     // it.
@@ -266,16 +265,16 @@ SubscriptionListener.prototype = {
   },
 
   onStopRequest: function(aRequest, aContext, aStatus) {
-    debug("subscription listener onStopRequest()");
+    console.debug("SubscriptionListener: onStopRequest()");
 
     // Check if pushService is still active.
     if (!this._service.hasmainPushService()) {
-      this._reject({error: "Service deactivated"});
+      this._reject(new Error("Push service unavailable"));
       return;
     }
 
     if (!Components.isSuccessCode(aStatus)) {
-      this._reject({error: "Error status" + aStatus});
+      this._reject(new Error("Error listening for messages: " + aStatus));
       return;
     }
 
@@ -292,11 +291,11 @@ SubscriptionListener.prototype = {
           }),
           retryAfter);
       } else {
-        this._reject({error: "Error response code: " + statusCode });
+        this._reject(new Error("Unexpected server response: " + statusCode));
       }
       return;
     } else if (statusCode != 201) {
-      this._reject({error: "Error response code: " + statusCode });
+      this._reject(new Error("Unexpected server response: " + statusCode));
       return;
     }
 
@@ -304,37 +303,39 @@ SubscriptionListener.prototype = {
     try {
       subscriptionUri = aRequest.getResponseHeader("location");
     } catch (err) {
-      this._reject({error: "Return code 201, but the answer is bogus"});
+      this._reject(new Error("Missing Location header"));
       return;
     }
 
-    debug("subscriptionUri: " + subscriptionUri);
+    console.debug("onStopRequest: subscriptionUri", subscriptionUri);
 
     var linkList;
     try {
       linkList = aRequest.getResponseHeader("link");
     } catch (err) {
-      this._reject({error: "Return code 201, but the answer is bogus"});
+      this._reject(new Error("Missing Link header"));
       return;
     }
 
-    var linkParserResult = linkParser(linkList, this._serverURI);
-    if (linkParserResult.error) {
-      this._reject(linkParserResult);
+    var linkParserResult;
+    try {
+      linkParserResult = linkParser(linkList, this._serverURI);
+    } catch (e) {
+      this._reject(e);
       return;
     }
 
     if (!subscriptionUri) {
-      this._reject({error: "Return code 201, but the answer is bogus," +
-                           " missing subscriptionUri"});
+      this._reject(new Error("Invalid Location header"));
       return;
     }
     try {
       let uriTry = Services.io.newURI(subscriptionUri, null, null);
     } catch (e) {
-      debug("Invalid URI " + subscriptionUri);
-      this._reject({error: "Return code 201, but URI is bogus. " +
-                    subscriptionUri});
+      console.error("onStopRequest: Invalid subscription URI",
+        subscriptionUri);
+      this._reject(new Error("Invalid subscription endpoint: " +
+        subscriptionUri));
       return;
     }
 
@@ -372,7 +373,7 @@ function linkParser(linkHeader, serverURI) {
 
   var linkList = linkHeader.split(',');
   if ((linkList.length < 1)) {
-    return {error: "Return code 201, but the answer is bogus"};
+    throw new Error("Invalid Link header");
   }
 
   var pushEndpoint;
@@ -393,32 +394,23 @@ function linkParser(linkHeader, serverURI) {
     }
   });
 
-  debug("pushEndpoint: " + pushEndpoint);
-  debug("pushReceiptEndpoint: " + pushReceiptEndpoint);
+  console.debug("linkParser: pushEndpoint", pushEndpoint);
+  console.debug("linkParser: pushReceiptEndpoint", pushReceiptEndpoint);
   // Missing pushReceiptEndpoint is allowed.
   if (!pushEndpoint) {
-    return {error: "Return code 201, but the answer is bogus, missing" +
-                   " pushEndpoint"};
+    throw new Error("Missing push endpoint");
   }
 
-  var uri;
-  var resUri = [];
-  try {
-    [pushEndpoint, pushReceiptEndpoint].forEach(u => {
-      if (u) {
-        uri = u;
-        resUri[u] = Services.io.newURI(uri, null, serverURI);
-      }
-    });
-  } catch (e) {
-    debug("Invalid URI " + uri);
-    return {error: "Return code 201, but URI is bogus. " + uri};
+  var pushURI = Services.io.newURI(pushEndpoint, null, serverURI);
+  var pushReceiptURI;
+  if (pushReceiptEndpoint) {
+    pushReceiptURI = Services.io.newURI(pushReceiptEndpoint, null,
+                                        serverURI);
   }
 
   return {
-    pushEndpoint: resUri[pushEndpoint].spec,
-    pushReceiptEndpoint: (pushReceiptEndpoint) ? resUri[pushReceiptEndpoint].spec
-                                               : ""
+    pushEndpoint: pushURI.spec,
+    pushReceiptEndpoint: (pushReceiptURI) ? pushReceiptURI.spec : "",
   };
 }
 
@@ -441,44 +433,26 @@ this.PushServiceHttp2 = {
                       PushRecordHttp2);
   },
 
+  serviceType: function() {
+    return "http2";
+  },
+
   hasmainPushService: function() {
     return this._mainPushService !== null;
   },
 
-  checkServerURI: function(serverURL) {
-    if (!serverURL) {
-      debug("No dom.push.serverURL found!");
-      return;
-    }
-
-    let uri;
-    try {
-      uri = Services.io.newURI(serverURL, null, null);
-    } catch(e) {
-      debug("Error creating valid URI from dom.push.serverURL (" +
-            serverURL + ")");
-      return null;
-    }
-
-    if (uri.scheme !== "https") {
-      debug("Unsupported websocket scheme " + uri.scheme);
-      return null;
-    }
-    return uri;
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic == "nsPref:changed") {
-      if (aData == "dom.push.debug") {
-        gDebuggingEnabled = prefs.get("debug");
-      }
-    }
+  validServerURI: function(serverURI) {
+    return serverURI.scheme == "http" || serverURI.scheme == "https";
   },
 
   connect: function(subscriptions) {
     this.startConnections(subscriptions);
   },
 
+  isConnected: function() {
+    return this._mainPushService != null;
+  },
+
   disconnect: function() {
     this._shutdownConnections(false);
   },
@@ -508,7 +482,7 @@ this.PushServiceHttp2 = {
    * Subscribe new resource.
    */
   _subscribeResource: function(aRecord) {
-    debug("subscribeResource()");
+    console.debug("subscribeResource()");
 
     return this._subscribeResourceInternal({
       record: aRecord,
@@ -533,7 +507,7 @@ this.PushServiceHttp2 = {
   },
 
   _subscribeResourceInternal: function(aSubInfo) {
-    debug("subscribeResourceInternal()");
+    console.debug("subscribeResourceInternal()");
 
     return new Promise((resolve, reject) => {
       var listener = new SubscriptionListener(aSubInfo,
@@ -544,11 +518,7 @@ this.PushServiceHttp2 = {
 
       var chan = this._makeChannel(this._serverURI.spec);
       chan.requestMethod = "POST";
-      try {
-        chan.asyncOpen(listener, null);
-      } catch(e) {
-        reject({status: 0, error: "NetworkError"});
-      }
+      chan.asyncOpen(listener, null);
     })
     .catch(err => {
       if ("retry" in err) {
@@ -564,11 +534,7 @@ this.PushServiceHttp2 = {
     return new Promise((resolve,reject) => {
       var chan = this._makeChannel(aUri);
       chan.requestMethod = "DELETE";
-      try {
-        chan.asyncOpen(new PushServiceDelete(resolve, reject), null);
-      } catch(err) {
-        reject({status: 0, error: "NetworkError"});
-      }
+      chan.asyncOpen(new PushServiceDelete(resolve, reject), null);
     });
   },
 
@@ -577,7 +543,7 @@ this.PushServiceHttp2 = {
    * We can't do anything about it if it fails, so we don't listen for response.
    */
   _unsubscribeResource: function(aSubscriptionUri) {
-    debug("unsubscribeResource()");
+    console.debug("unsubscribeResource()");
 
     return this._deleteResource(aSubscriptionUri);
   },
@@ -586,9 +552,10 @@ this.PushServiceHttp2 = {
    * Start listening for messages.
    */
   _listenForMsgs: function(aSubscriptionUri) {
-    debug("listenForMsgs() " + aSubscriptionUri);
+    console.debug("listenForMsgs()", aSubscriptionUri);
     if (!this._conns[aSubscriptionUri]) {
-      debug("We do not have this subscription " + aSubscriptionUri);
+      console.warn("listenForMsgs: We do not have this subscription",
+        aSubscriptionUri);
       return;
     }
 
@@ -603,7 +570,8 @@ this.PushServiceHttp2 = {
     try {
       chan.asyncOpen(listener, chan);
     } catch (e) {
-      debug("Error connecting to push server. asyncOpen failed!");
+      console.error("listenForMsgs: Error connecting to push server.",
+        "asyncOpen failed", e);
       conn.listener.disconnect();
       chan.cancel(Cr.NS_ERROR_ABORT);
       this._retryAfterBackoff(aSubscriptionUri, -1);
@@ -617,22 +585,20 @@ this.PushServiceHttp2 = {
   },
 
   _ackMsgRecv: function(aAckUri) {
-    debug("ackMsgRecv() " + aAckUri);
+    console.debug("ackMsgRecv()", aAckUri);
     // We can't do anything about it if it fails,
     // so we don't listen for response.
     this._deleteResource(aAckUri);
   },
 
   init: function(aOptions, aMainPushService, aServerURL) {
-    debug("init()");
+    console.debug("init()");
     this._mainPushService = aMainPushService;
     this._serverURI = aServerURL;
-    gDebuggingEnabled = prefs.get("debug");
-    prefs.observe("debug", this);
   },
 
   _retryAfterBackoff: function(aSubscriptionUri, retryAfter) {
-    debug("retryAfterBackoff()");
+    console.debug("retryAfterBackoff()");
 
     var resetRetryCount = prefs.get("http2.reset_retry_count_after_ms");
     // If it was running for some time, reset retry counter.
@@ -672,12 +638,13 @@ this.PushServiceHttp2 = {
       this._conns[aSubscriptionUri].waitingForAlarm = true;
       this._mainPushService.setAlarm(retryAfter);
     }
-      debug("Retry in " + retryAfter);
+
+    console.debug("retryAfterBackoff: Retry in", retryAfter);
   },
 
   // Close connections.
   _shutdownConnections: function(deleteInfo) {
-    debug("shutdownConnections()");
+    console.debug("shutdownConnections()");
 
     for (let subscriptionUri in this._conns) {
       if (this._conns[subscriptionUri]) {
@@ -702,20 +669,21 @@ this.PushServiceHttp2 = {
 
   // Start listening if subscriptions present.
   startConnections: function(aSubscriptions) {
-    debug("startConnections() " + aSubscriptions.length);
+    console.debug("startConnections()", aSubscriptions.length);
 
     for (let i = 0; i < aSubscriptions.length; i++) {
       let record = aSubscriptions[i];
       this._mainPushService.ensureP256dhKey(record).then(record => {
         this._startSingleConnection(record);
       }, error => {
-        debug("startConnections: Error updating record " + record.keyID);
+        console.error("startConnections: Error updating record",
+          record.keyID, error);
       });
     }
   },
 
   _startSingleConnection: function(record) {
-    debug("_startSingleConnection()");
+    console.debug("_startSingleConnection()");
     if (typeof this._conns[record.subscriptionUri] != "object") {
       this._conns[record.subscriptionUri] = {channel: null,
                                              listener: null,
@@ -730,7 +698,7 @@ this.PushServiceHttp2 = {
 
   // Start listening if subscriptions present.
   _startConnectionsWaitingForAlarm: function() {
-    debug("startConnectionsWaitingForAlarm()");
+    console.debug("startConnectionsWaitingForAlarm()");
     for (let subscriptionUri in this._conns) {
       if ((this._conns[subscriptionUri]) &&
           !this._conns[subscriptionUri].conn &&
@@ -743,7 +711,7 @@ this.PushServiceHttp2 = {
 
   // Close connection and notify apps that subscription are gone.
   _shutdownSubscription: function(aSubscriptionUri) {
-    debug("shutdownSubscriptions()");
+    console.debug("shutdownSubscriptions()");
 
     if (typeof this._conns[aSubscriptionUri] == "object") {
       if (this._conns[aSubscriptionUri].listener) {
@@ -760,7 +728,7 @@ this.PushServiceHttp2 = {
   },
 
   uninit: function() {
-    debug("uninit()");
+    console.debug("uninit()");
     this._shutdownConnections(true);
     this._mainPushService = null;
   },
@@ -769,11 +737,12 @@ this.PushServiceHttp2 = {
   request: function(action, aRecord) {
     switch (action) {
       case "register":
-        debug("register");
         return this._subscribeResource(aRecord);
      case "unregister":
         this._shutdownSubscription(aRecord.subscriptionUri);
         return this._unsubscribeResource(aRecord.subscriptionUri);
+      default:
+        return Promise.reject(new Error("Unknown request type: " + action));
     }
   },
 
@@ -801,7 +770,7 @@ this.PushServiceHttp2 = {
 
   connOnStop: function(aRequest, aSuccess,
                        aSubscriptionUri) {
-    debug("connOnStop() succeeded: " + aSuccess);
+    console.debug("connOnStop() succeeded", aSuccess);
 
     var conn = this._conns[aSubscriptionUri];
     if (!conn) {
@@ -832,7 +801,7 @@ this.PushServiceHttp2 = {
   },
 
   _pushChannelOnStop: function(aUri, aAckUri, aMessage, dh, salt, rs) {
-    debug("pushChannelOnStop() ");
+    console.debug("pushChannelOnStop()");
 
     let cryptoParams = {
       dh: dh,
@@ -847,7 +816,8 @@ this.PushServiceHttp2 = {
     )
     .then(_ => this._ackMsgRecv(aAckUri))
     .catch(err => {
-      debug("Error receiving message: " + err);
+      console.error("pushChannelOnStop: Error receiving message",
+        err);
     });
   },
 
@@ -870,14 +840,8 @@ PushRecordHttp2.prototype = Object.create(PushRecord.prototype, {
   },
 });
 
-PushRecordHttp2.prototype.toRegistration = function() {
-  let registration = PushRecord.prototype.toRegistration.call(this);
-  registration.pushReceiptEndpoint = this.pushReceiptEndpoint;
-  return registration;
-};
-
-PushRecordHttp2.prototype.toRegister = function() {
-  let register = PushRecord.prototype.toRegister.call(this);
-  register.pushReceiptEndpoint = this.pushReceiptEndpoint;
-  return register;
+PushRecordHttp2.prototype.toSubscription = function() {
+  let subscription = PushRecord.prototype.toSubscription.call(this);
+  subscription.pushReceiptEndpoint = this.pushReceiptEndpoint;
+  return subscription;
 };
diff --git a/dom/push/PushServiceWebSocket.jsm b/dom/push/PushServiceWebSocket.jsm
index 68fe4b4c5e..316b66b2b9 100644
--- a/dom/push/PushServiceWebSocket.jsm
+++ b/dom/push/PushServiceWebSocket.jsm
@@ -10,6 +10,13 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
+Cu.import("resource://gre/modules/AppConstants.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Promise.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
 const {PushDB} = Cu.import("resource://gre/modules/PushDB.jsm");
 const {PushRecord} = Cu.import("resource://gre/modules/PushRecord.jsm");
 const {
@@ -18,22 +25,16 @@ const {
   getEncryptionKeyParams,
   getEncryptionParams,
 } = Cu.import("resource://gre/modules/PushCrypto.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource://gre/modules/Promise.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
 
 XPCOMUtils.defineLazyServiceGetter(this, "gDNSService",
                                    "@mozilla.org/network/dns-service;1",
                                    "nsIDNSService");
 
-#ifdef MOZ_B2G
-XPCOMUtils.defineLazyServiceGetter(this, "gPowerManagerService",
-                                   "@mozilla.org/power/powermanagerservice;1",
-                                   "nsIPowerManagerService");
-#endif
+if (AppConstants.MOZ_B2G) {
+  XPCOMUtils.defineLazyServiceGetter(this, "gPowerManagerService",
+                                     "@mozilla.org/power/powermanagerservice;1",
+                                     "nsIPowerManagerService");
+}
 
 var threadManager = Cc["@mozilla.org/thread-manager;1"]
                       .getService(Ci.nsIThreadManager);
@@ -50,8 +51,13 @@ const prefs = new Preferences("dom.push.");
 
 this.EXPORTED_SYMBOLS = ["PushServiceWebSocket"];
 
-// Don't modify this, instead set dom.push.debug.
-var gDebuggingEnabled = true;
+XPCOMUtils.defineLazyGetter(this, "console", () => {
+  let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {});
+  return new ConsoleAPI({
+    maxLogLevelPref: "dom.push.loglevel",
+    prefix: "PushServiceWebSocket",
+  });
+});
 
 function getCryptoParams(headers) {
   if (!headers) {
@@ -74,15 +80,6 @@ function getCryptoParams(headers) {
   return {dh, salt, rs};
 }
 
-function debug(s) {
-  if (gDebuggingEnabled) {
-    dump("-*- PushServiceWebSocket.jsm: " + s + "\n");
-  }
-}
-
-// Set debug first so that all debugging actually works.
-gDebuggingEnabled = prefs.get("debug");
-
 /**
  * A proxy between the PushService and the WebSocket. The listener is used so
  * that the PushService can silence messages from the WebSocket by setting
@@ -156,6 +153,10 @@ this.PushServiceWebSocket = {
                       PushRecordWebSocket);
   },
 
+  serviceType: function() {
+    return "WebSocket";
+  },
+
   disconnect: function() {
     this._shutdownWS();
   },
@@ -164,64 +165,46 @@ this.PushServiceWebSocket = {
 
     switch (aTopic) {
     case "nsPref:changed":
-      if (aData == "dom.push.debug") {
-        gDebuggingEnabled = prefs.get("debug");
+      if (aData == "dom.push.userAgentID") {
+        this._shutdownWS();
+        this._reconnectAfterBackoff();
       }
       break;
     case "timer-callback":
       if (aSubject == this._requestTimeoutTimer) {
-        if (Object.keys(this._pendingRequests).length === 0) {
+        if (Object.keys(this._registerRequests).length === 0) {
           this._requestTimeoutTimer.cancel();
         }
 
         // Set to true if at least one request timed out.
         let requestTimedOut = false;
-        for (let channelID in this._pendingRequests) {
-          let duration = Date.now() - this._pendingRequests[channelID].ctime;
+        for (let channelID in this._registerRequests) {
+          let duration = Date.now() - this._registerRequests[channelID].ctime;
           // If any of the registration requests time out, all the ones after it
           // also made to fail, since we are going to be disconnecting the
           // socket.
           if (requestTimedOut || duration > this._requestTimeout) {
-            debug("Request timeout: Removing " + channelID);
             requestTimedOut = true;
-            this._pendingRequests[channelID]
-              .reject({status: 0, error: "TimeoutError"});
+            this._registerRequests[channelID]
+              .reject(new Error("Register request timed out for channel ID " +
+                  channelID));
 
-            delete this._pendingRequests[channelID];
+            delete this._registerRequests[channelID];
           }
         }
 
         // The most likely reason for a registration request timing out is
         // that the socket has disconnected. Best to reconnect.
         if (requestTimedOut) {
-          this._shutdownWS();
-          this._reconnectAfterBackoff();
+          this._reconnect();
         }
       }
       break;
     }
   },
 
-  checkServerURI: function(serverURL) {
-    if (!serverURL) {
-      debug("No dom.push.serverURL found!");
-      return;
-    }
-
-    let uri;
-    try {
-      uri = Services.io.newURI(serverURL, null, null);
-    } catch(e) {
-      debug("Error creating valid URI from dom.push.serverURL (" +
-            serverURL + ")");
-      return null;
-    }
-
-    if (uri.scheme !== "wss") {
-      debug("Unsupported websocket scheme " + uri.scheme);
-      return null;
-    }
-    return uri;
+  validServerURI: function(serverURI) {
+    return serverURI.scheme == "ws" || serverURI.scheme == "wss";
   },
 
   get _UAID() {
@@ -230,16 +213,16 @@ this.PushServiceWebSocket = {
 
   set _UAID(newID) {
     if (typeof(newID) !== "string") {
-      debug("Got invalid, non-string UAID " + newID +
-            ". Not updating userAgentID");
+      console.warn("Got invalid, non-string UAID", newID,
+        "Not updating userAgentID");
       return;
     }
-    debug("New _UAID: " + newID);
+    console.debug("New _UAID", newID);
     prefs.set("userAgentID", newID);
   },
 
   _ws: null,
-  _pendingRequests: {},
+  _registerRequests: {},
   _currentState: STATE_SHUT_DOWN,
   _requestTimeout: 0,
   _requestTimeoutTimer: null,
@@ -301,16 +284,17 @@ this.PushServiceWebSocket = {
    */
   _wsSendMessage: function(msg) {
     if (!this._ws) {
-      debug("No WebSocket initialized. Cannot send a message.");
+      console.warn("wsSendMessage: No WebSocket initialized.",
+        "Cannot send a message");
       return;
     }
     msg = JSON.stringify(msg);
-    debug("Sending message: " + msg);
+    console.debug("wsSendMessage: Sending message", msg);
     this._ws.sendMsg(msg);
   },
 
   init: function(options, mainPushService, serverURI) {
-    debug("init()");
+    console.debug("init()");
 
     this._mainPushService = mainPushService;
     this._serverURI = serverURI;
@@ -337,15 +321,21 @@ this.PushServiceWebSocket = {
     this._requestTimeout = prefs.get("requestTimeout");
     this._adaptiveEnabled = prefs.get('adaptive.enabled');
     this._upperLimit = prefs.get('adaptive.upperLimit');
-    gDebuggingEnabled = prefs.get("debug");
-    prefs.observe("debug", this);
   },
 
-  _shutdownWS: function() {
-    debug("shutdownWS()");
+  _reconnect: function () {
+    console.debug("reconnect()");
+    this._shutdownWS(false);
+    this._reconnectAfterBackoff();
+  },
+
+  _shutdownWS: function(shouldCancelPending = true) {
+    console.debug("shutdownWS()");
     this._currentState = STATE_SHUT_DOWN;
     this._willBeWokenUpByUDP = false;
 
+    prefs.ignore("userAgentID", this);
+
     if (this._wsListener) {
       this._wsListener._pushService = null;
     }
@@ -358,10 +348,12 @@ this.PushServiceWebSocket = {
     if (this._mainPushService) {
       this._mainPushService.stopAlarm();
     } else {
-      dump("This should not happend");
+      console.error("shutdownWS: Uninitialized push service");
     }
 
-    this._cancelPendingRequests();
+    if (shouldCancelPending) {
+      this._cancelRegisterRequests();
+    }
 
     if (this._notifyRequestQueue) {
       this._notifyRequestQueue();
@@ -370,7 +362,6 @@ this.PushServiceWebSocket = {
   },
 
   uninit: function() {
-
     if (this._udpServer) {
       this._udpServer.close();
       this._udpServer = null;
@@ -408,7 +399,7 @@ this.PushServiceWebSocket = {
    * cancelled), so the connection won't be reset.
    */
   _reconnectAfterBackoff: function() {
-    debug("reconnectAfterBackoff()");
+    console.debug("reconnectAfterBackoff()");
     //Calculate new ping interval
     this._calculateAdaptivePing(true /* wsWentDown */);
 
@@ -419,11 +410,12 @@ this.PushServiceWebSocket = {
 
     this._retryFailCount++;
 
-    debug("Retry in " + retryTimeout + " Try number " + this._retryFailCount);
+    console.debug("reconnectAfterBackoff: Retry in", retryTimeout,
+      "Try number", this._retryFailCount);
     if (this._mainPushService) {
       this._mainPushService.setAlarm(retryTimeout);
     } else {
-      dump("This should not happend");
+      console.error("reconnectAfterBackoff: Uninitialized push service");
     }
   },
 
@@ -453,22 +445,22 @@ this.PushServiceWebSocket = {
    *
    */
   _calculateAdaptivePing: function(wsWentDown) {
-    debug('_calculateAdaptivePing()');
+    console.debug("_calculateAdaptivePing()");
     if (!this._adaptiveEnabled) {
-      debug('Adaptive ping is disabled');
+      console.debug("calculateAdaptivePing: Adaptive ping is disabled");
       return;
     }
 
     if (this._retryFailCount > 0) {
-      debug('Push has failed to connect to the Push Server ' +
-        this._retryFailCount + ' times. ' +
-        'Do not calculate a new pingInterval now');
+      console.warn("calculateAdaptivePing: Push has failed to connect to the",
+        "Push Server", this._retryFailCount, "times. Do not calculate a new",
+        "pingInterval now");
       return;
     }
 
     if (!this._recalculatePing && !wsWentDown) {
-      debug('We do not need to recalculate the ping now, based on previous ' +
-            'data');
+      console.debug("calculateAdaptivePing: We do not need to recalculate the",
+        "ping now, based on previous data");
       return;
     }
 
@@ -477,15 +469,15 @@ this.PushServiceWebSocket = {
 
     if (ns.ip) {
       // mobile
-      debug('mobile');
+      console.debug("calculateAdaptivePing: mobile");
       let oldNetwork = prefs.get('adaptive.mobile');
       let newNetwork = 'mobile-' + ns.mcc + '-' + ns.mnc;
 
       // Mobile networks differ, reset all intervals and pings
       if (oldNetwork !== newNetwork) {
         // Network differ, reset all values
-        debug('Mobile networks differ. Old network is ' + oldNetwork +
-              ' and new is ' + newNetwork);
+        console.debug("calculateAdaptivePing: Mobile networks differ. Old",
+          "network is", oldNetwork, "and new is", newNetwork);
         prefs.set('adaptive.mobile', newNetwork);
         //We reset the upper bound member
         this._recalculatePing = true;
@@ -504,7 +496,7 @@ this.PushServiceWebSocket = {
 
     } else {
       // wifi
-      debug('wifi');
+      console.debug("calculateAdaptivePing: wifi");
       prefs.set('pingInterval', prefs.get('pingInterval.wifi'));
       this._lastGoodPingInterval = prefs.get('adaptive.lastGoodPingInterval.wifi');
     }
@@ -513,7 +505,8 @@ this.PushServiceWebSocket = {
     let lastTriedPingInterval = prefs.get('pingInterval');
 
     if (wsWentDown) {
-      debug('The WebSocket was disconnected, calculating next ping');
+      console.debug("calculateAdaptivePing: The WebSocket was disconnected.",
+        "Calculating next ping");
 
       // If we have not tried this pingInterval yet, initialize
       this._pingIntervalRetryTimes[lastTriedPingInterval] =
@@ -522,8 +515,9 @@ this.PushServiceWebSocket = {
        // Try the pingInterval at least 3 times, just to be sure that the
        // calculated interval is not valid.
        if (this._pingIntervalRetryTimes[lastTriedPingInterval] < 2) {
-         debug('pingInterval= ' + lastTriedPingInterval + ' tried only ' +
-           this._pingIntervalRetryTimes[lastTriedPingInterval] + ' times');
+         console.debug("calculateAdaptivePing: pingInterval=",
+          lastTriedPingInterval, "tried only",
+          this._pingIntervalRetryTimes[lastTriedPingInterval], "times");
          return;
        }
 
@@ -534,32 +528,33 @@ this.PushServiceWebSocket = {
       // optimum, so stop calculating.
       if (nextPingInterval - this._lastGoodPingInterval <
           prefs.get('adaptive.gap')) {
-        debug('We have reached the gap, we have finished the calculation');
-        debug('nextPingInterval=' + nextPingInterval);
-        debug('lastGoodPing=' + this._lastGoodPingInterval);
+        console.debug("calculateAdaptivePing: We have reached the gap, we",
+          "have finished the calculation. nextPingInterval=", nextPingInterval,
+          "lastGoodPing=", this._lastGoodPingInterval);
         nextPingInterval = this._lastGoodPingInterval;
         this._recalculatePing = false;
       } else {
-        debug('We need to calculate next time');
+        console.debug("calculateAdaptivePing: We need to calculate next time");
         this._recalculatePing = true;
       }
 
     } else {
-      debug('The WebSocket is still up');
+      console.debug("calculateAdaptivePing: The WebSocket is still up");
       this._lastGoodPingInterval = lastTriedPingInterval;
       nextPingInterval = Math.floor(lastTriedPingInterval * 1.5);
     }
 
     // Check if we have reached the upper limit
     if (this._upperLimit < nextPingInterval) {
-      debug('Next ping will be bigger than the configured upper limit, ' +
-            'capping interval');
+      console.debug("calculateAdaptivePing: Next ping will be bigger than the",
+        "configured upper limit, capping interval");
       this._recalculatePing = false;
       this._lastGoodPingInterval = lastTriedPingInterval;
       nextPingInterval = lastTriedPingInterval;
     }
 
-    debug('Setting the pingInterval to ' + nextPingInterval);
+    console.debug("calculateAdaptivePing: Setting the pingInterval to",
+      nextPingInterval);
     prefs.set('pingInterval', nextPingInterval);
 
     //Save values for our current network
@@ -576,11 +571,12 @@ this.PushServiceWebSocket = {
 
   _makeWebSocket: function(uri) {
     if (!prefs.get("connection.enabled")) {
-      debug("_makeWebSocket: connection.enabled is not set to true. Aborting.");
+      console.warn("makeWebSocket: connection.enabled is not set to true.",
+        "Aborting.");
       return null;
     }
     if (Services.io.offline) {
-      debug("Network is offline.");
+      console.warn("makeWebSocket: Network is offline.");
       return null;
     }
     let socket = Cc["@mozilla.org/network/protocol;1?name=wss"]
@@ -596,10 +592,10 @@ this.PushServiceWebSocket = {
   },
 
   _beginWSSetup: function() {
-    debug("beginWSSetup()");
+    console.debug("beginWSSetup()");
     if (this._currentState != STATE_SHUT_DOWN) {
-      debug("_beginWSSetup: Not in shutdown state! Current state " +
-            this._currentState);
+      console.error("_beginWSSetup: Not in shutdown state! Current state",
+        this._currentState);
       return;
     }
 
@@ -618,7 +614,7 @@ this.PushServiceWebSocket = {
     }
     this._ws = socket.QueryInterface(Ci.nsIWebSocketChannel);
 
-    debug("serverURL: " + uri.spec);
+    console.debug("beginWSSetup: Connecting to", uri.spec);
     this._wsListener = new PushWebSocketListener(this);
     this._ws.protocol = "push-notification";
 
@@ -629,20 +625,24 @@ this.PushServiceWebSocket = {
       this._acquireWakeLock();
       this._currentState = STATE_WAITING_FOR_WS_START;
     } catch(e) {
-      debug("Error opening websocket. asyncOpen failed!");
-      this._shutdownWS();
-      this._reconnectAfterBackoff();
+      console.error("beginWSSetup: Error opening websocket.",
+        "asyncOpen failed", e);
+      this._reconnect();
     }
   },
 
   connect: function(records) {
-    debug("connect");
+    console.debug("connect()");
     // Check to see if we need to do anything.
     if (records.length > 0) {
       this._beginWSSetup();
     }
   },
 
+  isConnected: function() {
+    return !!this._ws;
+  },
+
   /**
    * There is only one alarm active at any time. This alarm has 3 intervals
    * corresponding to 3 tasks.
@@ -673,9 +673,9 @@ this.PushServiceWebSocket = {
     // Conditions are arranged in decreasing specificity.
     // i.e. when _waitingForPong is true, other conditions are also true.
     if (this._waitingForPong) {
-      debug("Did not receive pong in time. Reconnecting WebSocket.");
-      this._shutdownWS();
-      this._reconnectAfterBackoff();
+      console.debug("onAlarmFired: Did not receive pong in time.",
+        "Reconnecting WebSocket");
+      this._reconnect();
     }
     else if (this._currentState == STATE_READY) {
       // Send a ping.
@@ -693,7 +693,7 @@ this.PushServiceWebSocket = {
       this._mainPushService.setAlarm(prefs.get("requestTimeout"));
     }
     else if (this._mainPushService && this._mainPushService._alarmID !== null) {
-      debug("reconnect alarm fired.");
+      console.debug("onAlarmFired: reconnect alarm fired");
       // Reconnect after back-off.
       // The check for a non-null _alarmID prevents a situation where the alarm
       // fires, but _shutdownWS() is called from another code-path (e.g.
@@ -712,19 +712,22 @@ this.PushServiceWebSocket = {
   },
 
   _acquireWakeLock: function() {
-#ifdef MOZ_B2G
+    if (!AppConstants.MOZ_B2G) {
+      return;
+    }
+
     // Disable the wake lock on non-B2G platforms to work around bug 1154492.
     if (!this._socketWakeLock) {
-      debug("Acquiring Socket Wakelock");
+      console.debug("acquireWakeLock: Acquiring Socket Wakelock");
       this._socketWakeLock = gPowerManagerService.newWakeLock("cpu");
     }
     if (!this._socketWakeLockTimer) {
-      debug("Creating Socket WakeLock Timer");
+      console.debug("acquireWakeLock: Creating Socket WakeLock Timer");
       this._socketWakeLockTimer = Cc["@mozilla.org/timer;1"]
                                     .createInstance(Ci.nsITimer);
     }
 
-    debug("Setting Socket WakeLock Timer");
+    console.debug("acquireWakeLock: Setting Socket WakeLock Timer");
     this._socketWakeLockTimer
       .initWithCallback(this._releaseWakeLock.bind(this),
                         // Allow the same time for socket setup as we do for
@@ -733,12 +736,14 @@ this.PushServiceWebSocket = {
                         // to sleep just as the socket connected.
                         this._requestTimeout + 1000,
                         Ci.nsITimer.TYPE_ONE_SHOT);
-#endif
   },
 
   _releaseWakeLock: function() {
-#ifdef MOZ_B2G
-    debug("Releasing Socket WakeLock");
+    if (!AppConstants.MOZ_B2G) {
+      return;
+    }
+
+    console.debug("releaseWakeLock: Releasing Socket WakeLock");
     if (this._socketWakeLockTimer) {
       this._socketWakeLockTimer.cancel();
     }
@@ -746,74 +751,78 @@ this.PushServiceWebSocket = {
       this._socketWakeLock.unlock();
       this._socketWakeLock = null;
     }
-#endif
   },
 
   /**
    * Protocol handler invoked by server message.
    */
   _handleHelloReply: function(reply) {
-    debug("handleHelloReply()");
+    console.debug("handleHelloReply()");
     if (this._currentState != STATE_WAITING_FOR_HELLO) {
-      debug("Unexpected state " + this._currentState +
-            "(expected STATE_WAITING_FOR_HELLO)");
+      console.error("handleHelloReply: Unexpected state", this._currentState,
+        "(expected STATE_WAITING_FOR_HELLO)");
       this._shutdownWS();
       return;
     }
 
     if (typeof reply.uaid !== "string") {
-      debug("No UAID received or non string UAID received");
+      console.error("handleHelloReply: Received invalid UAID", reply.uaid);
       this._shutdownWS();
       return;
     }
 
     if (reply.uaid === "") {
-      debug("Empty UAID received!");
+      console.error("handleHelloReply: Received empty UAID");
       this._shutdownWS();
       return;
     }
 
     // To avoid sticking extra large values sent by an evil server into prefs.
     if (reply.uaid.length > 128) {
-      debug("UAID received from server was too long: " +
-            reply.uaid);
+      console.error("handleHelloReply: UAID received from server was too long",
+        reply.uaid);
       this._shutdownWS();
       return;
     }
 
-    let notifyRequestQueue = () => {
+    let sendRequests = () => {
       if (this._notifyRequestQueue) {
         this._notifyRequestQueue();
         this._notifyRequestQueue = null;
       }
+      this._sendRegisterRequests();
     };
 
     function finishHandshake() {
       this._UAID = reply.uaid;
       this._currentState = STATE_READY;
+      prefs.observe("userAgentID", this);
+
       this._dataEnabled = !!reply.use_webpush;
       if (this._dataEnabled) {
         this._mainPushService.getAllUnexpired().then(records =>
           Promise.all(records.map(record =>
             this._mainPushService.ensureP256dhKey(record).catch(error => {
-              debug("finishHandshake: Error updating record " + record.keyID);
+              console.error("finishHandshake: Error updating record",
+                record.keyID, error);
             })
           ))
-        ).then(notifyRequestQueue);
+        ).then(sendRequests);
       } else {
-        notifyRequestQueue();
+        sendRequests();
       }
     }
 
     // By this point we've got a UAID from the server that we are ready to
     // accept.
     //
-    // If we already had a valid UAID before, we have to ask apps to
-    // re-register.
-    if (this._UAID && this._UAID != reply.uaid) {
-      debug("got new UAID: all re-register");
+    // We unconditionally drop all existing registrations and notify service
+    // workers if we receive a new UAID. This ensures we expunge all stale
+    // registrations if the `userAgentID` pref is reset.
+    if (this._UAID != reply.uaid) {
+      console.debug("handleHelloReply: Received new UAID");
 
-      this._mainPushService.dropRegistrations()
+      this._mainPushService.dropUnexpiredRegistrations()
           .then(finishHandshake.bind(this));
 
       return;
@@ -827,15 +836,15 @@ this.PushServiceWebSocket = {
    * Protocol handler invoked by server message.
    */
   _handleRegisterReply: function(reply) {
-    debug("handleRegisterReply()");
+    console.debug("handleRegisterReply()");
     if (typeof reply.channelID !== "string" ||
-        typeof this._pendingRequests[reply.channelID] !== "object") {
+        typeof this._registerRequests[reply.channelID] !== "object") {
       return;
     }
 
-    let tmp = this._pendingRequests[reply.channelID];
-    delete this._pendingRequests[reply.channelID];
-    if (Object.keys(this._pendingRequests).length === 0 &&
+    let tmp = this._registerRequests[reply.channelID];
+    delete this._registerRequests[reply.channelID];
+    if (Object.keys(this._registerRequests).length === 0 &&
         this._requestTimeoutTimer) {
       this._requestTimeoutTimer.cancel();
     }
@@ -845,9 +854,7 @@ this.PushServiceWebSocket = {
         Services.io.newURI(reply.pushEndpoint, null, null);
       }
       catch (e) {
-        debug("Invalid pushEndpoint " + reply.pushEndpoint);
-        tmp.reject({state: 0, error: "Invalid pushEndpoint " +
-                                     reply.pushEndpoint});
+        tmp.reject(new Error("Invalid push endpoint: " + reply.pushEndpoint));
         return;
       }
 
@@ -860,20 +867,31 @@ this.PushServiceWebSocket = {
         quota: tmp.record.maxQuota,
         ctime: Date.now(),
       });
-      dump("PushWebSocket " +  JSON.stringify(record));
       Services.telemetry.getHistogramById("PUSH_API_SUBSCRIBE_WS_TIME").add(Date.now() - tmp.ctime);
       tmp.resolve(record);
     } else {
-      tmp.reject(reply);
+      console.error("handleRegisterReply: Unexpected server response", reply);
+      tmp.reject(new Error("Wrong status code for register reply: " +
+        reply.status));
     }
   },
 
   _handleDataUpdate: function(update) {
     let promise;
     if (typeof update.channelID != "string") {
-      debug("handleDataUpdate: Discarding message without channel ID");
+      console.warn("handleDataUpdate: Discarding update without channel ID",
+        update);
       return;
     }
+    // Unconditionally ack the update. This is important because the Push
+    // server requires the client to ack all outstanding updates before
+    // resuming delivery. However, the server doesn't verify the encryption
+    // params, and can't ensure that an update is encrypted correctly because
+    // it doesn't have the private key. Thus, if we only acked valid updates,
+    // it would be possible for a single invalid one to block delivery of all
+    // subsequent updates. A nack would be more appropriate for this case, but
+    // the protocol doesn't currently support them.
+    this._sendAck(update.channelID, update.version);
     if (typeof update.data != "string") {
       promise = this._mainPushService.receivedPushMessage(
         update.channelID,
@@ -884,7 +902,8 @@ this.PushServiceWebSocket = {
     } else {
       let params = getCryptoParams(update.headers);
       if (!params) {
-        debug("handleDataUpdate: Discarding invalid encrypted message");
+        console.warn("handleDataUpdate: Discarding invalid encrypted message",
+          update);
         return;
       }
       let message = base64UrlDecode(update.data);
@@ -895,8 +914,8 @@ this.PushServiceWebSocket = {
         record => record
       );
     }
-    promise.then(() => this._sendAck(update.channelID)).catch(err => {
-      debug("handleDataUpdate: Error delivering message: " + err);
+    promise.catch(err => {
+      console.error("handleDataUpdate: Error delivering message", err);
     });
   },
 
@@ -904,28 +923,29 @@ this.PushServiceWebSocket = {
    * Protocol handler invoked by server message.
    */
   _handleNotificationReply: function(reply) {
-    debug("handleNotificationReply()");
+    console.debug("handleNotificationReply()");
     if (this._dataEnabled) {
       this._handleDataUpdate(reply);
       return;
     }
 
     if (typeof reply.updates !== 'object') {
-      debug("No 'updates' field in response. Type = " + typeof reply.updates);
+      console.warn("handleNotificationReply: Missing updates", reply.updates);
       return;
     }
 
-    debug("Reply updates: " + reply.updates.length);
+    console.debug("handleNotificationReply: Got updates", reply.updates);
     for (let i = 0; i < reply.updates.length; i++) {
       let update = reply.updates[i];
-      debug("Update: " + update.channelID + ": " + update.version);
+      console.debug("handleNotificationReply: Handling update", update);
       if (typeof update.channelID !== "string") {
-        debug("Invalid update literal at index " + i);
+        console.debug("handleNotificationReply: Invalid update at index",
+          i, update);
         continue;
       }
 
       if (update.version === undefined) {
-        debug("update.version does not exist");
+        console.debug("handleNotificationReply: Missing version", update);
         continue;
       }
 
@@ -946,7 +966,7 @@ this.PushServiceWebSocket = {
 
   // FIXME(nsm): batch acks for efficiency reasons.
   _sendAck: function(channelID, version) {
-    debug("sendAck()");
+    console.debug("sendAck()");
     var data = {messageType: 'ack',
                 updates: [{channelID: channelID,
                            version: version}]
@@ -962,9 +982,9 @@ this.PushServiceWebSocket = {
   },
 
   request: function(action, record) {
-    debug("request() " + action);
+    console.debug("request() ", action);
 
-    if (Object.keys(this._pendingRequests).length === 0) {
+    if (Object.keys(this._registerRequests).length === 0) {
       // start the timer since we now have at least one request
       if (!this._requestTimeoutTimer) {
         this._requestTimeoutTimer = Cc["@mozilla.org/timer;1"]
@@ -980,7 +1000,7 @@ this.PushServiceWebSocket = {
                   messageType: action};
 
       return new Promise((resolve, reject) => {
-        this._pendingRequests[data.channelID] = {record: record,
+        this._registerRequests[data.channelID] = {record: record,
                                                  resolve: resolve,
                                                  reject: reject,
                                                  ctime: Date.now()
@@ -1007,8 +1027,8 @@ this.PushServiceWebSocket = {
   _queueStart: Promise.resolve(),
   _notifyRequestQueue: null,
   _queue: null,
-  _enqueue: function(op, errop) {
-    debug("enqueue");
+  _enqueue: function(op) {
+    console.debug("enqueue()");
     if (!this._queue) {
       this._queue = this._queueStart;
     }
@@ -1020,7 +1040,7 @@ this.PushServiceWebSocket = {
   _send(data) {
     if (this._currentState == STATE_READY) {
       if (data.messageType != "register" ||
-        typeof this._pendingRequests[data.channelID] == "object") {
+        typeof this._registerRequests[data.channelID] == "object") {
 
         // check if request has not been cancelled
         this._wsSendMessage(data);
@@ -1028,18 +1048,29 @@ this.PushServiceWebSocket = {
     }
   },
 
+  _sendRegisterRequests() {
+    this._enqueue(_ => Promise.all(Object.keys(this._registerRequests).map(channelID =>
+      this._send({
+        messageType: "register",
+        channelID: channelID,
+      })
+    )));
+  },
+
   _queueRequest(data) {
-    if (this._currentState != STATE_READY) {
-      if (!this._notifyRequestQueue) {
+    if (data.messageType != "register") {
+      if (this._currentState != STATE_READY && !this._notifyRequestQueue) {
         let promise = new Promise((resolve, reject) => {
           this._notifyRequestQueue = resolve;
         });
         this._enqueue(_ => promise);
       }
 
+      this._enqueue(_ => this._send(data));
+    } else if (this._currentState == STATE_READY) {
+      this._send(data);
     }
 
-    this._enqueue(_ => this._send(data));
     if (!this._ws) {
       // This will end up calling notifyRequestQueue().
       this._beginWSSetup();
@@ -1053,35 +1084,33 @@ this.PushServiceWebSocket = {
   },
 
   _receivedUpdate: function(aChannelID, aLatestVersion) {
-    debug("Updating: " + aChannelID + " -> " + aLatestVersion);
+    console.debug("receivedUpdate: Updating", aChannelID, "->", aLatestVersion);
 
     this._mainPushService.receivedPushMessage(aChannelID, null, null, record => {
       if (record.version === null ||
           record.version < aLatestVersion) {
-        debug("Version changed for " + aChannelID + ": " + aLatestVersion);
+        console.debug("receivedUpdate: Version changed for", aChannelID,
+          aLatestVersion);
         record.version = aLatestVersion;
         return record;
       }
-      debug("No significant version change for " + aChannelID + ": " +
-            aLatestVersion);
+      console.debug("receivedUpdate: No significant version change for",
+        aChannelID, aLatestVersion);
       return null;
     });
   },
 
   // begin Push protocol handshake
   _wsOnStart: function(context) {
-    debug("wsOnStart()");
+    console.debug("wsOnStart()");
     this._releaseWakeLock();
 
     if (this._currentState != STATE_WAITING_FOR_WS_START) {
-      debug("NOT in STATE_WAITING_FOR_WS_START. Current state " +
-            this._currentState + ". Skipping");
+      console.error("wsOnStart: NOT in STATE_WAITING_FOR_WS_START. Current",
+        "state", this._currentState, "Skipping");
       return;
     }
 
-    // Since we've had a successful connection reset the retry fail count.
-    this._retryFailCount = 0;
-
     let data = {
       messageType: "hello",
       use_webpush: true,
@@ -1091,14 +1120,6 @@ this.PushServiceWebSocket = {
       data.uaid = this._UAID;
     }
 
-    function sendHelloMessage(ids) {
-      // On success, ids is an array, on error its not.
-      data.channelIDs = ids.map ?
-                           ids.map(function(el) { return el.channelID; }) : [];
-      this._wsSendMessage(data);
-      this._currentState = STATE_WAITING_FOR_HELLO;
-    }
-
     this._networkInfo.getNetworkState((networkState) => {
       if (networkState.ip) {
         // Opening an available UDP port.
@@ -1117,9 +1138,8 @@ this.PushServiceWebSocket = {
         };
       }
 
-      this._mainPushService.getAllUnexpired()
-        .then(sendHelloMessage.bind(this),
-              sendHelloMessage.bind(this));
+      this._wsSendMessage(data);
+      this._currentState = STATE_WAITING_FOR_HELLO;
     });
   },
 
@@ -1131,24 +1151,21 @@ this.PushServiceWebSocket = {
    * NS_BASE_STREAM_CLOSED, even on a successful close.
    */
   _wsOnStop: function(context, statusCode) {
-    debug("wsOnStop()");
+    console.debug("wsOnStop()");
     this._releaseWakeLock();
 
     if (statusCode != Cr.NS_OK &&
         !(statusCode == Cr.NS_BASE_STREAM_CLOSED && this._willBeWokenUpByUDP)) {
-      debug("Socket error " + statusCode);
-      this._reconnectAfterBackoff();
+      console.debug("wsOnStop: Socket error", statusCode);
+      this._reconnect();
+      return;
     }
 
-    // Bug 896919. We always shutdown the WebSocket, even if we need to
-    // reconnect. This works because _reconnectAfterBackoff() is "async"
-    // (there is a minimum delay of the pref retryBaseInterval, which by default
-    // is 5000ms), so that function will open the WebSocket again.
     this._shutdownWS();
   },
 
   _wsOnMessageAvailable: function(context, message) {
-    debug("wsOnMessageAvailable() " + message);
+    console.debug("wsOnMessageAvailable()", message);
 
     this._waitingForPong = false;
 
@@ -1156,23 +1173,21 @@ this.PushServiceWebSocket = {
     try {
       reply = JSON.parse(message);
     } catch(e) {
-      debug("Parsing JSON failed. text : " + message);
+      console.warn("wsOnMessageAvailable: Invalid JSON", message, e);
       return;
     }
 
-    // If we are not waiting for a hello message, reset the retry fail count
-    if (this._currentState != STATE_WAITING_FOR_HELLO) {
-      debug('Reseting _retryFailCount and _pingIntervalRetryTimes');
-      this._retryFailCount = 0;
-      this._pingIntervalRetryTimes = {};
-    }
+    // If we receive a message, we know the connection succeeded. Reset the
+    // connection attempt and ping interval counters.
+    this._retryFailCount = 0;
+    this._pingIntervalRetryTimes = {};
 
     let doNotHandle = false;
     if ((message === '{}') ||
         (reply.messageType === undefined) ||
         (reply.messageType === "ping") ||
         (typeof reply.messageType != "string")) {
-      debug('Pong received');
+      console.debug("wsOnMessageAvailable: Pong received");
       this._calculateAdaptivePing(false);
       doNotHandle = true;
     }
@@ -1196,15 +1211,16 @@ this.PushServiceWebSocket = {
                       reply.messageType.slice(1).toLowerCase();
 
     if (handlers.indexOf(handlerName) == -1) {
-      debug("No whitelisted handler " + handlerName + ". messageType: " +
-            reply.messageType);
+      console.warn("wsOnMessageAvailable: No whitelisted handler", handlerName,
+        "for message", reply.messageType);
       return;
     }
 
     let handler = "_handle" + handlerName + "Reply";
 
     if (typeof this[handler] !== "function") {
-      debug("Handler whitelisted but not implemented! " + handler);
+      console.warn("wsOnMessageAvailable: Handler", handler,
+        "whitelisted but not implemented");
       return;
     }
 
@@ -1221,24 +1237,24 @@ this.PushServiceWebSocket = {
    * and stop reconnecting in _wsOnStop().
    */
   _wsOnServerClose: function(context, aStatusCode, aReason) {
-    debug("wsOnServerClose() " + aStatusCode + " " + aReason);
+    console.debug("wsOnServerClose()", aStatusCode, aReason);
 
     // Switch over to UDP.
     if (aStatusCode == kUDP_WAKEUP_WS_STATUS_CODE) {
-      debug("Server closed with promise to wake up");
+      console.debug("wsOnServerClose: Server closed with promise to wake up");
       this._willBeWokenUpByUDP = true;
       // TODO: there should be no pending requests
     }
   },
 
   /**
-   * Rejects all pending requests with errors.
+   * Rejects all pending register requests with errors.
    */
-  _cancelPendingRequests: function() {
-    for (let channelID in this._pendingRequests) {
-      let request = this._pendingRequests[channelID];
-      delete this._pendingRequests[channelID];
-      request.reject({status: 0, error: "AbortError"});
+  _cancelRegisterRequests: function() {
+    for (let channelID in this._registerRequests) {
+      let request = this._registerRequests[channelID];
+      delete this._registerRequests[channelID];
+      request.reject(new Error("Register request aborted"));
     }
   },
 
@@ -1251,15 +1267,15 @@ this.PushServiceWebSocket = {
    * This method should be called only if the device is on a mobile network!
    */
   _listenForUDPWakeup: function() {
-    debug("listenForUDPWakeup()");
+    console.debug("listenForUDPWakeup()");
 
     if (this._udpServer) {
-      debug("UDP Server already running");
+      console.warn("listenForUDPWakeup: UDP Server already running");
       return;
     }
 
     if (!prefs.get("udp.wakeupEnabled")) {
-      debug("UDP support disabled");
+      console.debug("listenForUDPWakeup: UDP support disabled");
       return;
     }
 
@@ -1270,7 +1286,7 @@ this.PushServiceWebSocket = {
     this._udpServer = socket.QueryInterface(Ci.nsIUDPSocket);
     this._udpServer.init(-1, false, Services.scriptSecurityManager.getSystemPrincipal());
     this._udpServer.asyncListen(this);
-    debug("listenForUDPWakeup listening on " + this._udpServer.port);
+    console.debug("listenForUDPWakeup: Listening on", this._udpServer.port);
 
     return this._udpServer.port;
   },
@@ -1280,7 +1296,8 @@ this.PushServiceWebSocket = {
    * reconnect the WebSocket and get the actual data.
    */
   onPacketReceived: function(aServ, aMessage) {
-    debug("Recv UDP datagram on port: " + this._udpServer.port);
+    console.debug("onPacketReceived: Recv UDP datagram on port",
+      this._udpServer.port);
     this._beginWSSetup();
   },
 
@@ -1291,22 +1308,24 @@ this.PushServiceWebSocket = {
    * notifications.
    */
   onStopListening: function(aServ, aStatus) {
-    debug("UDP Server socket was shutdown. Status: " + aStatus);
+    console.debug("onStopListening: UDP Server socket was shutdown. Status",
+      aStatus);
     this._udpServer = undefined;
     this._beginWSSetup();
   },
 };
 
-let PushNetworkInfo = {
+var PushNetworkInfo = {
   /**
    * Returns information about MCC-MNC and the IP of the current connection.
    */
   getNetworkInformation: function() {
-    debug("getNetworkInformation()");
+    console.debug("PushNetworkInfo: getNetworkInformation()");
 
     try {
       if (!prefs.get("udp.wakeupEnabled")) {
-        debug("UDP support disabled, we do not send any carrier info");
+        console.debug("getNetworkInformation: UDP support disabled, we do not",
+          "send any carrier info");
         throw new Error("UDP disabled");
       }
 
@@ -1325,7 +1344,7 @@ let PushNetworkInfo = {
         let icc = iccService.getIccByServiceId(clientId);
         let iccInfo = icc && icc.iccInfo;
         if (iccInfo) {
-          debug("Running on mobile data");
+          console.debug("getNetworkInformation: Running on mobile data");
 
           let ips = {};
           let prefixLengths = {};
@@ -1339,10 +1358,11 @@ let PushNetworkInfo = {
         }
       }
     } catch (e) {
-      debug("Error recovering mobile network information: " + e);
+      console.error("getNetworkInformation: Error recovering mobile network",
+        "information", e);
     }
 
-    debug("Running on wifi");
+    console.debug("getNetworkInformation: Running on wifi");
     return {
       mcc: 0,
       mnc: 0,
@@ -1356,7 +1376,7 @@ let PushNetworkInfo = {
    * with an IP, and optionally a netid).
    */
   getNetworkState: function(callback) {
-    debug("getNetworkState()");
+    console.debug("PushNetworkInfo: getNetworkState()");
 
     if (typeof callback !== 'function') {
       throw new Error("No callback method. Aborting push agent !");
@@ -1366,7 +1386,7 @@ let PushNetworkInfo = {
 
     if (networkInfo.ip) {
       this._getMobileNetworkId(networkInfo, function(netid) {
-        debug("Recovered netID = " + netid);
+        console.debug("getNetworkState: Recovered netID", netid);
         callback({
           mcc: networkInfo.mcc,
           mnc: networkInfo.mnc,
@@ -1388,22 +1408,21 @@ let PushNetworkInfo = {
    *        Callback function to invoke with the netid or null if not found
    */
   _getMobileNetworkId: function(networkInfo, callback) {
+    console.debug("PushNetworkInfo: getMobileNetworkId()");
     if (typeof callback !== 'function') {
       return;
     }
 
     function queryDNSForDomain(domain) {
-      debug("[_getMobileNetworkId:queryDNSForDomain] Querying DNS for " +
-        domain);
+      console.debug("queryDNSForDomain: Querying DNS for", domain);
       let netIDDNSListener = {
         onLookupComplete: function(aRequest, aRecord, aStatus) {
           if (aRecord) {
             let netid = aRecord.getNextAddrAsString();
-            debug("[_getMobileNetworkId:queryDNSForDomain] NetID found: " +
-              netid);
+            console.debug("queryDNSForDomain: NetID found", netid);
             callback(netid);
           } else {
-            debug("[_getMobileNetworkId:queryDNSForDomain] NetID not found");
+            console.debug("queryDNSForDomain: NetID not found");
             callback(null);
           }
         }
@@ -1413,7 +1432,7 @@ let PushNetworkInfo = {
       return [];
     }
 
-    debug("[_getMobileNetworkId:queryDNSForDomain] Getting mobile network ID");
+    console.debug("getMobileNetworkId: Getting mobile network ID");
 
     let netidAddress = "wakeup.mnc" + ("00" + networkInfo.mnc).slice(-3) +
       ".mcc" + ("00" + networkInfo.mcc).slice(-3) + ".3gppnetwork.org";
@@ -1435,8 +1454,8 @@ PushRecordWebSocket.prototype = Object.create(PushRecord.prototype, {
   },
 });
 
-PushRecordWebSocket.prototype.toRegistration = function() {
-  let registration = PushRecord.prototype.toRegistration.call(this);
-  registration.version = this.version;
-  return registration;
+PushRecordWebSocket.prototype.toSubscription = function() {
+  let subscription = PushRecord.prototype.toSubscription.call(this);
+  subscription.version = this.version;
+  return subscription;
 };
diff --git a/dom/push/moz.build b/dom/push/moz.build
index 1d48d768d5..7148c1414f 100644
--- a/dom/push/moz.build
+++ b/dom/push/moz.build
@@ -10,10 +10,6 @@ EXTRA_COMPONENTS += [
     'PushNotificationService.js',
 ]
 
-EXTRA_PP_JS_MODULES += [
-    'PushServiceWebSocket.jsm',
-]
-
 EXTRA_JS_MODULES += [
     'PushCrypto.jsm',
     'PushDB.jsm',
@@ -21,6 +17,7 @@ EXTRA_JS_MODULES += [
     'PushService.jsm',
     'PushServiceChildPreload.jsm',
     'PushServiceHttp2.jsm',
+    'PushServiceWebSocket.jsm',
 ]
 
 MOCHITEST_MANIFESTS += [
diff --git a/dom/push/test/test_multiple_register.html b/dom/push/test/test_multiple_register.html
index be7bb574a8..4557d0abd1 100644
--- a/dom/push/test/test_multiple_register.html
+++ b/dom/push/test/test_multiple_register.html
@@ -120,7 +120,6 @@ http://creativecommons.org/licenses/publicdomain/
 
   SpecialPowers.pushPrefEnv({"set": [
     ["dom.push.enabled", true],
-    ["dom.push.debug", true],
     ["dom.serviceWorkers.exemptFromPerDomainMax", true],
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true]
diff --git a/dom/push/test/test_serviceworker_lifetime.html b/dom/push/test/test_serviceworker_lifetime.html
index 233df55605..e3c9f052c0 100644
--- a/dom/push/test/test_serviceworker_lifetime.html
+++ b/dom/push/test/test_serviceworker_lifetime.html
@@ -324,7 +324,7 @@
     ["dom.serviceWorkers.testing.enabled", true],
     ["dom.serviceWorkers.interception.enabled", true]
     ]}, runTest);
-  SpecialPowers.addPermission('push', true, document);
+  SpecialPowers.addPermission('desktop-notification', true, document);
   SimpleTest.waitForExplicitFinish();
 </script>
 </body>
diff --git a/dom/push/test/xpcshell/head.js b/dom/push/test/xpcshell/head.js
index b6b9af91ad..6e5b9b6b63 100644
--- a/dom/push/test/xpcshell/head.js
+++ b/dom/push/test/xpcshell/head.js
@@ -7,10 +7,12 @@ let {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/Task.jsm');
 Cu.import('resource://gre/modules/Timer.jsm');
 Cu.import('resource://gre/modules/Promise.jsm');
 Cu.import('resource://gre/modules/Preferences.jsm');
 Cu.import('resource://gre/modules/PlacesUtils.jsm');
+Cu.import('resource://gre/modules/ObjectUtils.jsm');
 
 const serviceExports = Cu.import('resource://gre/modules/PushService.jsm', {});
 const servicePrefs = new Preferences('dom.push.');
@@ -180,7 +182,7 @@ function disableServiceWorkerEvents(...scopes) {
   for (let scope of scopes) {
     Services.perms.add(
       Services.io.newURI(scope, null, null),
-      'push',
+      'desktop-notification',
       Ci.nsIPermissionManager.DENY_ACTION
     );
   }
@@ -194,7 +196,7 @@ function disableServiceWorkerEvents(...scopes) {
  */
 function setPrefs(prefs = {}) {
   let defaultPrefs = Object.assign({
-    debug: true,
+    loglevel: 'all',
     serverURL: 'wss://push.example.org',
     'connection.enabled': true,
     userAgentID: '',
@@ -221,6 +223,7 @@ function setPrefs(prefs = {}) {
     'http2.retryInterval': 500,
     'http2.reset_retry_count_after_ms': 60000,
     maxQuotaPerSubscription: 16,
+    quotaUpdateDelay: 3000,
   }, prefs);
   for (let pref in defaultPrefs) {
     servicePrefs.set(pref, defaultPrefs[pref]);
@@ -378,7 +381,11 @@ MockWebSocket.prototype = {
       () => this._listener.onServerClose(this._context, statusCode, reason),
       () => this._listener.onStop(this._context, Cr.NS_BASE_STREAM_CLOSED)
     );
-  }
+  },
+
+  serverInterrupt(result = Cr.NS_ERROR_NET_RESET) {
+    waterfall(() => this._listener.onStop(this._context, result));
+  },
 };
 
 /**
diff --git a/dom/push/test/xpcshell/test_clearAll_successful.js b/dom/push/test/xpcshell/test_clearAll_successful.js
index 199b861f0b..1e759019f1 100644
--- a/dom/push/test/xpcshell/test_clearAll_successful.js
+++ b/dom/push/test/xpcshell/test_clearAll_successful.js
@@ -25,7 +25,6 @@ add_task(function* test_unregister_success() {
     quota: Infinity,
   });
 
-  let unregisterDefer = Promise.defer();
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
diff --git a/dom/push/test/xpcshell/test_clear_origin_data.js b/dom/push/test/xpcshell/test_clear_origin_data.js
new file mode 100644
index 0000000000..a7f448a6db
--- /dev/null
+++ b/dom/push/test/xpcshell/test_clear_origin_data.js
@@ -0,0 +1,144 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+const userAgentID = 'bd744428-f125-436a-b6d0-dd0c9845837f';
+
+let clearForPattern = Task.async(function* (testRecords, pattern) {
+  let patternString = JSON.stringify(pattern);
+  yield PushService._clearOriginData(patternString);
+
+  for (let length = testRecords.length; length--;) {
+    let test = testRecords[length];
+    let originSuffix = ChromeUtils.originAttributesToSuffix(
+      test.originAttributes);
+
+    let registration = yield PushNotificationService.registration(
+      test.scope,
+      originSuffix
+    );
+
+    let url = test.scope + originSuffix;
+
+    if (ObjectUtils.deepEqual(test.clearIf, pattern)) {
+      ok(!registration, 'Should clear registration ' + url +
+        ' for pattern ' + patternString);
+      testRecords.splice(length, 1);
+    } else {
+      ok(registration, 'Should not clear registration ' + url +
+        ' for pattern ' + patternString);
+    }
+  }
+});
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.org/1'
+  );
+  run_next_test();
+}
+
+add_task(function* test_webapps_cleardata() {
+  let db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  let testRecords = [{
+    scope: 'https://example.org/1',
+    originAttributes: { appId: 1 },
+    clearIf: { appId: 1, inBrowser: false },
+  }, {
+    scope: 'https://example.org/1',
+    originAttributes: { appId: 1, inBrowser: true },
+    clearIf: { appId: 1 },
+  }, {
+    scope: 'https://example.org/1',
+    originAttributes: { appId: 2, inBrowser: true },
+    clearIf: { appId: 2, inBrowser: true },
+  }, {
+    scope: 'https://example.org/2',
+    originAttributes: { appId: 1 },
+    clearIf: { appId: 1, inBrowser: false },
+  }, {
+    scope: 'https://example.org/2',
+    originAttributes: { appId: 2, inBrowser: true },
+    clearIf: { appId: 2, inBrowser: true },
+  }, {
+    scope: 'https://example.org/3',
+    originAttributes: { appId: 3, inBrowser: true },
+    clearIf: { inBrowser: true },
+  }, {
+    scope: 'https://example.org/3',
+    originAttributes: { appId: 4, inBrowser: true },
+    clearIf: { inBrowser: true },
+  }];
+
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve =>
+    unregisterDone = after(testRecords.length, resolve));
+
+  PushService.init({
+    serverURI: "wss://push.example.org",
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(data) {
+          equal(data.messageType, 'hello', 'Handshake: wrong message type');
+          equal(data.uaid, userAgentID, 'Handshake: wrong device ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        },
+        onRegister(data) {
+          equal(data.messageType, 'register', 'Register: wrong message type');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            channelID: data.channelID,
+            uaid: userAgentID,
+            pushEndpoint: 'https://example.com/update/' + Math.random(),
+          }));
+        },
+        onUnregister(data) {
+          unregisterDone();
+        },
+      });
+    }
+  });
+
+  yield Promise.all(testRecords.map(test =>
+    PushNotificationService.register(
+      test.scope,
+      ChromeUtils.originAttributesToSuffix(test.originAttributes)
+    )
+  ));
+
+  // Removes records for all scopes with the same app ID. Excludes records
+  // where `inBrowser` is true.
+  yield clearForPattern(testRecords, { appId: 1, inBrowser: false });
+
+  // Removes the remaining record for app ID 1, where `inBrowser` is true.
+  yield clearForPattern(testRecords, { appId: 1 });
+
+  // Removes all records for all scopes with the same app ID, where
+  // `inBrowser` is true.
+  yield clearForPattern(testRecords, { appId: 2, inBrowser: true });
+
+  // Removes all records where `inBrowser` is true.
+  yield clearForPattern(testRecords, { inBrowser: true });
+
+  equal(testRecords.length, 0, 'Should remove all test records');
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister');
+});
diff --git a/dom/push/test/xpcshell/test_drop_expired.js b/dom/push/test/xpcshell/test_drop_expired.js
new file mode 100644
index 0000000000..3db8441d8c
--- /dev/null
+++ b/dom/push/test/xpcshell/test_drop_expired.js
@@ -0,0 +1,153 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+const userAgentID = '2c43af06-ab6e-476a-adc4-16cbda54fb89';
+
+var db;
+var quotaURI;
+var permURI;
+
+function visitURI(uri, timestamp) {
+  return addVisit({
+    uri: uri,
+    title: uri.spec,
+    visits: [{
+      visitDate: timestamp * 1000,
+      transitionType: Ci.nsINavHistoryService.TRANSITION_LINK,
+    }],
+  });
+}
+
+var putRecord = Task.async(function* ({scope, perm, quota, lastPush, lastVisit}) {
+  let uri = Services.io.newURI(scope, null, null);
+
+  Services.perms.add(uri, 'desktop-notification',
+    Ci.nsIPermissionManager[perm]);
+  do_register_cleanup(() => {
+    Services.perms.remove(uri, 'desktop-notification');
+  });
+
+  yield visitURI(uri, lastVisit);
+
+  yield db.put({
+    channelID: uri.path,
+    pushEndpoint: 'https://example.org/push' + uri.path,
+    scope: uri.spec,
+    pushCount: 0,
+    lastPush: lastPush,
+    version: null,
+    originAttributes: '',
+    quota: quota,
+  });
+
+  return uri;
+});
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
+
+  db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  run_next_test();
+}
+
+add_task(function* setUp() {
+  // An expired registration that should be evicted on startup. Permission is
+  // granted for this origin, and the last visit is more recent than the last
+  // push message.
+  yield putRecord({
+    scope: 'https://example.com/expired-quota-restored',
+    perm: 'ALLOW_ACTION',
+    quota: 0,
+    lastPush: Date.now() - 10,
+    lastVisit: Date.now(),
+  });
+
+  // An expired registration that we should evict when the origin is visited
+  // again.
+  quotaURI = yield putRecord({
+    scope: 'https://example.xyz/expired-quota-exceeded',
+    perm: 'ALLOW_ACTION',
+    quota: 0,
+    lastPush: Date.now() - 10,
+    lastVisit: Date.now() - 20,
+  });
+
+  // An expired registration that we should evict when permission is granted
+  // again.
+  permURI = yield putRecord({
+    scope: 'https://example.info/expired-perm-revoked',
+    perm: 'DENY_ACTION',
+    quota: 0,
+    lastPush: Date.now() - 10,
+    lastVisit: Date.now(),
+  });
+
+  // An active registration that we should leave alone.
+  yield putRecord({
+    scope: 'https://example.ninja/active',
+    perm: 'ALLOW_ACTION',
+    quota: 16,
+    lastPush: Date.now() - 10,
+    lastVisit: Date.now() - 20,
+  });
+
+  let subChangePromise = promiseObserverNotification(
+    'push-subscription-change',
+    (subject, data) => data == 'https://example.com/expired-quota-restored'
+  );
+
+  PushService.init({
+    serverURI: 'wss://push.example.org/',
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID,
+          }));
+        },
+      });
+    },
+  });
+
+  yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for subscription change event on startup');
+});
+
+add_task(function* test_site_visited() {
+  let subChangePromise = promiseObserverNotification(
+    'push-subscription-change',
+    (subject, data) => data == 'https://example.xyz/expired-quota-exceeded'
+  );
+
+  yield visitURI(quotaURI, Date.now());
+  PushService.observe(null, 'idle-daily', '');
+
+  yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for subscription change event after visit');
+});
+
+add_task(function* test_perm_restored() {
+  let subChangePromise = promiseObserverNotification(
+    'push-subscription-change',
+    (subject, data) => data == 'https://example.info/expired-perm-revoked'
+  );
+
+  Services.perms.add(permURI, 'desktop-notification',
+    Ci.nsIPermissionManager.ALLOW_ACTION);
+
+  yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for subscription change event after permission');
+});
diff --git a/dom/push/test/xpcshell/test_notification_ack.js b/dom/push/test/xpcshell/test_notification_ack.js
index c2b2692f6d..90ab91c26f 100644
--- a/dom/push/test/xpcshell/test_notification_ack.js
+++ b/dom/push/test/xpcshell/test_notification_ack.js
@@ -54,7 +54,8 @@ add_task(function* test_notification_ack() {
   ]);
 
   let acks = 0;
-  let ackDefer = Promise.defer();
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = resolve);
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -64,11 +65,6 @@ add_task(function* test_notification_ack() {
         onHello(request) {
           equal(request.uaid, userAgentID,
             'Should send matching device IDs in handshake');
-          deepEqual(request.channelIDs.sort(), [
-            '21668e05-6da8-42c9-b8ab-9cc3f4d5630c',
-            '5477bfda-22db-45d4-9614-fee369630260',
-            '9a5ff87f-47c9-4215-b2b8-0bdd38b4b305'
-          ], 'Should send matching channel IDs in handshake');
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             uaid: userAgentID,
@@ -115,7 +111,7 @@ add_task(function* test_notification_ack() {
               channelID: '5477bfda-22db-45d4-9614-fee369630260',
               version: 6
             }], updates, 'Wrong updates for acknowledgement 3');
-            ackDefer.resolve();
+            ackDone();
             break;
 
           default:
@@ -128,6 +124,6 @@ add_task(function* test_notification_ack() {
 
   yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for notifications');
-  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for multiple acknowledgements');
 });
diff --git a/dom/push/test/xpcshell/test_notification_data.js b/dom/push/test/xpcshell/test_notification_data.js
new file mode 100644
index 0000000000..e5d0b15ece
--- /dev/null
+++ b/dom/push/test/xpcshell/test_notification_data.js
@@ -0,0 +1,193 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+let db;
+let userAgentID = 'f5b47f8d-771f-4ea3-b999-91c135f8766d';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
+  run_next_test();
+}
+
+function putRecord(channelID, scope, publicKey, privateKey) {
+  return db.put({
+    channelID: channelID,
+    pushEndpoint: 'https://example.org/push/' + channelID,
+    scope: scope,
+    pushCount: 0,
+    lastPush: 0,
+    originAttributes: '',
+    quota: Infinity,
+    p256dhPublicKey: publicKey,
+    p256dhPrivateKey: privateKey,
+  });
+}
+
+add_task(function* test_notification_ack_data() {
+  db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  yield putRecord(
+    'subscription1',
+    'https://example.com/page/1',
+    'BPCd4gNQkjwRah61LpdALdzZKLLnU5UAwDztQ5_h0QsT26jk0IFbqcK6-JxhHAm-rsHEwy0CyVJjtnfOcqc1tgA',
+    {
+      crv: 'P-256',
+      d: '1jUPhzVsRkzV0vIzwL4ZEsOlKdNOWm7TmaTfzitJkgM',
+      ext: true,
+      key_ops: ["deriveBits"],
+      kty: "EC",
+      x: '8J3iA1CSPBFqHrUul0At3NkosudTlQDAPO1Dn-HRCxM',
+      y: '26jk0IFbqcK6-JxhHAm-rsHEwy0CyVJjtnfOcqc1tgA'
+    }
+  );
+  yield putRecord(
+    'subscription2',
+    'https://example.com/page/2',
+    'BPnWyUo7yMnuMlyKtERuLfWE8a09dtdjHSW2lpC9_BqR5TZ1rK8Ldih6ljyxVwnBA-nygQHGRpEmu1jV5K8437E',
+    {
+      crv: 'P-256',
+      d: 'lFm4nPsUKYgNGBJb5nXXKxl8bspCSp0bAhCYxbveqT4',
+      ext: true,
+      key_ops: ["deriveBits"],
+      kty: 'EC',
+      x: '-dbJSjvIye4yXIq0RG4t9YTxrT1212MdJbaWkL38GpE',
+      y: '5TZ1rK8Ldih6ljyxVwnBA-nygQHGRpEmu1jV5K8437E'
+    }
+  );
+  yield putRecord(
+    'subscription3',
+    'https://example.com/page/3',
+    'BDhUHITSeVrWYybFnb7ylVTCDDLPdQWMpf8gXhcWwvaaJa6n3YH8TOcH8narDF6t8mKVvg2ioLW-8MH5O4dzGcI',
+    {
+      crv: 'P-256',
+      d: 'Q1_SE1NySTYzjbqgWwPgrYh7XRg3adqZLkQPsy319G8',
+      ext: true,
+      key_ops: ["deriveBits"],
+      kty: 'EC',
+      x: 'OFQchNJ5WtZjJsWdvvKVVMIMMs91BYyl_yBeFxbC9po',
+      y: 'Ja6n3YH8TOcH8narDF6t8mKVvg2ioLW-8MH5O4dzGcI'
+    }
+  );
+
+  let updates = [];
+  let notifyPromise = promiseObserverNotification('push-notification', function(subject, data) {
+    let notification = subject.QueryInterface(Ci.nsIPushObserverNotification);
+    updates.push({
+      scope: data,
+      data: notification.data,
+    });
+    return updates.length == 3;
+  });
+
+  let acks = 0;
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = resolve);
+  PushService.init({
+    serverURI: "wss://push.example.org/",
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          equal(request.uaid, userAgentID,
+            'Should send matching device IDs in handshake');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            uaid: userAgentID,
+            status: 200,
+            use_webpush: true,
+          }));
+          // subscription1 will send a message with no rs and padding
+          // length 1.
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            channelID: 'subscription1',
+            headers: {
+              encryption_key: 'keyid="notification1"; dh="BO_tgGm-yvYAGLeRe16AvhzaUcpYRiqgsGOlXpt0DRWDRGGdzVLGlEVJMygqAUECarLnxCiAOHTP_znkedrlWoU"',
+              encryption: 'keyid="notification1";salt="uAZaiXpOSfOLJxtOCZ09dA"',
+            },
+            data: 'NwrrOWPxLE8Sv5Rr0Kep7n0-r_j3rsYrUw_CXPo',
+            version: 'v1',
+          }));
+        },
+        onACK(request) {
+          switch (++acks) {
+          case 1:
+            deepEqual([{
+              channelID: 'subscription1',
+              version: 'v1',
+            }], request.updates, 'Wrong updates for acknowledgement 1');
+            // subscription2 will send a message with no rs and padding
+            // length 16.
+            this.serverSendMsg(JSON.stringify({
+              messageType: 'notification',
+              channelID: 'subscription2',
+              headers: {
+                encryption_key: 'keyid="notification2"; dh="BKVdQcgfncpNyNWsGrbecX0zq3eHIlHu5XbCGmVcxPnRSbhjrA6GyBIeGdqsUL69j5Z2CvbZd-9z1UBH0akUnGQ"',
+                encryption: 'keyid="notification2";salt="vFn3t3M_k42zHBdpch3VRw"',
+              },
+              data: 'Zt9dEdqgHlyAL_l83385aEtb98ZBilz5tgnGgmwEsl5AOCNgesUUJ4p9qUU',
+              version: 'v2',
+            }));
+            break;
+
+          case 2:
+            deepEqual([{
+              channelID: 'subscription2',
+              version: 'v2',
+            }], request.updates, 'Wrong updates for acknowledgement 2');
+            // subscription3 will send a message with rs equal 24 and
+            // padding length 16.
+            this.serverSendMsg(JSON.stringify({
+              messageType: 'notification',
+              channelID: 'subscription3',
+              headers: {
+                encryption_key: 'keyid="notification3";dh="BD3xV_ACT8r6hdIYES3BJj1qhz9wyv7MBrG9vM2UCnjPzwE_YFVpkD-SGqE-BR2--0M-Yf31wctwNsO1qjBUeMg"',
+                encryption: 'keyid="notification3"; salt="DFq188piWU7osPBgqn4Nlg"; rs=24',
+              },
+              data: 'LKru3ZzxBZuAxYtsaCfaj_fehkrIvqbVd1iSwnwAUgnL-cTeDD-83blxHXTq7r0z9ydTdMtC3UjAcWi8LMnfY-BFzi0qJAjGYIikDA',
+              version: 'v3',
+            }));
+            break;
+
+          case 3:
+            deepEqual([{
+              channelID: 'subscription3',
+              version: 'v3',
+            }], request.updates, 'Wrong updates for acknowledgement 3');
+            ackDone();
+            break;
+
+          default:
+            ok(false, 'Unexpected acknowledgement ' + acks);
+          }
+        }
+      });
+    }
+  });
+
+  yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications');
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for multiple acknowledgements');
+
+  updates.sort((a, b) => a.scope < b.scope ? -1 : a.scope > b.scope ? 1 : 0);
+  deepEqual([{
+    scope: 'https://example.com/page/1',
+    data: 'Some message',
+  }, {
+    scope: 'https://example.com/page/2',
+    data: 'Some message',
+  }, {
+    scope: 'https://example.com/page/3',
+    data: 'Some message',
+  }], updates, 'Wrong data for notifications');
+});
diff --git a/dom/push/test/xpcshell/test_notification_duplicate.js b/dom/push/test/xpcshell/test_notification_duplicate.js
index f13695789c..d25fffec7e 100644
--- a/dom/push/test/xpcshell/test_notification_duplicate.js
+++ b/dom/push/test/xpcshell/test_notification_duplicate.js
@@ -5,9 +5,13 @@
 
 const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
 
+const userAgentID = '1500e7d9-8cbe-4ee6-98da-7fa5d6a39852';
+
 function run_test() {
   do_get_profile();
-  setPrefs();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
   disableServiceWorkerEvents(
     'https://example.com/1',
     'https://example.com/2'
@@ -41,8 +45,8 @@ add_task(function* test_notification_duplicate() {
   let notifyPromise = promiseObserverNotification('push-notification');
 
   let acks = 0;
-  let ackDefer = Promise.defer();
-  let ackDone = after(2, ackDefer.resolve);
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = after(2, resolve));
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -53,7 +57,7 @@ add_task(function* test_notification_duplicate() {
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
-            uaid: '1500e7d9-8cbe-4ee6-98da-7fa5d6a39852'
+            uaid: userAgentID,
           }));
           this.serverSendMsg(JSON.stringify({
             messageType: 'notification',
@@ -73,7 +77,7 @@ add_task(function* test_notification_duplicate() {
 
   yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for notifications');
-  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for stale acknowledgement');
 
   let staleRecord = yield db.getByKeyID(
diff --git a/dom/push/test/xpcshell/test_notification_error.js b/dom/push/test/xpcshell/test_notification_error.js
index 0871f92982..400422a83b 100644
--- a/dom/push/test/xpcshell/test_notification_error.js
+++ b/dom/push/test/xpcshell/test_notification_error.js
@@ -5,9 +5,13 @@
 
 const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
 
+const userAgentID = '3c7462fc-270f-45be-a459-b9d631b0d093';
+
 function run_test() {
   do_get_profile();
-  setPrefs();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
   disableServiceWorkerEvents(
     'https://example.com/a',
     'https://example.com/b',
@@ -58,8 +62,8 @@ add_task(function* test_notification_error() {
     )
   ]);
 
-  let ackDefer = Promise.defer();
-  let ackDone = after(records.length, ackDefer.resolve);
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = after(records.length, resolve));
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -74,15 +78,10 @@ add_task(function* test_notification_error() {
     makeWebSocket(uri) {
       return new MockWebSocket(uri, {
         onHello(request) {
-          deepEqual(request.channelIDs.sort(), [
-            '3c3930ba-44de-40dc-a7ca-8a133ec1a866',
-            'b63f7bef-0a0d-4236-b41e-086a69dfd316',
-            'f04f1e46-9139-4826-b2d1-9411b0821283'
-          ], 'Wrong channel list');
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
-            uaid: '3c7462fc-270f-45be-a459-b9d631b0d093'
+            uaid: userAgentID,
           }));
           this.serverSendMsg(JSON.stringify({
             messageType: 'notification',
@@ -112,7 +111,7 @@ add_task(function* test_notification_error() {
     'Wrong endpoint for notification C');
   equal(cPush.version, 4, 'Wrong version for notification C');
 
-  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for acknowledgements');
 
   let aRecord = yield db.getByIdentifiers({scope: 'https://example.com/a',
diff --git a/dom/push/test/xpcshell/test_notification_incomplete.js b/dom/push/test/xpcshell/test_notification_incomplete.js
index ec9606c178..ca41ad9e30 100644
--- a/dom/push/test/xpcshell/test_notification_incomplete.js
+++ b/dom/push/test/xpcshell/test_notification_incomplete.js
@@ -5,9 +5,13 @@
 
 const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
 
+const userAgentID = '1ca1cf66-eeb4-4df7-87c1-d5c92906ab90';
+
 function run_test() {
   do_get_profile();
-  setPrefs();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
   disableServiceWorkerEvents(
     'https://example.com/page/1',
     'https://example.com/page/2',
@@ -57,8 +61,8 @@ add_task(function* test_notification_incomplete() {
     ok(false, 'Should not deliver malformed updates');
   }, 'push-notification', false);
 
-  let notificationDefer = Promise.defer();
-  let notificationDone = after(2, notificationDefer.resolve);
+  let notificationDone;
+  let notificationPromise = new Promise(resolve => notificationDone = after(2, resolve));
   let prevHandler = PushServiceWebSocket._handleNotificationReply;
   PushServiceWebSocket._handleNotificationReply = function _handleNotificationReply() {
     notificationDone();
@@ -74,7 +78,7 @@ add_task(function* test_notification_incomplete() {
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
-            uaid: '1ca1cf66-eeb4-4df7-87c1-d5c92906ab90'
+            uaid: userAgentID,
           }));
           this.serverSendMsg(JSON.stringify({
             // Missing "updates" field; should ignore message.
@@ -107,7 +111,7 @@ add_task(function* test_notification_incomplete() {
     }
   });
 
-  yield waitForPromise(notificationDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(notificationPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for incomplete notifications');
 
   let storeRecords = yield db.getAllKeyIDs();
diff --git a/dom/push/test/xpcshell/test_notification_version_string.js b/dom/push/test/xpcshell/test_notification_version_string.js
index 4abde87861..c91db8f55a 100644
--- a/dom/push/test/xpcshell/test_notification_version_string.js
+++ b/dom/push/test/xpcshell/test_notification_version_string.js
@@ -5,9 +5,13 @@
 
 const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
 
+const userAgentID = 'ba31ac13-88d4-4984-8e6b-8731315a7cf8';
+
 function run_test() {
   do_get_profile();
-  setPrefs();
+  setPrefs({
+    userAgentID: userAgentID,
+  });
   disableServiceWorkerEvents(
     'https://example.net/case'
   );
@@ -28,7 +32,8 @@ add_task(function* test_notification_version_string() {
 
   let notifyPromise = promiseObserverNotification('push-notification');
 
-  let ackDefer = Promise.defer();
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = resolve);
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -39,7 +44,7 @@ add_task(function* test_notification_version_string() {
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
-            uaid: 'ba31ac13-88d4-4984-8e6b-8731315a7cf8'
+            uaid: userAgentID,
           }));
           this.serverSendMsg(JSON.stringify({
             messageType: 'notification',
@@ -49,7 +54,7 @@ add_task(function* test_notification_version_string() {
             }]
           }));
         },
-        onACK: ackDefer.resolve
+        onACK: ackDone
       });
     }
   });
@@ -65,7 +70,7 @@ add_task(function* test_notification_version_string() {
     'Wrong push endpoint');
   strictEqual(message.version, 4, 'Wrong version');
 
-  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for string acknowledgement');
 
   let storeRecord = yield db.getByKeyID(
diff --git a/dom/push/test/xpcshell/test_permissions.js b/dom/push/test/xpcshell/test_permissions.js
new file mode 100644
index 0000000000..6414b86e3f
--- /dev/null
+++ b/dom/push/test/xpcshell/test_permissions.js
@@ -0,0 +1,268 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+const userAgentID = '2c43af06-ab6e-476a-adc4-16cbda54fb89';
+
+let db;
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+  });
+
+  db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  run_next_test();
+}
+
+let unregisterDefers = {};
+
+function putRecord(channelID, scope, quota) {
+  return db.put({
+    channelID: channelID,
+    pushEndpoint: 'https://example.org/push/' + channelID,
+    scope: scope,
+    pushCount: 0,
+    lastPush: 0,
+    version: null,
+    originAttributes: '',
+    quota: quota,
+  });
+}
+
+function makePushPermission(url, capability) {
+  return {
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIPermission]),
+    capability: Ci.nsIPermissionManager[capability],
+    expireTime: 0,
+    expireType: Ci.nsIPermissionManager.EXPIRE_NEVER,
+    principal: Services.scriptSecurityManager.getCodebasePrincipal(
+      Services.io.newURI(url, null, null)
+    ),
+    type: 'desktop-notification',
+  };
+}
+
+function promiseSubscriptionChanges(count) {
+  let notifiedScopes = [];
+  let subChangePromise = promiseObserverNotification('push-subscription-change', (subject, data) => {
+    notifiedScopes.push(data);
+    return notifiedScopes.length == count;
+  });
+  return subChangePromise.then(_ => notifiedScopes.sort());
+}
+
+function allExpired(...keyIDs) {
+  return Promise.all(keyIDs.map(
+    keyID => db.getByKeyID(keyID)
+  )).then(records =>
+    records.every(record => record.isExpired())
+  );
+}
+
+add_task(function* setUp() {
+  // Active registration; quota should be reset to 16. Since the quota isn't
+  // exposed to content, we shouldn't receive a subscription change event.
+  yield putRecord('active-allow', 'https://example.info/page/1', 8);
+
+  // Expired registration; should be dropped.
+  yield putRecord('expired-allow', 'https://example.info/page/2', 0);
+
+  // Active registration; should be expired when we change the permission
+  // to "deny".
+  yield putRecord('active-deny-changed', 'https://example.xyz/page/1', 16);
+
+  // Two active registrations for a visited site. These will expire when we
+  // add a "deny" permission.
+  yield putRecord('active-deny-added-1', 'https://example.net/ham', 16);
+  yield putRecord('active-deny-added-2', 'https://example.net/green', 8);
+
+  // An already-expired registration for a visited site. We shouldn't send an
+  // `unregister` request for this one, but still receive an observer
+  // notification when we restore permissions.
+  yield putRecord('expired-deny-added', 'https://example.net/eggs', 0);
+
+  // A registration that should not be affected by permission list changes
+  // because its quota is set to `Infinity`.
+  yield putRecord('never-expires', 'app://chrome/only', Infinity);
+
+  // A registration that should be dropped when we clear the permission
+  // list.
+  yield putRecord('drop-on-clear', 'https://example.edu/lonely', 16);
+
+  let handshakeDone;
+  let handshakePromise = new Promise(resolve => handshakeDone = resolve);
+  PushService.init({
+    serverURI: 'wss://push.example.org/',
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID,
+          }));
+          handshakeDone();
+        },
+        onUnregister(request) {
+          let resolve = unregisterDefers[request.channelID];
+          equal(typeof resolve, 'function',
+            'Dropped unexpected channel ID ' + request.channelID);
+          delete unregisterDefers[request.channelID];
+          resolve();
+        },
+        onACK(request) {},
+      });
+    }
+  });
+  yield waitForPromise(handshakePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for handshake');
+});
+
+add_task(function* test_permissions_allow_added() {
+  let subChangePromise = promiseSubscriptionChanges(1);
+
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.info', 'ALLOW_ACTION'),
+    'added'
+  );
+  let notifiedScopes = yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+      'Timed out waiting for notifications after adding allow');
+
+  deepEqual(notifiedScopes, [
+    'https://example.info/page/2',
+  ], 'Wrong scopes after adding allow');
+
+  let record = yield db.getByKeyID('active-allow');
+  equal(record.quota, 16,
+    'Should reset quota for active records after adding allow');
+
+  record = yield db.getByKeyID('expired-allow');
+  ok(!record, 'Should drop expired records after adding allow');
+});
+
+add_task(function* test_permissions_allow_deleted() {
+  let unregisterPromise = new Promise(resolve => unregisterDefers[
+    'active-allow'] = resolve);
+
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.info', 'ALLOW_ACTION'),
+    'deleted'
+  );
+
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister after deleting allow');
+
+  let record = yield db.getByKeyID('active-allow');
+  ok(record.isExpired(),
+    'Should expire active record after deleting allow');
+});
+
+add_task(function* test_permissions_deny_added() {
+  let unregisterPromise = Promise.all([
+    new Promise(resolve => unregisterDefers[
+      'active-deny-added-1'] = resolve),
+    new Promise(resolve => unregisterDefers[
+      'active-deny-added-2'] = resolve),
+  ]);
+
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.net', 'DENY_ACTION'),
+    'added'
+  );
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications after adding deny');
+
+  let isExpired = yield allExpired(
+    'active-deny-added-1',
+    'expired-deny-added'
+  );
+  ok(isExpired, 'Should expire all registrations after adding deny');
+});
+
+add_task(function* test_permissions_deny_deleted() {
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.net', 'DENY_ACTION'),
+    'deleted'
+  );
+
+  let isExpired = yield allExpired(
+    'active-deny-added-1',
+    'expired-deny-added'
+  );
+  ok(isExpired, 'Should retain expired registrations after deleting deny');
+});
+
+add_task(function* test_permissions_allow_changed() {
+  let subChangePromise = promiseSubscriptionChanges(3);
+
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.net', 'ALLOW_ACTION'),
+    'changed'
+  );
+
+  let notifiedScopes = yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications after changing to allow');
+
+  deepEqual(notifiedScopes, [
+    'https://example.net/eggs',
+    'https://example.net/green',
+    'https://example.net/ham'
+  ], 'Wrong scopes after changing to allow');
+
+  let droppedRecords = yield Promise.all([
+    db.getByKeyID('active-deny-added-1'),
+    db.getByKeyID('active-deny-added-2'),
+    db.getByKeyID('expired-deny-added'),
+  ]);
+  ok(!droppedRecords.some(Boolean),
+    'Should drop all expired registrations after changing to allow');
+});
+
+add_task(function* test_permissions_deny_changed() {
+  let unregisterPromise = new Promise(resolve => unregisterDefers[
+    'active-deny-changed'] = resolve);
+
+  yield PushService._onPermissionChange(
+    makePushPermission('https://example.xyz', 'DENY_ACTION'),
+    'changed'
+  );
+
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister after changing to deny');
+
+  let record = yield db.getByKeyID('active-deny-changed');
+  ok(record.isExpired(),
+    'Should expire active record after changing to allow');
+});
+
+add_task(function* test_permissions_clear() {
+  let records = yield db.getAllKeyIDs();
+  deepEqual(records.map(record => record.keyID).sort(), [
+    'active-allow',
+    'active-deny-changed',
+    'drop-on-clear',
+    'never-expires',
+  ], 'Wrong records in database before clearing');
+
+  let unregisterPromise = new Promise(resolve => unregisterDefers[
+      'drop-on-clear'] = resolve);
+
+  yield PushService._onPermissionChange(null, 'cleared');
+
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister requests after clearing permissions');
+
+  records = yield db.getAllKeyIDs();
+  deepEqual(records.map(record => record.keyID).sort(), [
+    'never-expires',
+  ], 'Unrestricted registrations should not be dropped');
+});
diff --git a/dom/push/test/xpcshell/test_quota_exceeded.js b/dom/push/test/xpcshell/test_quota_exceeded.js
index 188732c3c5..00a9fb0396 100644
--- a/dom/push/test/xpcshell/test_quota_exceeded.js
+++ b/dom/push/test/xpcshell/test_quota_exceeded.js
@@ -85,7 +85,9 @@ add_task(function* test_expiration_origin_threshold() {
     updates++;
     return updates == 6;
   });
-  let unregisterDefer = Promise.defer();
+
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = resolve);
 
   PushService.init({
     serverURI: 'wss://push.example.org/',
@@ -94,10 +96,6 @@ add_task(function* test_expiration_origin_threshold() {
     makeWebSocket(uri) {
       return new MockWebSocket(uri, {
         onHello(request) {
-          deepEqual(request.channelIDs.sort(), [
-            '46cc6f6a-c106-4ffa-bb7c-55c60bd50c41',
-            'eb33fc90-c883-4267-b5cb-613969e8e349',
-          ], 'Wrong active registrations in handshake');
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
@@ -127,7 +125,7 @@ add_task(function* test_expiration_origin_threshold() {
         },
         onUnregister(request) {
           equal(request.channelID, 'eb33fc90-c883-4267-b5cb-613969e8e349', 'Unregistered wrong channel ID');
-          unregisterDefer.resolve();
+          unregisterDone();
         },
         // We expect to receive acks, but don't care about their
         // contents.
@@ -136,7 +134,7 @@ add_task(function* test_expiration_origin_threshold() {
     },
   });
 
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for unregister request');
 
   yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
diff --git a/dom/push/test/xpcshell/test_quota_observer.js b/dom/push/test/xpcshell/test_quota_observer.js
index 8f0aff599e..d840f6b1db 100644
--- a/dom/push/test/xpcshell/test_quota_observer.js
+++ b/dom/push/test/xpcshell/test_quota_observer.js
@@ -7,6 +7,8 @@ const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
 
 const userAgentID = '28cd09e2-7506-42d8-9e50-b02785adc7ef';
 
+var db;
+
 function run_test() {
   do_get_profile();
   setPrefs({
@@ -15,12 +17,24 @@ function run_test() {
   run_next_test();
 }
 
+let putRecord = Task.async(function* (perm, record) {
+  let uri = Services.io.newURI(record.scope, null, null);
+
+  Services.perms.add(uri, 'desktop-notification',
+    Ci.nsIPermissionManager[perm]);
+  do_register_cleanup(() => {
+    Services.perms.remove(uri, 'desktop-notification');
+  });
+
+  yield db.put(record);
+});
+
 add_task(function* test_expiration_history_observer() {
-  let db = PushServiceWebSocket.newPushDB();
+  db = PushServiceWebSocket.newPushDB();
   do_register_cleanup(() => db.drop().then(_ => db.close()));
 
   // A registration that we'll expire...
-  yield db.put({
+  yield putRecord('ALLOW_ACTION', {
     channelID: '379c0668-8323-44d2-a315-4ee83f1a9ee9',
     pushEndpoint: 'https://example.org/push/1',
     scope: 'https://example.com/deals',
@@ -31,11 +45,11 @@ add_task(function* test_expiration_history_observer() {
     quota: 16,
   });
 
-  // ...And an expired registration that we'll revive later.
-  yield db.put({
-    channelID: 'eb33fc90-c883-4267-b5cb-613969e8e349',
-    pushEndpoint: 'https://example.org/push/2',
-    scope: 'https://example.com/auctions',
+  // ...And a registration that we'll evict on startup.
+  yield putRecord('ALLOW_ACTION', {
+    channelID: '4cb6e454-37cf-41c4-a013-4e3a7fdd0bf1',
+    pushEndpoint: 'https://example.org/push/3',
+    scope: 'https://example.com/stuff',
     pushCount: 0,
     lastPush: 0,
     version: null,
@@ -52,7 +66,10 @@ add_task(function* test_expiration_history_observer() {
     }],
   });
 
-  let unregisterDefer = Promise.defer();
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = resolve);
+  let subChangePromise = promiseObserverNotification('push-subscription-change', (subject, data) =>
+    data == 'https://example.com/stuff');
 
   PushService.init({
     serverURI: 'wss://push.example.org/',
@@ -61,9 +78,6 @@ add_task(function* test_expiration_history_observer() {
     makeWebSocket(uri) {
       return new MockWebSocket(uri, {
         onHello(request) {
-          deepEqual(request.channelIDs, [
-            '379c0668-8323-44d2-a315-4ee83f1a9ee9',
-          ], 'Should not include expired channel IDs');
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
@@ -79,25 +93,39 @@ add_task(function* test_expiration_history_observer() {
         },
         onUnregister(request) {
           equal(request.channelID, '379c0668-8323-44d2-a315-4ee83f1a9ee9', 'Dropped wrong channel ID');
-          unregisterDefer.resolve();
+          unregisterDone();
         },
         onACK(request) {},
       });
     }
   });
 
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(subChangePromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for subscription change event on startup');
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for unregister request');
 
   let expiredRecord = yield db.getByKeyID('379c0668-8323-44d2-a315-4ee83f1a9ee9');
   strictEqual(expiredRecord.quota, 0, 'Expired record not updated');
 
   let notifiedScopes = [];
-  let subChangePromise = promiseObserverNotification('push-subscription-change', (subject, data) => {
+  subChangePromise = promiseObserverNotification('push-subscription-change', (subject, data) => {
     notifiedScopes.push(data);
     return notifiedScopes.length == 2;
   });
 
+  // Add an expired registration that we'll revive later.
+  yield putRecord('ALLOW_ACTION', {
+    channelID: 'eb33fc90-c883-4267-b5cb-613969e8e349',
+    pushEndpoint: 'https://example.org/push/2',
+    scope: 'https://example.com/auctions',
+    pushCount: 0,
+    lastPush: 0,
+    version: null,
+    originAttributes: '',
+    quota: 0,
+  });
+
   // Now visit the site...
   yield addVisit({
     uri: 'https://example.com/another-page',
diff --git a/dom/push/test/xpcshell/test_reconnect_retry.js b/dom/push/test/xpcshell/test_reconnect_retry.js
new file mode 100644
index 0000000000..aa264fb5b8
--- /dev/null
+++ b/dom/push/test/xpcshell/test_reconnect_retry.js
@@ -0,0 +1,72 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    requestTimeout: 10000,
+    retryBaseInterval: 150
+  });
+  run_next_test();
+}
+
+add_task(function* test_reconnect_retry() {
+  let db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  let registers = 0;
+  let channelID;
+  PushService.init({
+    serverURI: "wss://push.example.org/",
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '083e6c17-1063-4677-8638-ab705aebebc2'
+          }));
+        },
+        onRegister(request) {
+          registers++;
+          if (registers == 1) {
+            channelID = request.channelID;
+            this.serverClose();
+            return;
+          }
+          if (registers == 2) {
+            equal(request.channelID, channelID,
+              'Should retry registers after reconnect');
+          }
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            channelID: request.channelID,
+            pushEndpoint: 'https://example.org/push/' + request.channelID,
+            status: 200,
+          }));
+        }
+      });
+    }
+  });
+
+  let registration = yield PushNotificationService.register(
+    'https://example.com/page/1',
+    ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })
+  );
+  let retryEndpoint = 'https://example.org/push/' + channelID;
+  equal(registration.pushEndpoint, retryEndpoint, 'Wrong endpoint for retried request');
+
+  registration = yield PushNotificationService.register(
+    'https://example.com/page/2',
+    ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })
+  );
+  notEqual(registration.pushEndpoint, retryEndpoint, 'Wrong endpoint for new request')
+
+  equal(registers, 3, 'Wrong registration count');
+});
diff --git a/dom/push/test/xpcshell/test_register_5xxCode_http2.js b/dom/push/test/xpcshell/test_register_5xxCode_http2.js
index e8e5649ca6..81b431ec18 100644
--- a/dom/push/test/xpcshell/test_register_5xxCode_http2.js
+++ b/dom/push/test/xpcshell/test_register_5xxCode_http2.js
@@ -79,7 +79,6 @@ add_task(function* test1() {
 
   PushService.init({
     serverURI: serverURL + "/subscribe5xxCode",
-    service: PushServiceHttp2,
     db
   });
 
@@ -91,15 +90,11 @@ add_task(function* test1() {
   var subscriptionUri = serverURL + '/subscription';
   var pushEndpoint = serverURL + '/pushEndpoint';
   var pushReceiptEndpoint = serverURL + '/receiptPushEndpoint';
-  equal(newRecord.subscriptionUri, subscriptionUri,
-    'Wrong subscription ID in registration record');
   equal(newRecord.pushEndpoint, pushEndpoint,
     'Wrong push endpoint in registration record');
 
   equal(newRecord.pushReceiptEndpoint, pushReceiptEndpoint,
     'Wrong push endpoint receipt in registration record');
-  equal(newRecord.scope, 'https://example.com/retry5xxCode',
-    'Wrong scope in registration record');
 
   let record = yield db.getByKeyID(subscriptionUri);
   equal(record.subscriptionUri, subscriptionUri,
diff --git a/dom/push/test/xpcshell/test_register_case.js b/dom/push/test/xpcshell/test_register_case.js
index e0ff47b910..1a922f1487 100644
--- a/dom/push/test/xpcshell/test_register_case.js
+++ b/dom/push/test/xpcshell/test_register_case.js
@@ -54,12 +54,8 @@ add_task(function* test_register_case() {
   );
   equal(newRecord.pushEndpoint, 'https://example.com/update/case',
     'Wrong push endpoint in registration record');
-  equal(newRecord.scope, 'https://example.net/case',
-    'Wrong scope in registration record');
 
-  let record = yield db.getByKeyID(newRecord.channelID);
-  equal(record.pushEndpoint, 'https://example.com/update/case',
-    'Wrong push endpoint in database record');
+  let record = yield db.getByPushEndpoint('https://example.com/update/case');
   equal(record.scope, 'https://example.net/case',
     'Wrong scope in database record');
 });
diff --git a/dom/push/test/xpcshell/test_register_error_http2.js b/dom/push/test/xpcshell/test_register_error_http2.js
index 0b2296e617..1dbd364ef8 100644
--- a/dom/push/test/xpcshell/test_register_error_http2.js
+++ b/dom/push/test/xpcshell/test_register_error_http2.js
@@ -49,10 +49,7 @@ add_task(function* test_pushSubscriptionNoConnection() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Error");
-    },
-    'Wrong error for not being able to establish connecion.'
+    'Expected error for not being able to establish connecion.'
   );
 
   let record = yield db.getAllKeyIDs();
@@ -90,10 +87,7 @@ add_task(function* test_pushSubscriptionMissingLocation() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Return code 201, but the answer is bogus");
-    },
-    'Wrong error for the missing location header.'
+    'Expected error for the missing location header.'
   );
 
   let record = yield db.getAllKeyIDs();
@@ -117,10 +111,7 @@ add_task(function* test_pushSubscriptionMissingLink() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Return code 201, but the answer is bogus");
-    },
-    'Wrong error for the missing link header.'
+    'Expected error for the missing link header.'
   );
 
   let record = yield db.getAllKeyIDs();
@@ -144,10 +135,7 @@ add_task(function* test_pushSubscriptionMissingLink1() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Return code 201, but the answer is bogus");
-    },
-    'Wrong error for the missing push endpoint.'
+    'Expected error for the missing push endpoint.'
   );
 
   let record = yield db.getAllKeyIDs();
@@ -171,10 +159,7 @@ add_task(function* test_pushSubscriptionLocationBogus() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Return code 201, but URI is bogus.");
-    },
-    'Wrong error for the bogus location'
+    'Expected error for the bogus location'
   );
 
   let record = yield db.getAllKeyIDs();
@@ -198,10 +183,7 @@ add_task(function* test_pushSubscriptionNot2xxCode() {
     PushNotificationService.register(
       'https://example.net/page/invalid-response',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes("Error");
-    },
-    'Wrong error for not 201 responce code.'
+    'Expected error for not 201 responce code.'
   );
 
   let record = yield db.getAllKeyIDs();
diff --git a/dom/push/test/xpcshell/test_register_flush.js b/dom/push/test/xpcshell/test_register_flush.js
index a22e9dada4..ec6474398a 100644
--- a/dom/push/test/xpcshell/test_register_flush.js
+++ b/dom/push/test/xpcshell/test_register_flush.js
@@ -37,8 +37,8 @@ add_task(function* test_register_flush() {
 
   let notifyPromise = promiseObserverNotification('push-notification');
 
-  let ackDefer = Promise.defer();
-  let ackDone = after(2, ackDefer.resolve);
+  let ackDone;
+  let ackPromise = new Promise(resolve => ackDone = after(2, resolve));
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -80,14 +80,12 @@ add_task(function* test_register_flush() {
     'https://example.com/page/2', '');
   equal(newRecord.pushEndpoint, 'https://example.org/update/2',
     'Wrong push endpoint in record');
-  equal(newRecord.scope, 'https://example.com/page/2',
-    'Wrong scope in record');
 
   let {data: scope} = yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for notification');
   equal(scope, 'https://example.com/page/1', 'Wrong notification scope');
 
-  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
      'Timed out waiting for acknowledgements');
 
   let prevRecord = yield db.getByKeyID(
@@ -97,8 +95,6 @@ add_task(function* test_register_flush() {
   strictEqual(prevRecord.version, 3,
     'Should record version updates sent before register responses');
 
-  let registeredRecord = yield db.getByKeyID(newRecord.channelID);
-  equal(registeredRecord.pushEndpoint, 'https://example.org/update/2',
-    'Wrong new push endpoint');
+  let registeredRecord = yield db.getByPushEndpoint('https://example.org/update/2');
   ok(!registeredRecord.version, 'Should not record premature updates');
 });
diff --git a/dom/push/test/xpcshell/test_register_invalid_channel.js b/dom/push/test/xpcshell/test_register_invalid_channel.js
index fa1686a643..88d27284d3 100644
--- a/dom/push/test/xpcshell/test_register_invalid_channel.js
+++ b/dom/push/test/xpcshell/test_register_invalid_channel.js
@@ -50,10 +50,7 @@ add_task(function* test_register_invalid_channel() {
   yield rejects(
     PushNotificationService.register('https://example.com/invalid-channel',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'Invalid channel ID';
-    },
-    'Wrong error for invalid channel ID'
+    'Expected error for invalid channel ID'
   );
 
   let record = yield db.getByKeyID(channelID);
diff --git a/dom/push/test/xpcshell/test_register_invalid_endpoint.js b/dom/push/test/xpcshell/test_register_invalid_endpoint.js
index fc111e8cb0..85bb46a6e8 100644
--- a/dom/push/test/xpcshell/test_register_invalid_endpoint.js
+++ b/dom/push/test/xpcshell/test_register_invalid_endpoint.js
@@ -52,10 +52,7 @@ add_task(function* test_register_invalid_endpoint() {
     PushNotificationService.register(
       'https://example.net/page/invalid-endpoint',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error && error.includes('Invalid pushEndpoint');
-    },
-    'Wrong error for invalid endpoint'
+    'Expected error for invalid endpoint'
   );
 
   let record = yield db.getByKeyID(channelID);
diff --git a/dom/push/test/xpcshell/test_register_invalid_json.js b/dom/push/test/xpcshell/test_register_invalid_json.js
index f45d3a06d1..febf3ea494 100644
--- a/dom/push/test/xpcshell/test_register_invalid_json.js
+++ b/dom/push/test/xpcshell/test_register_invalid_json.js
@@ -21,8 +21,8 @@ function run_test() {
 }
 
 add_task(function* test_register_invalid_json() {
-  let helloDefer = Promise.defer();
-  let helloDone = after(2, helloDefer.resolve);
+  let helloDone;
+  let helloPromise = new Promise(resolve => helloDone = after(2, resolve));
   let registers = 0;
 
   PushServiceWebSocket._generateID = () => channelID;
@@ -51,13 +51,10 @@ add_task(function* test_register_invalid_json() {
   yield rejects(
     PushNotificationService.register('https://example.net/page/invalid-json',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'TimeoutError';
-    },
-    'Wrong error for invalid JSON response'
+    'Expected error for invalid JSON response'
   );
 
-  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(helloPromise, DEFAULT_TIMEOUT,
     'Reconnect after invalid JSON response timed out');
   equal(registers, 1, 'Wrong register count');
 });
diff --git a/dom/push/test/xpcshell/test_register_no_id.js b/dom/push/test/xpcshell/test_register_no_id.js
index fac560acf8..cdf1547232 100644
--- a/dom/push/test/xpcshell/test_register_no_id.js
+++ b/dom/push/test/xpcshell/test_register_no_id.js
@@ -23,8 +23,8 @@ function run_test() {
 
 add_task(function* test_register_no_id() {
   let registers = 0;
-  let helloDefer = Promise.defer();
-  let helloDone = after(2, helloDefer.resolve);
+  let helloDone;
+  let helloPromise = new Promise(resolve => helloDone = after(2, resolve));
 
   PushServiceWebSocket._generateID = () => channelID;
   PushService.init({
@@ -55,13 +55,10 @@ add_task(function* test_register_no_id() {
   yield rejects(
     PushNotificationService.register('https://example.com/incomplete',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'TimeoutError';
-    },
-    'Wrong error for incomplete register response'
+    'Expected error for incomplete register response'
   );
 
-  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(helloPromise, DEFAULT_TIMEOUT,
     'Reconnect after incomplete register response timed out');
   equal(registers, 1, 'Wrong register count');
 });
diff --git a/dom/push/test/xpcshell/test_register_request_queue.js b/dom/push/test/xpcshell/test_register_request_queue.js
index be7b2d761b..7cc2572901 100644
--- a/dom/push/test/xpcshell/test_register_request_queue.js
+++ b/dom/push/test/xpcshell/test_register_request_queue.js
@@ -21,15 +21,16 @@ add_task(function* test_register_request_queue() {
   let db = PushServiceWebSocket.newPushDB();
   do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
-  let helloDefer = Promise.defer();
-  let onHello = after(2, function onHello(request) {
+  let onHello;
+  let helloPromise = new Promise(resolve => onHello = after(2, function onHello(request) {
     this.serverSendMsg(JSON.stringify({
       messageType: 'hello',
       status: 200,
       uaid: '54b08a9e-59c6-4ed7-bb54-f4fd60d6f606'
     }));
-    helloDefer.resolve();
-  });
+    resolve();
+  }));
+
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -54,14 +55,10 @@ add_task(function* test_register_request_queue() {
   );
 
   yield waitForPromise(Promise.all([
-    rejects(firstRegister, function(error) {
-      return error == 'TimeoutError';
-    }, 'Should time out the first request'),
-    rejects(secondRegister, function(error) {
-      return error == 'TimeoutError';
-    }, 'Should time out the second request')
+    rejects(firstRegister, 'Should time out the first request'),
+    rejects(secondRegister, 'Should time out the second request')
   ]), DEFAULT_TIMEOUT, 'Queued requests did not time out');
 
-  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(helloPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for reconnect');
 });
diff --git a/dom/push/test/xpcshell/test_register_rollback.js b/dom/push/test/xpcshell/test_register_rollback.js
index 4639e500c8..ddb1eb2d8e 100644
--- a/dom/push/test/xpcshell/test_register_rollback.js
+++ b/dom/push/test/xpcshell/test_register_rollback.js
@@ -27,7 +27,8 @@ add_task(function* test_register_rollback() {
 
   let handshakes = 0;
   let registers = 0;
-  let unregisterDefer = Promise.defer();
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = resolve);
   PushServiceWebSocket._generateID = () => channelID;
   PushService.init({
     serverURI: "wss://push.example.org/",
@@ -66,7 +67,7 @@ add_task(function* test_register_rollback() {
             status: 200,
             channelID
           }));
-          unregisterDefer.resolve();
+          unregisterDone();
         }
       });
     }
@@ -76,14 +77,11 @@ add_task(function* test_register_rollback() {
   yield rejects(
     PushNotificationService.register('https://example.com/storage-error',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'universe has imploded';
-    },
-    'Wrong error for unregister database failure'
+    'Expected error for unregister database failure'
   );
 
   // Should send an out-of-band unregister request.
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Unregister request timed out');
   equal(handshakes, 1, 'Wrong handshake count');
   equal(registers, 1, 'Wrong register count');
diff --git a/dom/push/test/xpcshell/test_register_success.js b/dom/push/test/xpcshell/test_register_success.js
index ce14cffd52..82c4365188 100644
--- a/dom/push/test/xpcshell/test_register_success.js
+++ b/dom/push/test/xpcshell/test_register_success.js
@@ -60,22 +60,14 @@ add_task(function* test_register_success() {
     'https://example.org/1',
     ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })
   );
-  equal(newRecord.channelID, channelID,
-    'Wrong channel ID in registration record');
   equal(newRecord.pushEndpoint, 'https://example.com/update/1',
     'Wrong push endpoint in registration record');
-  equal(newRecord.scope, 'https://example.org/1',
-    'Wrong scope in registration record');
-  equal(newRecord.quota, Infinity,
-    'Wrong quota in registration record');
 
   let record = yield db.getByKeyID(channelID);
   equal(record.channelID, channelID,
     'Wrong channel ID in database record');
   equal(record.pushEndpoint, 'https://example.com/update/1',
     'Wrong push endpoint in database record');
-  equal(record.scope, 'https://example.org/1',
-    'Wrong scope in database record');
   equal(record.quota, Infinity,
     'Wrong quota in database record');
 });
diff --git a/dom/push/test/xpcshell/test_register_success_http2.js b/dom/push/test/xpcshell/test_register_success_http2.js
index a993e64e6c..7930ca7d86 100644
--- a/dom/push/test/xpcshell/test_register_success_http2.js
+++ b/dom/push/test/xpcshell/test_register_success_http2.js
@@ -64,15 +64,11 @@ add_task(function* test_pushSubscriptionSuccess() {
   var subscriptionUri = serverURL + '/pushSubscriptionSuccesss';
   var pushEndpoint = serverURL + '/pushEndpointSuccess';
   var pushReceiptEndpoint = serverURL + '/receiptPushEndpointSuccess';
-  equal(newRecord.subscriptionUri, subscriptionUri,
-    'Wrong subscription ID in registration record');
   equal(newRecord.pushEndpoint, pushEndpoint,
     'Wrong push endpoint in registration record');
 
   equal(newRecord.pushReceiptEndpoint, pushReceiptEndpoint,
     'Wrong push endpoint receipt in registration record');
-  equal(newRecord.scope, 'https://example.org/1',
-    'Wrong scope in registration record');
 
   let record = yield db.getByKeyID(subscriptionUri);
   equal(record.subscriptionUri, subscriptionUri,
@@ -107,15 +103,11 @@ add_task(function* test_pushSubscriptionMissingLink2() {
   var subscriptionUri = serverURL + '/subscriptionMissingLink2';
   var pushEndpoint = serverURL + '/pushEndpointMissingLink2';
   var pushReceiptEndpoint = '';
-  equal(newRecord.subscriptionUri, subscriptionUri,
-    'Wrong subscription ID in registration record');
   equal(newRecord.pushEndpoint, pushEndpoint,
     'Wrong push endpoint in registration record');
 
   equal(newRecord.pushReceiptEndpoint, pushReceiptEndpoint,
     'Wrong push endpoint receipt in registration record');
-  equal(newRecord.scope, 'https://example.org/no_receiptEndpoint',
-    'Wrong scope in registration record');
 
   let record = yield db.getByKeyID(subscriptionUri);
   equal(record.subscriptionUri, subscriptionUri,
diff --git a/dom/push/test/xpcshell/test_register_timeout.js b/dom/push/test/xpcshell/test_register_timeout.js
index 31fdde999c..12e604f6b4 100644
--- a/dom/push/test/xpcshell/test_register_timeout.js
+++ b/dom/push/test/xpcshell/test_register_timeout.js
@@ -22,7 +22,8 @@ function run_test() {
 
 add_task(function* test_register_timeout() {
   let handshakes = 0;
-  let timeoutDefer = Promise.defer();
+  let timeoutDone;
+  let timeoutPromise = new Promise(resolve => timeoutDone = resolve);
   let registers = 0;
 
   let db = PushServiceWebSocket.newPushDB();
@@ -36,23 +37,14 @@ add_task(function* test_register_timeout() {
     makeWebSocket(uri) {
       return new MockWebSocket(uri, {
         onHello(request) {
-          switch (handshakes) {
-          case 0:
+          if (handshakes === 0) {
             equal(request.uaid, null, 'Should not include device ID');
-            deepEqual(request.channelIDs, [],
-              'Should include empty channel list');
-            break;
-
-          case 1:
+          } else if (handshakes === 1) {
             // Should use the previously-issued device ID when reconnecting,
             // but should not include the timed-out channel ID.
             equal(request.uaid, userAgentID,
               'Should include device ID on reconnect');
-            deepEqual(request.channelIDs, [],
-              'Should not include failed channel ID');
-            break;
-
-          default:
+          } else {
             ok(false, 'Unexpected reconnect attempt ' + handshakes);
           }
           handshakes++;
@@ -74,7 +66,7 @@ add_task(function* test_register_timeout() {
               uaid: userAgentID,
               pushEndpoint: 'https://example.com/update/timeout',
             }));
-            timeoutDefer.resolve();
+            timeoutDone();
           }, 2000);
           registers++;
         }
@@ -85,17 +77,14 @@ add_task(function* test_register_timeout() {
   yield rejects(
     PushNotificationService.register('https://example.net/page/timeout',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'TimeoutError';
-    },
-    'Wrong error for request timeout'
+    'Expected error for request timeout'
   );
 
   let record = yield db.getByKeyID(channelID);
   ok(!record, 'Should not store records for timed-out responses');
 
   yield waitForPromise(
-    timeoutDefer.promise,
+    timeoutPromise,
     DEFAULT_TIMEOUT,
     'Reconnect timed out'
   );
diff --git a/dom/push/test/xpcshell/test_register_wrong_id.js b/dom/push/test/xpcshell/test_register_wrong_id.js
index 96966ecea3..7fc47cb948 100644
--- a/dom/push/test/xpcshell/test_register_wrong_id.js
+++ b/dom/push/test/xpcshell/test_register_wrong_id.js
@@ -25,8 +25,8 @@ function run_test() {
 add_task(function* test_register_wrong_id() {
   // Should reconnect after the register request times out.
   let registers = 0;
-  let helloDefer = Promise.defer();
-  let helloDone = after(2, helloDefer.resolve);
+  let helloDone;
+  let helloPromise = new Promise(resolve => helloDone = after(2, resolve));
 
   PushServiceWebSocket._generateID = () => clientChannelID;
   PushService.init({
@@ -61,13 +61,10 @@ add_task(function* test_register_wrong_id() {
   yield rejects(
     PushNotificationService.register('https://example.com/mismatched',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'TimeoutError';
-    },
-    'Wrong error for mismatched register reply'
+    'Expected error for mismatched register reply'
   );
 
-  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(helloPromise, DEFAULT_TIMEOUT,
     'Reconnect after mismatched register reply timed out');
   equal(registers, 1, 'Wrong register count');
 });
diff --git a/dom/push/test/xpcshell/test_register_wrong_type.js b/dom/push/test/xpcshell/test_register_wrong_type.js
index ddedcf302a..9793d4f949 100644
--- a/dom/push/test/xpcshell/test_register_wrong_type.js
+++ b/dom/push/test/xpcshell/test_register_wrong_type.js
@@ -21,8 +21,8 @@ function run_test() {
 
 add_task(function* test_register_wrong_type() {
   let registers = 0;
-  let helloDefer = Promise.defer();
-  let helloDone = after(2, helloDefer.resolve);
+  let helloDone;
+  let helloPromise = new Promise(resolve => helloDone = after(2, resolve));
 
   PushService._generateID = () => '1234';
   PushService.init({
@@ -52,18 +52,13 @@ add_task(function* test_register_wrong_type() {
     }
   });
 
-  let promise =
-
   yield rejects(
     PushNotificationService.register('https://example.com/mistyped',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error == 'TimeoutError';
-    },
-    'Wrong error for non-string channel ID'
+    'Expected error for non-string channel ID'
   );
 
-  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(helloPromise, DEFAULT_TIMEOUT,
     'Reconnect after sending non-string channel ID timed out');
   equal(registers, 1, 'Wrong register count');
 });
diff --git a/dom/push/test/xpcshell/test_registration_missing_scope.js b/dom/push/test/xpcshell/test_registration_missing_scope.js
index c32955aead..b1b4a79a02 100644
--- a/dom/push/test/xpcshell/test_registration_missing_scope.js
+++ b/dom/push/test/xpcshell/test_registration_missing_scope.js
@@ -21,9 +21,6 @@ add_task(function* test_registration_missing_scope() {
   });
   yield rejects(
     PushNotificationService.registration('', ''),
-    function(error) {
-      return error.error == 'NotFoundError';
-    },
     'Record missing page and manifest URLs'
   );
 });
diff --git a/dom/push/test/xpcshell/test_registration_success.js b/dom/push/test/xpcshell/test_registration_success.js
index 71dc1e2d1e..e4c81f3b6e 100644
--- a/dom/push/test/xpcshell/test_registration_success.js
+++ b/dom/push/test/xpcshell/test_registration_success.js
@@ -42,7 +42,8 @@ add_task(function* test_registration_success() {
     yield db.put(record);
   }
 
-  let handshakeDefer = Promise.defer();
+  let handshakeDone;
+  let handshakePromise = new Promise(resolve => handshakeDone = resolve);
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -50,24 +51,19 @@ add_task(function* test_registration_success() {
       return new MockWebSocket(uri, {
         onHello(request) {
           equal(request.uaid, userAgentID, 'Wrong device ID in handshake');
-          deepEqual(request.channelIDs.sort(), [
-            'b1cf38c9-6836-4d29-8a30-a3e98d59b728',
-            'bf001fe0-2684-42f2-bc4d-a3e14b11dd5b',
-            'f6edfbcd-79d6-49b8-9766-48b9dcfeff0f',
-          ], 'Wrong channel list in handshake');
           this.serverSendMsg(JSON.stringify({
             messageType: 'hello',
             status: 200,
             uaid: userAgentID
           }));
-          handshakeDefer.resolve();
+          handshakeDone();
         }
       });
     }
   });
 
   yield waitForPromise(
-    handshakeDefer.promise,
+    handshakePromise,
     DEFAULT_TIMEOUT,
     'Timed out waiting for handshake'
   );
diff --git a/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js b/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js
index 7ce2c286e4..c8b43c3f40 100644
--- a/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js
+++ b/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js
@@ -83,7 +83,6 @@ add_task(function* test1() {
 
   PushService.init({
     serverURI: serverURL + "/subscribe",
-    service: PushServiceHttp2,
     db
   });
 
diff --git a/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js b/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js
index e5cd52368e..0f7739e2ff 100644
--- a/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js
+++ b/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js
@@ -93,7 +93,6 @@ add_task(function* test1() {
 
   PushService.init({
     serverURI: serverURL + "/subscribe",
-    service: PushServiceHttp2,
     db
   });
 
diff --git a/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js b/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js
index 8cd82f6760..7416862c59 100644
--- a/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js
+++ b/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js
@@ -88,7 +88,6 @@ add_task(function* test1() {
 
   PushService.init({
     serverURI: serverURL + "/subscribe",
-    service: PushServiceHttp2,
     db
   });
 
diff --git a/dom/push/test/xpcshell/test_retry_ws.js b/dom/push/test/xpcshell/test_retry_ws.js
new file mode 100644
index 0000000000..9287bd2ebb
--- /dev/null
+++ b/dom/push/test/xpcshell/test_retry_ws.js
@@ -0,0 +1,71 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+const userAgentID = '05f7b940-51b6-4b6f-8032-b83ebb577ded';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID: userAgentID,
+    pingInterval: 10000,
+    retryBaseInterval: 25,
+  });
+  run_next_test();
+}
+
+add_task(function* test_ws_retry() {
+  let db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+
+  yield db.put({
+    channelID: '61770ba9-2d57-4134-b949-d40404630d5b',
+    pushEndpoint: 'https://example.org/push/1',
+    scope: 'https://example.net/push/1',
+    version: 1,
+    originAttributes: '',
+    quota: Infinity,
+  });
+
+  let alarmDelays = [];
+  let setAlarm = PushService.setAlarm;
+  PushService.setAlarm = function(delay) {
+    alarmDelays.push(delay);
+    setAlarm.apply(this, arguments);
+  };
+
+  let handshakeDone;
+  let handshakePromise = new Promise(resolve => handshakeDone = resolve);
+  PushService.init({
+    serverURI: "wss://push.example.org/",
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          if (alarmDelays.length == 10) {
+            PushService.setAlarm = setAlarm;
+            this.serverSendMsg(JSON.stringify({
+              messageType: 'hello',
+              status: 200,
+              uaid: userAgentID,
+            }));
+            handshakeDone();
+            return;
+          }
+          this.serverInterrupt();
+        },
+      });
+    },
+  });
+
+  yield waitForPromise(
+    handshakePromise,
+    45000,
+    'Timed out waiting for successful handshake'
+  );
+  deepEqual(alarmDelays, [25, 50, 100, 200, 400, 800, 1600, 3200, 6400, 10000],
+    'Wrong reconnect alarm delays');
+});
diff --git a/dom/push/test/xpcshell/test_unregister_empty_scope.js b/dom/push/test/xpcshell/test_unregister_empty_scope.js
index 63846cf7a3..c3760be121 100644
--- a/dom/push/test/xpcshell/test_unregister_empty_scope.js
+++ b/dom/push/test/xpcshell/test_unregister_empty_scope.js
@@ -31,9 +31,6 @@ add_task(function* test_unregister_empty_scope() {
   yield rejects(
     PushNotificationService.unregister('',
       ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })),
-    function(error) {
-      return error.error == 'NotFoundError';
-    },
-    'Wrong error for empty endpoint'
+    'Expected error for empty endpoint'
   );
 });
diff --git a/dom/push/test/xpcshell/test_unregister_error.js b/dom/push/test/xpcshell/test_unregister_error.js
index d485bf3a32..752926fc8b 100644
--- a/dom/push/test/xpcshell/test_unregister_error.js
+++ b/dom/push/test/xpcshell/test_unregister_error.js
@@ -25,7 +25,8 @@ add_task(function* test_unregister_error() {
     quota: Infinity,
   });
 
-  let unregisterDefer = Promise.defer();
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = resolve);
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -49,7 +50,7 @@ add_task(function* test_unregister_error() {
             error: 'omg, everything is exploding',
             channelID
           }));
-          unregisterDefer.resolve();
+          unregisterDone();
         }
       });
     }
@@ -62,6 +63,6 @@ add_task(function* test_unregister_error() {
   ok(!result, 'Deleted push record exists');
 
   // Make sure we send a request to the server.
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for unregister');
 });
diff --git a/dom/push/test/xpcshell/test_unregister_invalid_json.js b/dom/push/test/xpcshell/test_unregister_invalid_json.js
index dfc4730509..3344299ff4 100644
--- a/dom/push/test/xpcshell/test_unregister_invalid_json.js
+++ b/dom/push/test/xpcshell/test_unregister_invalid_json.js
@@ -39,8 +39,8 @@ add_task(function* test_unregister_invalid_json() {
     yield db.put(record);
   }
 
-  let unregisterDefer = Promise.defer();
-  let unregisterDone = after(2, unregisterDefer.resolve);
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = after(2, resolve));
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -77,6 +77,6 @@ add_task(function* test_unregister_invalid_json() {
   ok(!record,
     'Failed to delete unregistered record after receiving invalid JSON');
 
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for unregister');
 });
diff --git a/dom/push/test/xpcshell/test_unregister_success.js b/dom/push/test/xpcshell/test_unregister_success.js
index 247aa55bd3..4cc2a2f4e7 100644
--- a/dom/push/test/xpcshell/test_unregister_success.js
+++ b/dom/push/test/xpcshell/test_unregister_success.js
@@ -25,7 +25,8 @@ add_task(function* test_unregister_success() {
     quota: Infinity,
   });
 
-  let unregisterDefer = Promise.defer();
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = resolve);
   PushService.init({
     serverURI: "wss://push.example.org/",
     networkInfo: new MockDesktopNetworkInfo(),
@@ -46,7 +47,7 @@ add_task(function* test_unregister_success() {
             status: 200,
             channelID
           }));
-          unregisterDefer.resolve();
+          unregisterDone();
         }
       });
     }
@@ -57,6 +58,6 @@ add_task(function* test_unregister_success() {
   let record = yield db.getByKeyID(channelID);
   ok(!record, 'Unregister did not remove record');
 
-  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+  yield waitForPromise(unregisterPromise, DEFAULT_TIMEOUT,
     'Timed out waiting for unregister');
 });
diff --git a/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_http2.js b/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_http2.js
index a091b566fe..1b7b64ba0b 100644
--- a/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_http2.js
+++ b/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_http2.js
@@ -66,7 +66,6 @@ add_task(function* test1() {
 
   PushService.init({
     serverURI: serverURL + "/subscribe",
-    service: PushServiceHttp2,
     db
   });
 
diff --git a/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_ws.js b/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_ws.js
index 527de69437..a3b8bf5380 100644
--- a/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_ws.js
+++ b/dom/push/test/xpcshell/test_updateRecordNoEncryptionKeys_ws.js
@@ -77,8 +77,7 @@ add_task(function* test_with_data_enabled() {
     'https://example.com/page/3',
     ChromeUtils.originAttributesToSuffix({ appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inBrowser: false })
   );
-  ok(newRecord.p256dhPublicKey, 'Should generate public keys for new records');
-  ok(newRecord.p256dhPrivateKey, 'Should generate private keys for new records');
+  ok(newRecord.p256dhKey, 'Should generate public keys for new records');
 
   let record = yield db.getByKeyID('eb18f12a-cc42-4f14-accb-3bfc1227f1aa');
   ok(record.p256dhPublicKey, 'Should add public key to partial record');
diff --git a/dom/push/test/xpcshell/test_webapps_cleardata.js b/dom/push/test/xpcshell/test_webapps_cleardata.js
deleted file mode 100644
index 4d23f18595..0000000000
--- a/dom/push/test/xpcshell/test_webapps_cleardata.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-'use strict';
-
-const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
-
-const userAgentID = 'bd744428-f125-436a-b6d0-dd0c9845837f';
-const channelIDs = ['0ef2ad4a-6c49-41ad-af6e-95d2425276bf', '4818b54a-97c5-4277-ad5d-0bfe630e4e50'];
-var channelIDCounter = 0;
-
-function run_test() {
-  do_get_profile();
-  setPrefs({
-    userAgentID,
-    requestTimeout: 1000,
-    retryBaseInterval: 150
-  });
-  disableServiceWorkerEvents(
-    'https://example.org/1'
-  );
-  run_next_test();
-}
-
-add_task(function* test_webapps_cleardata() {
-  let db = PushServiceWebSocket.newPushDB();
-  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
-
-  PushService.init({
-    serverURI: "wss://push.example.org",
-    networkInfo: new MockDesktopNetworkInfo(),
-    db,
-    makeWebSocket(uri) {
-      return new MockWebSocket(uri, {
-        onHello(data) {
-          equal(data.messageType, 'hello', 'Handshake: wrong message type');
-          equal(data.uaid, userAgentID, 'Handshake: wrong device ID');
-          this.serverSendMsg(JSON.stringify({
-            messageType: 'hello',
-            status: 200,
-            uaid: userAgentID
-          }));
-        },
-        onRegister(data) {
-          equal(data.messageType, 'register', 'Register: wrong message type');
-          this.serverSendMsg(JSON.stringify({
-            messageType: 'register',
-            status: 200,
-            channelID: data.channelID,
-            uaid: userAgentID,
-            pushEndpoint: 'https://example.com/update/' + Math.random(),
-          }));
-        }
-      });
-    }
-  });
-
-  let registers = yield Promise.all([
-    PushNotificationService.register(
-      'https://example.org/1',
-      ChromeUtils.originAttributesToSuffix({ appId: 1, inBrowser: false })),
-    PushNotificationService.register(
-      'https://example.org/1',
-      ChromeUtils.originAttributesToSuffix({ appId: 1, inBrowser: true })),
-  ]);
-
-  Services.obs.notifyObservers(
-      { appId: 1, browserOnly: false,
-        QueryInterface: XPCOMUtils.generateQI([Ci.mozIApplicationClearPrivateDataParams])},
-      "webapps-clear-data", "");
-
-  let waitAWhile = new Promise(function(res) {
-    setTimeout(res, 2000);
-  });
-  yield waitAWhile;
-
-  let registration;
-  registration = yield PushNotificationService.registration(
-    'https://example.org/1',
-    ChromeUtils.originAttributesToSuffix({ appId: 1, inBrowser: false }));
-  ok(!registration, 'Registration for { 1, false } should not exist.');
-
-  registration = yield PushNotificationService.registration(
-    'https://example.org/1',
-    ChromeUtils.originAttributesToSuffix({ appId: 1, inBrowser: true }));
-  ok(registration, 'Registration for { 1, true } should still exist.');
-});
-
diff --git a/dom/push/test/xpcshell/xpcshell.ini b/dom/push/test/xpcshell/xpcshell.ini
index ff3a5162aa..e63acd37bc 100644
--- a/dom/push/test/xpcshell/xpcshell.ini
+++ b/dom/push/test/xpcshell/xpcshell.ini
@@ -4,11 +4,18 @@ tail =
 # Push notifications and alarms are currently disabled on Android.
 skip-if = toolkit == 'android'
 
+[test_clear_origin_data.js]
+[test_drop_expired.js]
 [test_notification_ack.js]
+[test_notification_data.js]
 [test_notification_duplicate.js]
 [test_notification_error.js]
 [test_notification_incomplete.js]
 [test_notification_version_string.js]
+
+[test_permissions.js]
+run-sequentially = This will delete all existing push subscriptions.
+
 [test_quota_exceeded.js]
 [test_quota_observer.js]
 [test_register_case.js]
@@ -32,8 +39,9 @@ skip-if = toolkit == 'android'
 [test_unregister_invalid_json.js]
 [test_unregister_not_found.js]
 [test_unregister_success.js]
-[test_webapps_cleardata.js]
 [test_updateRecordNoEncryptionKeys_ws.js]
+[test_reconnect_retry.js]
+[test_retry_ws.js]
 #http2 test
 [test_resubscribe_4xxCode_http2.js]
 [test_resubscribe_5xxCode_http2.js]
@@ -60,4 +68,4 @@ skip-if = !hasNode
 run-sequentially = node server exceptions dont replay well
 [test_clearAll_successful.js]
 skip-if = !hasNode
-run-sequentially = This will delete all existing push subscritions.
+run-sequentially = This will delete all existing push subscriptions.
diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp
index 7f3c2f0001..bbbb68b9b1 100644
--- a/dom/security/nsContentSecurityManager.cpp
+++ b/dom/security/nsContentSecurityManager.cpp
@@ -447,7 +447,8 @@ nsContentSecurityManager::IsURIPotentiallyTrustworthy(nsIURI* aURI, bool* aIsTru
 
   if (scheme.EqualsLiteral("https") ||
       scheme.EqualsLiteral("file") ||
-      scheme.EqualsLiteral("app")) {
+      scheme.EqualsLiteral("app") ||
+      scheme.EqualsLiteral("wss")) {
     *aIsTrustWorthy = true;
     return NS_OK;
   }
diff --git a/dom/simplepush/PushService.jsm b/dom/simplepush/PushService.jsm
index cdbc22b071..b5c9f1f54c 100644
--- a/dom/simplepush/PushService.jsm
+++ b/dom/simplepush/PushService.jsm
@@ -1576,14 +1576,6 @@ this.PushService = {
     if (this._UAID)
       data["uaid"] = this._UAID;
 
-    function sendHelloMessage(ids) {
-      // On success, ids is an array, on error its not.
-      data["channelIDs"] = ids.map ?
-                           ids.map(function(el) { return el.channelID; }) : [];
-      this._wsSendMessage(data);
-      this._currentState = STATE_WAITING_FOR_HELLO;
-    }
-
     this._getNetworkState((networkState) => {
       if (networkState.ip) {
         // Opening an available UDP port.
@@ -1602,8 +1594,8 @@ this.PushService = {
         };
       }
 
-      this._db.getAllChannelIDs(sendHelloMessage.bind(this),
-                                sendHelloMessage.bind(this));
+      this._wsSendMessage(data);
+      this._currentState = STATE_WAITING_FOR_HELLO;
     });
   },
 
diff --git a/dom/svg/test/test_SVGxxxListIndexing.xhtml b/dom/svg/test/test_SVGxxxListIndexing.xhtml
index 10f6f1ba57..31544b23dd 100644
--- a/dom/svg/test/test_SVGxxxListIndexing.xhtml
+++ b/dom/svg/test/test_SVGxxxListIndexing.xhtml
@@ -79,13 +79,13 @@ var tests = [
                 { values: "foo bar baz qux", length: 4 } ] }
 ];
 
-for each (let test in tests) {
+for (let test of tests) {
   let list = test.element;
-  for each (let property in test.listProperty.split(".")) {
+  for (let property of test.listProperty.split(".")) {
     list = list[property];
   }
 
-  for each (let subtest in test.subtests) {
+  for (let subtest of test.subtests) {
     if (subtest.values) {
       test.element.setAttribute(test.attribute, subtest.values);
     }
diff --git a/dom/svg/test/test_pathAnimInterpolation.xhtml b/dom/svg/test/test_pathAnimInterpolation.xhtml
index 66b89f09f1..5269db1ca9 100644
--- a/dom/svg/test/test_pathAnimInterpolation.xhtml
+++ b/dom/svg/test/test_pathAnimInterpolation.xhtml
@@ -267,7 +267,7 @@ function isValidInterpolation(aFromType, aToType)
 // Runs the test.
 function run()
 {
-  for each (let additive in [false, true]) {
+  for (let additive of [false, true]) {
     let indexOfExpectedArguments = additive ? 3 : 2;
 
     // Add subtests for each combination of prefix and suffix, and additive
@@ -279,7 +279,7 @@ function run()
           toArguments = suffixEntry[1],
           expectedArguments = suffixEntry[indexOfExpectedArguments];
 
-      for each (let prefixEntry in gPrefixes) {
+      for (let prefixEntry of gPrefixes) {
         let [prefixLength, prefix] = prefixEntry;
         addTest(prefixLength, prefix, fromType, fromArguments,
 	        toType, toArguments, toType, expectedArguments, additive);
@@ -298,9 +298,9 @@ function run()
 	    "a", [60, 70, 80, 1, 0, 90, 100], additive);
 
     // Test all pairs of segment types that cannot be interpolated between.
-    for each (let fromType in gTypes) {
+    for (let fromType of gTypes) {
       let fromArguments = generatePathSegmentArguments(fromType, 0);
-      for each (let toType in gTypes) {
+      for (let toType of gTypes) {
         if (!isValidInterpolation(fromType, toType)) {
           let toArguments = generatePathSegmentArguments(toType, 1000);
           addTest(1, "M100,100", fromType, fromArguments,
@@ -314,7 +314,7 @@ function run()
   gSVG.setCurrentTime(4);
 
   // Inspect the results of each subtest.
-  for each (let test in gTests) {
+  for (let test of gTests) {
     let list = test.element.animatedPathSegList;
     is(list.numberOfItems, test.prefixLength + 1,
        "Length of animatedPathSegList for interpolation " +
diff --git a/dom/system/gonk/NetworkInterfaceListService.js b/dom/system/gonk/NetworkInterfaceListService.js
index 81f0934ef7..62fe046aad 100644
--- a/dom/system/gonk/NetworkInterfaceListService.js
+++ b/dom/system/gonk/NetworkInterfaceListService.js
@@ -50,7 +50,7 @@ NetworkInterfaceListService.prototype = {
   }
 };
 
-function FakeNetworkInterface(aAttributes) {
+function FakeNetworkInfo(aAttributes) {
   this.state = aAttributes.state;
   this.type = aAttributes.type;
   this.name = aAttributes.name;
@@ -58,11 +58,9 @@ function FakeNetworkInterface(aAttributes) {
   this.prefixLengths = aAttributes.prefixLengths;
   this.gateways = aAttributes.gateways;
   this.dnses = aAttributes.dnses;
-  this.httpProxyHost = aAttributes.httpProxyHost;
-  this.httpProxyPort = aAttributes.httpProxyPort;
 }
-FakeNetworkInterface.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInterface]),
+FakeNetworkInfo.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInfo]),
 
   getAddresses: function (ips, prefixLengths) {
     ips.value = this.ips.slice();
@@ -89,7 +87,7 @@ FakeNetworkInterface.prototype = {
 function NetworkInterfaceList (aInterfaceLiterals) {
   this._interfaces = [];
   for (let entry of aInterfaceLiterals) {
-    this._interfaces.push(new FakeNetworkInterface(entry));
+    this._interfaces.push(new FakeNetworkInfo(entry));
   }
 }
 
@@ -100,7 +98,7 @@ NetworkInterfaceList.prototype = {
     return this._interfaces.length;
   },
 
-  getInterface: function(index) {
+  getInterfaceInfo: function(index) {
     if (!this._interfaces) {
       return null;
     }
diff --git a/dom/system/gonk/NetworkManager.js b/dom/system/gonk/NetworkManager.js
index ee03ba65e5..927551e73e 100644
--- a/dom/system/gonk/NetworkManager.js
+++ b/dom/system/gonk/NetworkManager.js
@@ -35,6 +35,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "gPACGenerator",
                                    "@mozilla.org/pac-generator;1",
                                    "nsIPACGenerator");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gTetheringService",
+                                   "@mozilla.org/tethering/service;1",
+                                   "nsITetheringService");
+
 const TOPIC_INTERFACE_REGISTERED     = "network-interface-registered";
 const TOPIC_INTERFACE_UNREGISTERED   = "network-interface-unregistered";
 const TOPIC_ACTIVE_CHANGED           = "network-active-changed";
@@ -99,6 +103,7 @@ function ExtraNetworkInfo(aNetwork) {
   this.dnses = aNetwork.info.getDnses();
   this.httpProxyHost = aNetwork.httpProxyHost;
   this.httpProxyPort = aNetwork.httpProxyPort;
+  this.mtu = aNetwork.mtu;
 }
 ExtraNetworkInfo.prototype = {
   getAddresses: function(aIps, aPrefixLengths) {
@@ -231,7 +236,9 @@ NetworkManager.prototype = {
         let excludeFota = aMsg.json.excludeFota;
         let interfaces = [];
 
-        for each (let i in this.networkInterfaces) {
+        for (let key in this.networkInterfaces) {
+          let network = this.networkInterfaces[key];
+          let i = network.info;
           if ((i.type == Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE_MMS && excludeMms) ||
               (i.type == Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE_SUPL && excludeSupl) ||
               (i.type == Ci.nsINetworkInfo.NETWORK_TYPE_MOBILE_IMS && excludeIms) ||
@@ -251,9 +258,7 @@ NetworkManager.prototype = {
             ips: ips.value,
             prefixLengths: prefixLengths.value,
             gateways: i.getGateways(),
-            dnses: i.getDnses(),
-            httpProxyHost: i.httpProxyHost,
-            httpProxyPort: i.httpProxyPort
+            dnses: i.getDnses()
           });
         }
         return interfaces;
@@ -370,6 +375,13 @@ NetworkManager.prototype = {
             return this.setSecondaryDefaultRoute(extNetworkInfo);
           })
           .then(() => this._addSubnetRoutes(extNetworkInfo))
+          .then(() => {
+            if (extNetworkInfo.mtu <= 0) {
+              return;
+            }
+
+            return this._setMtu(extNetworkInfo);
+          })
           .then(() => this.setAndConfigureActive())
           .then(() => {
             // Update data connection when Wifi connected/disconnected
@@ -487,6 +499,18 @@ NetworkManager.prototype = {
 
   networkInterfaceLinks: null,
 
+  get allNetworkInfo() {
+    let allNetworkInfo = {};
+
+    for (let networkId in this.networkInterfaces) {
+      if (this.networkInterfaces.hasOwnProperty(networkId)) {
+        allNetworkInfo[networkId] = this.networkInterfaces[networkId].info;
+      }
+    }
+
+    return allNetworkInfo;
+  },
+
   _preferredNetworkType: DEFAULT_PREFERRED_NETWORK_TYPE,
   get preferredNetworkType() {
     return this._preferredNetworkType;
@@ -802,7 +826,8 @@ NetworkManager.prototype = {
     this._activeNetwork = null;
     let anyConnected = false;
 
-    for each (let network in this.networkInterfaces) {
+    for (let key in this.networkInterfaces) {
+      let network = this.networkInterfaces[key];
       if (network.info.state != Ci.nsINetworkInfo.NETWORK_STATE_CONNECTED) {
         continue;
       }
@@ -836,7 +861,9 @@ NetworkManager.prototype = {
         }
 
         if (this._manageOfflineStatus) {
-          Services.io.offline = !anyConnected;
+          Services.io.offline = !anyConnected &&
+                                (gTetheringService.state ===
+                                 Ci.nsITetheringService.TETHERING_STATE_INACTIVE);
         }
       });
   },
@@ -932,6 +959,18 @@ NetworkManager.prototype = {
     });
   },
 
+  _setMtu: function(aNetworkInfo) {
+    return new Promise((aResolve, aReject) => {
+      gNetworkService.setMtu(aNetworkInfo.name, aNetworkInfo.mtu, (aSuccess) => {
+        if (!aSuccess) {
+          debug("setMtu failed");
+        }
+        // Always resolve.
+        aResolve();
+      });
+    });
+  },
+
   _createNetwork: function(aInterfaceName) {
     return new Promise((aResolve, aReject) => {
       gNetworkService.createNetwork(aInterfaceName, (aSuccess) => {
@@ -982,13 +1021,18 @@ NetworkManager.prototype = {
     });
   },
 
-  _setDefaultRouteAndProxy: function(aNetwork, aOldInterface) {
+  _setDefaultRouteAndProxy: function(aNetwork, aOldNetwork) {
+    if (aOldNetwork) {
+      return this._removeDefaultRoute(aOldNetwork.info)
+        .then(() => this._setDefaultRouteAndProxy(aNetwork, null));
+    }
+
     return new Promise((aResolve, aReject) => {
       let networkInfo = aNetwork.info;
       let gateways = networkInfo.getGateways();
-      let oldInterfaceName = (aOldInterface ? aOldInterface.info.name : "");
+
       gNetworkService.setDefaultRoute(networkInfo.name, gateways.length, gateways,
-                                      oldInterfaceName, (aSuccess) => {
+                                      (aSuccess) => {
         if (!aSuccess) {
           gNetworkService.destroyNetwork(networkInfo.name, function() {
             aReject("setDefaultRoute failed");
diff --git a/dom/system/gonk/NetworkService.js b/dom/system/gonk/NetworkService.js
index e441330111..e621bccc6a 100644
--- a/dom/system/gonk/NetworkService.js
+++ b/dom/system/gonk/NetworkService.js
@@ -269,6 +269,58 @@ NetworkService.prototype = {
     });
   },
 
+  setNetworkTetheringAlarm(aEnable, aInterface) {
+    // Method called when enabling disabling tethering, it checks if there is
+    // some alarm active and move from interfaceAlarm to globalAlarm because
+    // interfaceAlarm doens't work in tethering scenario due to forwarding.
+    debug("setNetworkTetheringAlarm for tethering" + aEnable);
+
+    let filename = aEnable ? "/proc/net/xt_quota/" + aInterface + "Alert" :
+                             "/proc/net/xt_quota/globalAlert";
+
+    let file = new FileUtils.File(filename);
+    if (!file) {
+      return;
+    }
+
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(file),
+      loadUsingSystemPrincipal: true
+    }, (inputStream, status) => {
+      if (Components.isSuccessCode(status)) {
+        let data = NetUtil.readInputStreamToString(inputStream, inputStream.available())
+                          .split("\n");
+        if (data) {
+          let threshold = parseInt(data[0], 10);
+
+          this._setNetworkTetheringAlarm(aEnable, aInterface, threshold);
+        }
+      }
+    });
+  },
+
+  _setNetworkTetheringAlarm(aEnable, aInterface, aThreshold, aCallback) {
+    debug("_setNetworkTetheringAlarm for tethering" + aEnable);
+
+    let cmd = aEnable ? "setTetheringAlarm" : "removeTetheringAlarm";
+
+    let params = {
+      cmd: cmd,
+      ifname: aInterface,
+      threshold: aThreshold,
+    };
+
+    this.controlMessage(params, function(aData) {
+      let code = aData.resultCode;
+      let reason = aData.resultReason;
+      let enableString = aEnable ? "Enable" : "Disable";
+        debug(enableString + " tethering Alarm result: Code " + code + " reason " + reason);
+        if (aCallback) {
+          aCallback.networkUsageAlarmResult(null);
+        }
+    });
+  },
+
   setNetworkInterfaceAlarm: function(aInterfaceName, aThreshold, aCallback) {
     if (!aInterfaceName) {
       aCallback.networkUsageAlarmResult(-1);
@@ -286,7 +338,26 @@ NetworkService.prototype = {
         return
       }
 
-      self._setNetworkInterfaceAlarm(aInterfaceName, aThreshold, aCallback);
+      // Check if tethering is enabled
+      let params = {
+        cmd: "getTetheringStatus"
+      };
+
+      self.controlMessage(params, function(aResult) {
+        if (isError(aResult.resultCode)) {
+          aCallback.networkUsageAlarmResult(aResult.reason);
+          return;
+        }
+
+        if (aResult.resultReason.indexOf('started') == -1) {
+          // Tethering disabled, set interfaceAlarm
+          self._setNetworkInterfaceAlarm(aInterfaceName, aThreshold, aCallback);
+          return;
+        }
+
+        // Tethering enabled, set globalAlarm
+        self._setNetworkTetheringAlarm(true, aInterfaceName, aThreshold, aCallback);
+      });
     });
   },
 
@@ -392,14 +463,11 @@ NetworkService.prototype = {
     });
   },
 
-  setDefaultRoute: function(aInterfaceName, aCount, aGateways,
-                            aOldInterfaceName, aCallback) {
+  setDefaultRoute: function(aInterfaceName, aCount, aGateways, aCallback) {
     debug("Going to change default route to " + aInterfaceName);
     let options = {
       cmd: "setDefaultRoute",
       ifname: aInterfaceName,
-      oldIfname: (aOldInterfaceName && aOldInterfaceName !== aInterfaceName) ?
-                 aOldInterfaceName : null,
       gateways: aGateways
     };
     this.controlMessage(options, function(aResult) {
@@ -545,7 +613,7 @@ NetworkService.prototype = {
     aConfig.cmd = "setWifiTethering";
 
     // The callback function in controlMessage may not be fired immediately.
-    this.controlMessage(aConfig, function(aData) {
+    this.controlMessage(aConfig, (aData) => {
       let code = aData.resultCode;
       let reason = aData.resultReason;
       let enable = aData.enable;
@@ -553,6 +621,8 @@ NetworkService.prototype = {
 
       debug(enableString + " Wifi tethering result: Code " + code + " reason " + reason);
 
+      this.setNetworkTetheringAlarm(aEnable, aConfig.externalIfname);
+
       if (isError(code)) {
         aCallback.wifiTetheringEnabledChange("netd command error");
       } else {
@@ -565,7 +635,7 @@ NetworkService.prototype = {
   setUSBTethering: function(aEnable, aConfig, aCallback) {
     aConfig.cmd = "setUSBTethering";
     // The callback function in controlMessage may not be fired immediately.
-    this.controlMessage(aConfig, function(aData) {
+    this.controlMessage(aConfig, (aData) => {
       let code = aData.resultCode;
       let reason = aData.resultReason;
       let enable = aData.enable;
@@ -573,6 +643,8 @@ NetworkService.prototype = {
 
       debug(enableString + " USB tethering result: Code " + code + " reason " + reason);
 
+      this.setNetworkTetheringAlarm(aEnable, aConfig.externalIfname);
+
       if (isError(code)) {
         aCallback.usbTetheringEnabledChange("netd command error");
       } else {
@@ -729,6 +801,20 @@ NetworkService.prototype = {
       });
     });
   },
+
+  setMtu: function (aInterfaceName, aMtu, aCallback) {
+    debug("Set MTU on " + aInterfaceName + ": " + aMtu);
+
+    let params = {
+      cmd: "setMtu",
+      ifname: aInterfaceName,
+      mtu: aMtu
+    };
+
+    this.controlMessage(params, function(aResult) {
+      aCallback.nativeCommandResult(!aResult.error);
+    });
+  }
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([NetworkService]);
diff --git a/dom/system/gonk/NetworkUtils.cpp b/dom/system/gonk/NetworkUtils.cpp
index 4a656bdf74..9b4d7cb0de 100644
--- a/dom/system/gonk/NetworkUtils.cpp
+++ b/dom/system/gonk/NetworkUtils.cpp
@@ -51,6 +51,11 @@ static const char* USB_FUNCTION_ADB    = "adb";
 // Use this command to continue the function chain.
 static const char* DUMMY_COMMAND = "tether status";
 
+// IPV6 Tethering is not supported in AOSP, use the property to
+// identify vendor specific support in IPV6. We can remove this flag
+// once upstream Android support IPV6 in tethering.
+static const char* IPV6_TETHERING = "ro.tethering.ipv6";
+
 // Retry 20 times (2 seconds) for usb state transition.
 static const uint32_t USB_FUNCTION_RETRY_TIMES = 20;
 // Check "sys.usb.state" every 100ms.
@@ -81,6 +86,7 @@ static const uint32_t BUF_SIZE = 1024;
 static const int32_t SUCCESS = 0;
 
 static uint32_t SDK_VERSION;
+static uint32_t SUPPORT_IPV6_TETHERING;
 
 struct IFProperties {
   char gateway[PROPERTY_VALUE_MAX];
@@ -201,6 +207,7 @@ const CommandFunc NetworkUtils::sUSBEnableChain[] = {
   NetworkUtils::tetheringStatus,
   NetworkUtils::startTethering,
   NetworkUtils::setDnsForwarders,
+  NetworkUtils::addUpstreamInterface,
   NetworkUtils::usbTetheringSuccess
 };
 
@@ -209,6 +216,7 @@ const CommandFunc NetworkUtils::sUSBDisableChain[] = {
   NetworkUtils::removeInterfaceFromLocalNetwork,
   NetworkUtils::preTetherInterfaceList,
   NetworkUtils::postTetherInterfaceList,
+  NetworkUtils::removeUpstreamInterface,
   NetworkUtils::disableNat,
   NetworkUtils::setIpForwardingEnabled,
   NetworkUtils::stopTethering,
@@ -223,7 +231,9 @@ const CommandFunc NetworkUtils::sUSBFailChain[] = {
 
 const CommandFunc NetworkUtils::sUpdateUpStreamChain[] = {
   NetworkUtils::cleanUpStream,
+  NetworkUtils::removeUpstreamInterface,
   NetworkUtils::createUpStream,
+  NetworkUtils::addUpstreamInterface,
   NetworkUtils::updateUpStreamSuccess
 };
 
@@ -256,6 +266,23 @@ const CommandFunc NetworkUtils::sNetworkInterfaceSetAlarmChain[] = {
   NetworkUtils::networkInterfaceAlarmSuccess
 };
 
+const CommandFunc NetworkUtils::sTetheringInterfaceSetAlarmChain[] = {
+  NetworkUtils::setGlobalAlarm,
+  NetworkUtils::removeAlarm,
+  NetworkUtils::networkInterfaceAlarmSuccess
+};
+
+const CommandFunc NetworkUtils::sTetheringInterfaceRemoveAlarmChain[] = {
+  NetworkUtils::removeGlobalAlarm,
+  NetworkUtils::setAlarm,
+  NetworkUtils::networkInterfaceAlarmSuccess
+};
+
+const CommandFunc NetworkUtils::sTetheringGetStatusChain[] = {
+  NetworkUtils::tetheringStatus,
+  NetworkUtils::defaultAsyncSuccessHandler
+};
+
 /**
  * Helper function to get the mask from given prefix length.
  */
@@ -710,6 +737,36 @@ void NetworkUtils::setAlarm(CommandChain* aChain,
   doCommand(command, aChain, aCallback);
 }
 
+void NetworkUtils::removeAlarm(CommandChain* aChain,
+                            CommandCallback aCallback,
+                            NetworkResultOptions& aResult)
+{
+  char command[MAX_COMMAND_SIZE];
+  PR_snprintf(command, MAX_COMMAND_SIZE - 1, "bandwidth removeinterfacealert %s", GET_CHAR(mIfname));
+
+  doCommand(command, aChain, aCallback);
+}
+
+void NetworkUtils::setGlobalAlarm(CommandChain* aChain,
+                                  CommandCallback aCallback,
+                                  NetworkResultOptions& aResult)
+{
+  char command[MAX_COMMAND_SIZE];
+
+  PR_snprintf(command, MAX_COMMAND_SIZE - 1, "bandwidth setglobalalert %ld", GET_FIELD(mThreshold));
+  doCommand(command, aChain, aCallback);
+}
+
+void NetworkUtils::removeGlobalAlarm(CommandChain* aChain,
+                                     CommandCallback aCallback,
+                                     NetworkResultOptions& aResult)
+{
+  char command[MAX_COMMAND_SIZE];
+
+  PR_snprintf(command, MAX_COMMAND_SIZE - 1, "bandwidth removeglobalalert");
+  doCommand(command, aChain, aCallback);
+}
+
 void NetworkUtils::setInterfaceUp(CommandChain* aChain,
                                   CommandCallback aCallback,
                                   NetworkResultOptions& aResult)
@@ -807,12 +864,87 @@ void NetworkUtils::postTetherInterfaceList(CommandChain* aChain,
 
   char buf[BUF_SIZE];
   NS_ConvertUTF16toUTF8 reason(aResult.mResultReason);
-  memcpy(buf, reason.get(), reason.Length() + 1);
+
+  size_t length = reason.Length() + 1 < BUF_SIZE ? reason.Length() + 1 : BUF_SIZE;
+  memcpy(buf, reason.get(), length);
   split(buf, INTERFACE_DELIMIT, GET_FIELD(mInterfaceList));
 
   doCommand(command, aChain, aCallback);
 }
 
+bool isCommandChainIPv6(CommandChain* aChain, const char *externalInterface) {
+  // Check by gateway address
+  if (getIpType(GET_CHAR(mGateway)) == AF_INET6) {
+    return true;
+  }
+
+  uint32_t length = GET_FIELD(mGateways).Length();
+  for (uint32_t i = 0; i < length; i++) {
+    NS_ConvertUTF16toUTF8 autoGateway(GET_FIELD(mGateways)[i]);
+    if(getIpType(autoGateway.get()) == AF_INET6) {
+      return true;
+    }
+  }
+
+  // Check by external inteface address
+  FILE *file = fopen("/proc/net/if_inet6", "r");
+  if (!file) {
+    return false;
+  }
+
+  bool isIPv6 = false;
+  char interface[32];
+  while(fscanf(file, "%*s %*s %*s %*s %*s %32s", interface)) {
+    if (strcmp(interface, externalInterface) == 0) {
+      isIPv6 = true;
+      break;
+    }
+  }
+
+  fclose(file);
+  return isIPv6;
+}
+
+void NetworkUtils::addUpstreamInterface(CommandChain* aChain,
+                                        CommandCallback aCallback,
+                                        NetworkResultOptions& aResult)
+{
+  nsCString interface(GET_CHAR(mExternalIfname));
+  if (!interface.get()[0]) {
+    interface = GET_CHAR(mCurExternalIfname);
+  }
+
+  if (SUPPORT_IPV6_TETHERING == 0 || !isCommandChainIPv6(aChain, interface.get())) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
+
+  char command[MAX_COMMAND_SIZE];
+  snprintf(command, MAX_COMMAND_SIZE - 1, "tether interface add_upstream %s",
+           interface.get());
+  doCommand(command, aChain, aCallback);
+}
+
+void NetworkUtils::removeUpstreamInterface(CommandChain* aChain,
+                                           CommandCallback aCallback,
+                                           NetworkResultOptions& aResult)
+{
+  nsCString interface(GET_CHAR(mExternalIfname));
+  if (!interface.get()[0]) {
+    interface = GET_CHAR(mPreExternalIfname);
+  }
+
+  if (SUPPORT_IPV6_TETHERING == 0 || !isCommandChainIPv6(aChain, interface.get())) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
+
+  char command[MAX_COMMAND_SIZE];
+  snprintf(command, MAX_COMMAND_SIZE - 1, "tether interface remove_upstream %s",
+           interface.get());
+  doCommand(command, aChain, aCallback);
+}
+
 void NetworkUtils::setIpForwardingEnabled(CommandChain* aChain,
                                           CommandCallback aCallback,
                                           NetworkResultOptions& aResult)
@@ -991,14 +1123,39 @@ void NetworkUtils::removeDefaultRoute(CommandChain* aChain,
                                       CommandCallback aCallback,
                                       NetworkResultOptions& aResult)
 {
-  char command[MAX_COMMAND_SIZE];
-  // FIXME: (Bug 1121795) We only remove the first gateway to the default route.
-  //        For dual stack (ipv4/ipv6) device, one of the gateway would
-  //        not be added to the default route.
-  snprintf(command, MAX_COMMAND_SIZE - 1, "network route remove %d %s 0.0.0.0/0 %s",
-                    GET_FIELD(mNetId), GET_CHAR(mIfname), GET_CHAR(mGateways[0]));
+  if (GET_FIELD(mLoopIndex) >= GET_FIELD(mGateways).Length()) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
 
-  doCommand(command, aChain, aCallback);
+  char command[MAX_COMMAND_SIZE];
+  nsTArray<nsString>& gateways = GET_FIELD(mGateways);
+  NS_ConvertUTF16toUTF8 autoGateway(gateways[GET_FIELD(mLoopIndex)]);
+
+  int type = getIpType(autoGateway.get());
+  snprintf(command, MAX_COMMAND_SIZE - 1, "network route remove %d %s %s/0 %s",
+           GET_FIELD(mNetId), GET_CHAR(mIfname),
+           type == AF_INET6 ? "::" : "0.0.0.0", autoGateway.get());
+
+  struct MyCallback {
+    static void callback(CommandCallback::CallbackType aOriginalCallback,
+                         CommandChain* aChain,
+                         bool aError,
+                         mozilla::dom::NetworkResultOptions& aResult)
+    {
+      NS_ConvertUTF16toUTF8 reason(aResult.mResultReason);
+      NU_DBG("removeDefaultRoute's reason: %s", reason.get());
+      if (aError && !reason.EqualsASCII("removeRoute() failed (No such process)")) {
+        return aOriginalCallback(aChain, aError, aResult);
+      }
+
+      GET_FIELD(mLoopIndex)++;
+      return removeDefaultRoute(aChain, aOriginalCallback, aResult);
+    }
+  };
+
+  CommandCallback wrappedCallback(MyCallback::callback, aCallback);
+  doCommand(command, aChain, wrappedCallback);
 }
 
 void NetworkUtils::setInterfaceDns(CommandChain* aChain,
@@ -1146,13 +1303,19 @@ void NetworkUtils::addDefaultRouteToNetwork(CommandChain* aChain,
                                             CommandCallback aCallback,
                                             NetworkResultOptions& aResult)
 {
-  char command[MAX_COMMAND_SIZE];
+  if (GET_FIELD(mLoopIndex) >= GET_FIELD(mGateways).Length()) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
 
-  // FIXME: (Bug 1121795) We only add the first gateway to the default route.
-  //        For dual stack (ipv4/ipv6) device, one of the gateway would
-  //        not be added to the default route.
-  snprintf(command, MAX_COMMAND_SIZE - 1, "network route add %d %s 0.0.0.0/0 %s",
-                    GET_FIELD(mNetId), GET_CHAR(mIfname), GET_CHAR(mGateways[0]));
+  char command[MAX_COMMAND_SIZE];
+  nsTArray<nsString>& gateways = GET_FIELD(mGateways);
+  NS_ConvertUTF16toUTF8 autoGateway(gateways[GET_FIELD(mLoopIndex)]);
+
+  int type = getIpType(autoGateway.get());
+  snprintf(command, MAX_COMMAND_SIZE - 1, "network route add %d %s %s/0 %s",
+           GET_FIELD(mNetId), GET_CHAR(mIfname),
+           type == AF_INET6 ? "::" : "0.0.0.0", autoGateway.get());
 
   struct MyCallback {
     static void callback(CommandCallback::CallbackType aOriginalCallback,
@@ -1162,11 +1325,12 @@ void NetworkUtils::addDefaultRouteToNetwork(CommandChain* aChain,
     {
       NS_ConvertUTF16toUTF8 reason(aResult.mResultReason);
       NU_DBG("addDefaultRouteToNetwork's reason: %s", reason.get());
-      if (aError && reason.EqualsASCII("addRoute() failed (File exists)")) {
-        NU_DBG("Ignore \"File exists\" error when adding host route.");
-        return aOriginalCallback(aChain, false, aResult);
+      if (aError && !reason.EqualsASCII("addRoute() failed (File exists)")) {
+        return aOriginalCallback(aChain, aError, aResult);
       }
-      aOriginalCallback(aChain, aError, aResult);
+
+      GET_FIELD(mLoopIndex)++;
+      return addDefaultRouteToNetwork(aChain, aOriginalCallback, aResult);
     }
   };
 
@@ -1272,6 +1436,17 @@ void NetworkUtils::disableIpv6(CommandChain* aChain,
   setIpv6Enabled(aChain, aCallback, aResult, false);
 }
 
+void NetworkUtils::setMtu(CommandChain* aChain,
+                          CommandCallback aCallback,
+                          NetworkResultOptions& aResult)
+{
+  char command[MAX_COMMAND_SIZE];
+  PR_snprintf(command, MAX_COMMAND_SIZE - 1, "interface setmtu %s %d",
+              GET_CHAR(mIfname), GET_FIELD(mMtu));
+
+  doCommand(command, aChain, aCallback);
+}
+
 #undef GET_CHAR
 #undef GET_FIELD
 
@@ -1450,6 +1625,9 @@ NetworkUtils::NetworkUtils(MessageCallback aCallback)
   property_get("ro.build.version.sdk", value, nullptr);
   SDK_VERSION = atoi(value);
 
+  property_get(IPV6_TETHERING, value, "0");
+  SUPPORT_IPV6_TETHERING = atoi(value);
+
   gNetworkUtils = this;
 }
 
@@ -1489,6 +1667,9 @@ void NetworkUtils::ExecuteCommand(NetworkParams aOptions)
     BUILD_ENTRY(setNetworkInterfaceAlarm),
     BUILD_ENTRY(enableNetworkInterfaceAlarm),
     BUILD_ENTRY(disableNetworkInterfaceAlarm),
+    BUILD_ENTRY(setTetheringAlarm),
+    BUILD_ENTRY(removeTetheringAlarm),
+    BUILD_ENTRY(getTetheringStatus),
     BUILD_ENTRY(setWifiOperationMode),
     BUILD_ENTRY(setDhcpServer),
     BUILD_ENTRY(setWifiTethering),
@@ -1504,6 +1685,7 @@ void NetworkUtils::ExecuteCommand(NetworkParams aOptions)
     BUILD_ENTRY(createNetwork),
     BUILD_ENTRY(destroyNetwork),
     BUILD_ENTRY(getNetId),
+    BUILD_ENTRY(setMtu),
 
     #undef BUILD_ENTRY
   };
@@ -1822,8 +2004,9 @@ CommandResult NetworkUtils::setDefaultRoute(NetworkParams& aOptions)
   }
 
   aOptions.mNetId = netIdInfo.mNetId;
-
+  aOptions.mLoopIndex = 0;
   runChain(aOptions, COMMAND_CHAIN, defaultAsyncFailureHandler);
+
   return CommandResult::Pending();
 }
 
@@ -1834,13 +2017,6 @@ CommandResult NetworkUtils::setDefaultRouteLegacy(NetworkParams& aOptions)
 {
   NS_ConvertUTF16toUTF8 autoIfname(aOptions.mIfname);
 
-  if (!aOptions.mOldIfname.IsEmpty()) {
-    // Remove IPv4's default route.
-    RETURN_IF_FAILED(mNetUtils->do_ifc_remove_default_route(GET_CHAR(mOldIfname)));
-    // Remove IPv6's default route.
-    WARN_IF_FAILED(mNetUtils->do_ifc_remove_route(GET_CHAR(mOldIfname), "::", 0, NULL));
-  }
-
   uint32_t length = aOptions.mGateways.Length();
   if (length > 0) {
     for (uint32_t i = 0; i < length; i++) {
@@ -1916,6 +2092,7 @@ CommandResult NetworkUtils::removeDefaultRoute(NetworkParams& aOptions)
   NU_DBG("Obtained netid %d for interface %s", netIdInfo.mNetId, GET_CHAR(mIfname));
 
   aOptions.mNetId = netIdInfo.mNetId;
+  aOptions.mLoopIndex = 0;
   runChain(aOptions, COMMAND_CHAIN, defaultAsyncFailureHandler);
 
   return CommandResult::Pending();
@@ -2233,6 +2410,27 @@ CommandResult NetworkUtils::disableNetworkInterfaceAlarm(NetworkParams& aOptions
   return CommandResult::Pending();
 }
 
+CommandResult NetworkUtils::setTetheringAlarm(NetworkParams& aOptions)
+{
+  NU_DBG("setTetheringAlarm");
+  runChain(aOptions, sTetheringInterfaceSetAlarmChain, networkInterfaceAlarmFail);
+  return CommandResult::Pending();
+}
+
+CommandResult NetworkUtils::removeTetheringAlarm(NetworkParams& aOptions)
+{
+  NU_DBG("removeTetheringAlarm");
+  runChain(aOptions, sTetheringInterfaceRemoveAlarmChain, networkInterfaceAlarmFail);
+  return CommandResult::Pending();
+}
+
+CommandResult NetworkUtils::getTetheringStatus(NetworkParams& aOptions)
+{
+  NU_DBG("getTetheringStatus");
+  runChain(aOptions, sTetheringGetStatusChain, networkInterfaceAlarmFail);
+  return CommandResult::Pending();
+}
+
 /**
  * handling main thread's reload Wifi firmware request
  */
@@ -2526,6 +2724,23 @@ CommandResult NetworkUtils::getNetId(NetworkParams& aOptions)
   return result;
 }
 
+CommandResult NetworkUtils::setMtu(NetworkParams& aOptions)
+{
+  // Setting/getting mtu is supported since Kitkat.
+  if (SDK_VERSION < 19) {
+    ERROR("setMtu is not supported in current SDK_VERSION.");
+    return -1;
+  }
+
+  static CommandFunc COMMAND_CHAIN[] = {
+    setMtu,
+    defaultAsyncSuccessHandler,
+  };
+
+  runChain(aOptions, COMMAND_CHAIN, defaultAsyncFailureHandler);
+  return CommandResult::Pending();
+}
+
 void NetworkUtils::sendBroadcastMessage(uint32_t code, char* reason)
 {
   NetworkResultOptions result;
diff --git a/dom/system/gonk/NetworkUtils.h b/dom/system/gonk/NetworkUtils.h
index 29fbdcf0ef..d78184fcc5 100644
--- a/dom/system/gonk/NetworkUtils.h
+++ b/dom/system/gonk/NetworkUtils.h
@@ -110,7 +110,6 @@ public:
     COPY_OPT_STRING_FIELD(mIfname, EmptyString())
     COPY_OPT_STRING_FIELD(mIp, EmptyString())
     COPY_OPT_FIELD(mPrefixLength, 0)
-    COPY_OPT_STRING_FIELD(mOldIfname, EmptyString())
     COPY_OPT_STRING_FIELD(mMode, EmptyString())
     COPY_OPT_FIELD(mReport, false)
     COPY_OPT_FIELD(mEnabled, false)
@@ -145,6 +144,9 @@ public:
     COPY_OPT_FIELD(mGateway_long, 0)
     COPY_OPT_FIELD(mDns1_long, 0)
     COPY_OPT_FIELD(mDns2_long, 0)
+    COPY_OPT_FIELD(mMtu, 0)
+
+    mLoopIndex = 0;
 
 #undef COPY_SEQUENCE_FIELD
 #undef COPY_OPT_STRING_FIELD
@@ -161,7 +163,6 @@ public:
   nsString mIfname;
   nsString mIp;
   uint32_t mPrefixLength;
-  nsString mOldIfname;
   nsString mMode;
   bool mReport;
   bool mEnabled;
@@ -196,9 +197,11 @@ public:
   long mGateway_long;
   long mDns1_long;
   long mDns2_long;
+  long mMtu;
 
   // Auxiliary information required to carry accros command chain.
-  int mNetId;     // A locally defined id per interface.
+  int mNetId; // A locally defined id per interface.
+  uint32_t mLoopIndex; // Loop index for adding/removing multiple gateways.
 };
 
 // CommandChain store the necessary information to execute command one by one.
@@ -299,6 +302,9 @@ private:
   CommandResult setNetworkInterfaceAlarm(NetworkParams& aOptions);
   CommandResult enableNetworkInterfaceAlarm(NetworkParams& aOptions);
   CommandResult disableNetworkInterfaceAlarm(NetworkParams& aOptions);
+  CommandResult setTetheringAlarm(NetworkParams& aOptions);
+  CommandResult removeTetheringAlarm(NetworkParams& aOptions);
+  CommandResult getTetheringStatus(NetworkParams& aOptions);
   CommandResult setWifiOperationMode(NetworkParams& aOptions);
   CommandResult setDhcpServer(NetworkParams& aOptions);
   CommandResult setWifiTethering(NetworkParams& aOptions);
@@ -308,6 +314,7 @@ private:
   CommandResult createNetwork(NetworkParams& aOptions);
   CommandResult destroyNetwork(NetworkParams& aOptions);
   CommandResult getNetId(NetworkParams& aOptions);
+  CommandResult setMtu(NetworkParams& aOptions);
 
   CommandResult addHostRouteLegacy(NetworkParams& aOptions);
   CommandResult removeHostRouteLegacy(NetworkParams& aOptions);
@@ -334,7 +341,9 @@ private:
   static const CommandFunc sNetworkInterfaceEnableAlarmChain[];
   static const CommandFunc sNetworkInterfaceDisableAlarmChain[];
   static const CommandFunc sNetworkInterfaceSetAlarmChain[];
-
+  static const CommandFunc sTetheringInterfaceSetAlarmChain[];
+  static const CommandFunc sTetheringInterfaceRemoveAlarmChain[];
+  static const CommandFunc sTetheringGetStatusChain[];
   /**
    * Individual netd command stored in command chain.
    */
@@ -354,12 +363,17 @@ private:
   static void setQuota(PARAMS);
   static void removeQuota(PARAMS);
   static void setAlarm(PARAMS);
+  static void removeAlarm(PARAMS);
+  static void setGlobalAlarm(PARAMS);
+  static void removeGlobalAlarm(PARAMS);
   static void setInterfaceUp(PARAMS);
   static void tetherInterface(PARAMS);
   static void addInterfaceToLocalNetwork(PARAMS);
   static void addRouteToLocalNetwork(PARAMS);
   static void preTetherInterfaceList(PARAMS);
   static void postTetherInterfaceList(PARAMS);
+  static void addUpstreamInterface(PARAMS);
+  static void removeUpstreamInterface(PARAMS);
   static void setIpForwardingEnabled(PARAMS);
   static void tetheringStatus(PARAMS);
   static void stopTethering(PARAMS);
@@ -391,6 +405,7 @@ private:
   static void modifyRouteOnInterface(PARAMS, bool aDoAdd);
   static void enableIpv6(PARAMS);
   static void disableIpv6(PARAMS);
+  static void setMtu(PARAMS);
   static void setIpv6Enabled(PARAMS, bool aEnabled);
   static void addRouteToSecondaryTable(PARAMS);
   static void removeRouteFromSecondaryTable(PARAMS);
diff --git a/dom/system/gonk/TetheringService.js b/dom/system/gonk/TetheringService.js
index 09707730ce..c5c4781806 100644
--- a/dom/system/gonk/TetheringService.js
+++ b/dom/system/gonk/TetheringService.js
@@ -39,12 +39,11 @@ XPCOMUtils.defineLazyGetter(this, "gRil", function() {
   return null;
 });
 
-const TOPIC_INTERFACE_REGISTERED     = "network-interface-registered";
-const TOPIC_INTERFACE_UNREGISTERED   = "network-interface-unregistered";
 const TOPIC_MOZSETTINGS_CHANGED      = "mozsettings-changed";
 const TOPIC_CONNECTION_STATE_CHANGED = "network-connection-state-changed";
 const TOPIC_PREF_CHANGED             = "nsPref:changed";
 const TOPIC_XPCOM_SHUTDOWN           = "xpcom-shutdown";
+const PREF_MANAGE_OFFLINE_STATUS     = "network.gonk.manage-offline-status";
 const PREF_NETWORK_DEBUG_ENABLED     = "network.debugging.enabled";
 
 const POSSIBLE_USB_INTERFACE_NAME = "rndis0,usb0";
@@ -126,9 +125,15 @@ function TetheringService() {
   Services.obs.addObserver(this, TOPIC_XPCOM_SHUTDOWN, false);
   Services.obs.addObserver(this, TOPIC_MOZSETTINGS_CHANGED, false);
   Services.obs.addObserver(this, TOPIC_CONNECTION_STATE_CHANGED, false);
-  Services.obs.addObserver(this, TOPIC_INTERFACE_REGISTERED, false);
-  Services.obs.addObserver(this, TOPIC_INTERFACE_UNREGISTERED, false);
   Services.prefs.addObserver(PREF_NETWORK_DEBUG_ENABLED, this, false);
+  Services.prefs.addObserver(PREF_MANAGE_OFFLINE_STATUS, this, false);
+
+  try {
+    this._manageOfflineStatus =
+      Services.prefs.getBoolPref(PREF_MANAGE_OFFLINE_STATUS);
+  } catch(ex) {
+    // Ignore.
+  }
 
   this._dataDefaultServiceId = 0;
 
@@ -234,6 +239,12 @@ TetheringService.prototype = {
   // Arguments for pending wifi tethering request.
   _pendingWifiTetheringRequestArgs: null,
 
+  // The state of tethering.
+  state: Ci.nsITetheringService.TETHERING_STATE_INACTIVE,
+
+  // Flag to check if we can modify the Services.io.offline.
+  _manageOfflineStatus: true,
+
   // nsIObserver
 
   observe: function(aSubject, aTopic, aData) {
@@ -257,33 +268,24 @@ TetheringService.prototype = {
               " changed state to " + network.state);
         this.onConnectionChanged(network);
         break;
-      case TOPIC_INTERFACE_REGISTERED:
-        network = aSubject.QueryInterface(Ci.nsINetworkInterface);
-        if (network &&
-            network.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN) {
-          debug("Force setting " + SETTINGS_DUN_REQUIRED + " to true.");
-          this.tetheringSettings[SETTINGS_DUN_REQUIRED] = true;
-        }
-        break;
-      case TOPIC_INTERFACE_UNREGISTERED:
-        network = aSubject.QueryInterface(Ci.nsINetworkInterface);
-        if (network &&
-            network.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN) {
-          this.tetheringSettings[SETTINGS_DUN_REQUIRED] =
-          libcutils.property_get("ro.tethering.dun_required") === "1";
-        }
-        break;
       case TOPIC_XPCOM_SHUTDOWN:
         Services.obs.removeObserver(this, TOPIC_XPCOM_SHUTDOWN);
         Services.obs.removeObserver(this, TOPIC_MOZSETTINGS_CHANGED);
         Services.obs.removeObserver(this, TOPIC_CONNECTION_STATE_CHANGED);
-        Services.obs.removeObserver(this, TOPIC_INTERFACE_REGISTERED);
-        Services.obs.removeObserver(this, TOPIC_INTERFACE_UNREGISTERED);
         Services.prefs.removeObserver(PREF_NETWORK_DEBUG_ENABLED, this);
+        Services.prefs.removeObserver(PREF_MANAGE_OFFLINE_STATUS, this);
 
         this.dunConnectTimer.cancel();
         this.dunRetryTimer.cancel();
         break;
+      case PREF_MANAGE_OFFLINE_STATUS:
+        try {
+          this._manageOfflineStatus =
+            Services.prefs.getBoolPref(PREF_MANAGE_OFFLINE_STATUS);
+        } catch(ex) {
+          // Ignore.
+        }
+        break;
     }
   },
 
@@ -361,7 +363,8 @@ TetheringService.prototype = {
   },
 
   getNetworkInfo: function(aType, aServiceId) {
-    for each (let networkInfo in gNetworkManager.allNetworkInfo) {
+    for (let networkId in gNetworkManager.allNetworkInfo) {
+      let networkInfo = gNetworkManager.allNetworkInfo[networkId];
       if (networkInfo.type == aType) {
         try {
           if (networkInfo instanceof Ci.nsIRilNetworkInfo) {
@@ -604,10 +607,31 @@ TetheringService.prototype = {
 
     this._wifiTetheringRequestOngoing = true;
     gNetworkService.setWifiTethering(aEnable, aConfig, (aError) => {
-      // Disconnect dun on error or when wifi tethering is disabled.
-      if (this.tetheringSettings[SETTINGS_DUN_REQUIRED] &&
-          (!aEnable || aError)) {
-        this.handleDunConnection(false);
+      // Change the tethering state to WIFI if there is no error.
+      if (aEnable && !aError) {
+        this.state = Ci.nsITetheringService.TETHERING_STATE_WIFI;
+      } else {
+        // If wifi thethering is disable, or any error happens,
+          // then consider the following statements.
+
+        // Check whether the state is USB now or not. If no then just change
+          // it to INACTIVE, if yes then just keep it.
+          // It means that don't let the disable or error of WIFI affect
+          // the original active state.
+        if (this.state != Ci.nsITetheringService.TETHERING_STATE_USB) {
+          this.state = Ci.nsITetheringService.TETHERING_STATE_INACTIVE;
+        }
+
+        // Disconnect dun on error or when wifi tethering is disabled.
+        if (this.tetheringSettings[SETTINGS_DUN_REQUIRED]) {
+          this.handleDunConnection(false);
+        }
+      }
+
+      if (this._manageOfflineStatus) {
+        Services.io.offline = !this.isAnyConnected() &&
+                              (this.state ===
+                               Ci.nsITetheringService.TETHERING_STATE_INACTIVE);
       }
 
       let resetSettings = aError;
@@ -644,6 +668,10 @@ TetheringService.prototype = {
       return;
     }
 
+    // Re-check again, test cases set this property later.
+    this.tetheringSettings[SETTINGS_DUN_REQUIRED] =
+      libcutils.property_get("ro.tethering.dun_required") === "1";
+
     if (!aEnable) {
       this.enableWifiTethering(false, aConfig, aCallback);
       return;
@@ -738,19 +766,36 @@ TetheringService.prototype = {
       // Skip others request when we found an error.
       this._usbTetheringRequestCount = 0;
       this._usbTetheringAction = TETHERING_STATE_IDLE;
+      // If the thethering state is WIFI now, then just keep it,
+        // if not, just change the state to INACTIVE.
+        // It means that don't let the error of USB affect the original active state.
+      if (this.state != Ci.nsITetheringService.TETHERING_STATE_WIFI) {
+        this.state = Ci.nsITetheringService.TETHERING_STATE_INACTIVE;
+      }
       if (this.tetheringSettings[SETTINGS_DUN_REQUIRED]) {
         this.handleDunConnection(false);
       }
     } else {
       if (aEnable) {
         this._usbTetheringAction = TETHERING_STATE_ACTIVE;
+        this.state = Ci.nsITetheringService.TETHERING_STATE_USB;
       } else {
         this._usbTetheringAction = TETHERING_STATE_IDLE;
+        // If the state is now WIFI, don't let the disable of USB affect it.
+        if (this.state != Ci.nsITetheringService.TETHERING_STATE_WIFI) {
+          this.state = Ci.nsITetheringService.TETHERING_STATE_INACTIVE;
+        }
         if (this.tetheringSettings[SETTINGS_DUN_REQUIRED]) {
           this.handleDunConnection(false);
         }
       }
 
+      if (this._manageOfflineStatus) {
+        Services.io.offline = !this.isAnyConnected() &&
+                              (this.state ===
+                               Ci.nsITetheringService.TETHERING_STATE_INACTIVE);
+      }
+
       this.handleLastUsbTetheringRequest();
     }
   },
@@ -830,6 +875,17 @@ TetheringService.prototype = {
 
     callback.call(this);
   },
+
+  isAnyConnected: function() {
+    let allNetworkInfo = gNetworkManager.allNetworkInfo;
+    for (let networkId in allNetworkInfo) {
+      if (allNetworkInfo.hasOwnProperty(networkId) &&
+          allNetworkInfo[networkId].state === Ci.nsINetworkInfo.NETWORK_STATE_CONNECTED) {
+          return true;
+      }
+    }
+    return false;
+  },
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TetheringService]);
diff --git a/dom/system/gonk/nsINetworkInterface.idl b/dom/system/gonk/nsINetworkInterface.idl
index ccd281d331..4e815819c4 100644
--- a/dom/system/gonk/nsINetworkInterface.idl
+++ b/dom/system/gonk/nsINetworkInterface.idl
@@ -80,7 +80,7 @@ interface nsINetworkInfo : nsISupports
                 [array, size_is(count), retval] out wstring dnses);
 };
 
-[scriptable, uuid(9a025351-8684-4ab5-a0c1-f21a9f83d405)]
+[scriptable, uuid(8b1345fa-b34c-41b3-8d21-09f961bf8887)]
 interface nsINetworkInterface : nsISupports
 {
   /**
@@ -97,4 +97,9 @@ interface nsINetworkInterface : nsISupports
    * The port number of the http proxy server.
    */
   readonly attribute long httpProxyPort;
+
+  /*
+   * The Maximun Transmit Unit for this network interface, -1 if not set.
+   */
+  readonly attribute long mtu;
 };
diff --git a/dom/system/gonk/nsINetworkInterfaceListService.idl b/dom/system/gonk/nsINetworkInterfaceListService.idl
index 38aae438d2..0c224842e4 100644
--- a/dom/system/gonk/nsINetworkInterfaceListService.idl
+++ b/dom/system/gonk/nsINetworkInterfaceListService.idl
@@ -2,10 +2,11 @@
  * 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/. */
 
-#include "nsINetworkManager.idl"
 #include "nsISupports.idl"
 
-[scriptable, uuid(b44d74db-c9d6-41dd-98ae-a56918d6e6ad)]
+interface nsINetworkInfo;
+
+[scriptable, uuid(55779d32-1e28-4f43-af87-09d04bc3cce9)]
 interface nsINetworkInterfaceList : nsISupports
 {
   /**
@@ -14,10 +15,10 @@ interface nsINetworkInterfaceList : nsISupports
   long getNumberOfInterface();
 
   /**
-   * Get the i-th interface from the list.
+   * Get the i-th interface info info from the list.
    * @param interfaceIndex index of interface, from 0 to number of interface - 1.
    */
-  nsINetworkInterface getInterface(in long interfaceIndex);
+  nsINetworkInfo getInterfaceInfo(in long interfaceIndex);
 };
 
 [scriptable, uuid(21d7fc8b-28c4-4a4f-a15e-1f9defbc2cec)]
diff --git a/dom/system/gonk/nsINetworkService.idl b/dom/system/gonk/nsINetworkService.idl
index 06451827f1..974fbd797a 100644
--- a/dom/system/gonk/nsINetworkService.idl
+++ b/dom/system/gonk/nsINetworkService.idl
@@ -157,7 +157,7 @@ interface nsIDhcpRequestCallback : nsISupports
 /**
  * Provide network services.
  */
-[scriptable, uuid(5d6b1877-890a-4c7f-8403-94d57ceba6cf)]
+[scriptable, uuid(8f689d9f-30c0-4809-8bf6-87120e71f3ee)]
 interface nsINetworkService : nsISupports
 {
   const long MODIFY_ROUTE_ADD    = 0;
@@ -310,8 +310,6 @@ interface nsINetworkService : nsISupports
    *        Number of elements in gateways.
    * @param gateways
    *        Default gateways for setting default route.
-   * @param oldInterfaceName
-   *        The previous network interface name.
    *
    * @param callback
    *        Callback to notify the result of setting default route.
@@ -319,7 +317,6 @@ interface nsINetworkService : nsISupports
   void setDefaultRoute(in DOMString interfaceName,
                        in unsigned long count,
                        [array, size_is(count)] in wstring gateways,
-                       in DOMString oldInterfaceName,
                        in nsINativeCommandCallback callback);
 
   /**
@@ -485,9 +482,9 @@ interface nsINetworkService : nsISupports
                         in nsINativeCommandCallback callback);
 
   /**
-   * Reset all connections
+   * Reset all connections on a specified network interface.
    *
-   * @param networkInterface
+   * @param interfaceName
    *        The network interface name which we want to reset.
    *
    * @param callback
@@ -497,25 +494,25 @@ interface nsINetworkService : nsISupports
                         in nsINativeCommandCallback callback);
 
   /**
-   * Create network (required to call prior to any networking operation)
+   * Create network (required to call prior to any networking operation).
    *
-   * @param networkInterface
-   *        The network interface name which we want to reset.
+   * @param interfaceName
+   *        The network interface name which we want to create network for.
    *
    * @param callback
-   *        Callback to notify the result of resetting connections.
+   *        Callback to notify the result of creating network.
    */
   void createNetwork(in DOMString interfaceName,
                      in nsINativeCommandCallback callback);
 
   /**
-   * Destroy network (required to call prior to any networking operation)
+   * Destroy network.
    *
-   * @param networkInterface
-   *        The network interface name which we want to reset.
+   * @param interfaceName
+   *        The network interface name of the network we want to destroy.
    *
    * @param callback
-   *        Callback to notify the result of resetting connections.
+   *        Callback to notify the result of destroying network.
    */
   void destroyNetwork(in DOMString interfaceName,
                       in nsINativeCommandCallback callback);
@@ -532,4 +529,18 @@ interface nsINetworkService : nsISupports
    *
    */
   jsval getNetId(in DOMString interfaceName);
+
+  /**
+   * Set maximum transmission unit on a network interface.
+   *
+   * @param interfaceName
+   *        The name of the network interface that we want to set mtu.
+   * @param mtu
+   *        Size of maximum tranmission unit.
+   *
+   * @param callback
+   *        Callback to notify the result of setting mtu.
+   */
+  void setMtu(in DOMString interfaceName, in long mtu,
+              in nsINativeCommandCallback callback);
 };
diff --git a/dom/system/gonk/nsITetheringService.idl b/dom/system/gonk/nsITetheringService.idl
index d9492b4493..530ab0069d 100644
--- a/dom/system/gonk/nsITetheringService.idl
+++ b/dom/system/gonk/nsITetheringService.idl
@@ -7,11 +7,20 @@
 interface nsINetworkInterface;
 interface nsIWifiTetheringCallback;
 
-[scriptable, uuid(993b79df-f10e-4697-a5dc-5981cf8ff7e6)]
+[scriptable, uuid(779de2d3-6d29-4ee6-b069-6251839f757a)]
 interface nsITetheringService : nsISupports
 {
+  const long TETHERING_STATE_INACTIVE = 0;
+  const long TETHERING_STATE_WIFI     = 1;
+  const long TETHERING_STATE_USB      = 2;
+
   /**
-   * Enable or disable Wifi Tethering
+   * Current tethering state. One of the TETHERING_STATE_* constants.
+   */
+  readonly attribute long state;
+
+  /**
+   * Enable or disable Wifi Tethering.
    *
    * @param enabled
    *        Boolean that indicates whether tethering should be enabled (true) or
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 6ca2bf7508..afc9fda45a 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -4286,7 +4286,8 @@ RilObject.prototype = {
     }
 
     let list = null;
-    for each (let ll in usedCellBroadcastConfigs) {
+    for (let key in usedCellBroadcastConfigs) {
+      let ll = usedCellBroadcastConfigs[key];
       if (ll == null) {
         continue;
       }
diff --git a/dom/system/gonk/tests/marionette/head.js b/dom/system/gonk/tests/marionette/head.js
index 65446179be..7fa91c4cf5 100644
--- a/dom/system/gonk/tests/marionette/head.js
+++ b/dom/system/gonk/tests/marionette/head.js
@@ -5,6 +5,7 @@ MARIONETTE_CONTEXT = "chrome";
 
 const SETTINGS_KEY_DATA_ENABLED = "ril.data.enabled";
 const SETTINGS_KEY_DATA_APN_SETTINGS  = "ril.data.apnSettings";
+const SETTINGS_KEY_WIFI_ENABLED = "wifi.enabled";
 
 const TOPIC_CONNECTION_STATE_CHANGED = "network-connection-state-changed";
 const TOPIC_NETWORK_ACTIVE_CHANGED = "network-active-changed";
@@ -129,6 +130,34 @@ function waitForObserverEvent(aTopic) {
   return deferred.promise;
 }
 
+/**
+ * Wait for one named event.
+ *
+ * Resolve if that named event occurs.  Never reject.
+ *
+ * Fulfill params: the DOMEvent passed.
+ *
+ * @param aEventTarget
+ *        An EventTarget object.
+ * @param aEventName
+ *        A string event name.
+ * @param aMatchFun [optional]
+ *        A matching function returns true or false to filter the event.
+ *
+ * @return A deferred promise.
+ */
+function waitForTargetEvent(aEventTarget, aEventName, aMatchFun) {
+  return new Promise(function(aResolve, aReject) {
+    aEventTarget.addEventListener(aEventName, function onevent(aEvent) {
+      if (!aMatchFun || aMatchFun(aEvent)) {
+        aEventTarget.removeEventListener(aEventName, onevent);
+        ok(true, "Event '" + aEventName + "' got.");
+        aResolve(aEvent);
+      }
+    });
+  });
+}
+
 /**
  * Set the default data connection enabling state, wait for
  * "network-connection-state-changed" event and verify state.
diff --git a/dom/system/gonk/tests/marionette/manifest.ini b/dom/system/gonk/tests/marionette/manifest.ini
index 96c8250516..73b86112e9 100644
--- a/dom/system/gonk/tests/marionette/manifest.ini
+++ b/dom/system/gonk/tests/marionette/manifest.ini
@@ -14,3 +14,4 @@ disabled = Bug 808783
 [test_multiple_data_connection.js]
 [test_data_connection_proxy.js]
 [test_network_interface_list_service.js]
+[test_all_network_info.js]
diff --git a/dom/system/gonk/tests/marionette/test_all_network_info.js b/dom/system/gonk/tests/marionette/test_all_network_info.js
new file mode 100644
index 0000000000..b1aeccbf7f
--- /dev/null
+++ b/dom/system/gonk/tests/marionette/test_all_network_info.js
@@ -0,0 +1,106 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+MARIONETTE_HEAD_JS = "head.js";
+
+let networkManager =
+  Cc["@mozilla.org/network/manager;1"].getService(Ci.nsINetworkManager);
+ok(networkManager,
+   "networkManager.constructor is " + networkManager.constructor);
+
+let wifiManager = window.navigator.mozWifiManager;
+ok(wifiManager, "wifiManager.constructor is " + wifiManager.constructor);
+
+function setEmulatorAPN() {
+  let apn = [
+    [{"carrier":"T-Mobile US",
+      "apn":"epc.tmobile.com",
+      "mmsc":"http://mms.msg.eng.t-mobile.com/mms/wapenc",
+      "types":["default","supl","mms","ims","dun", "fota"]}]
+  ];
+
+  return setSettings(SETTINGS_KEY_DATA_APN_SETTINGS, apn);
+}
+
+function ensureWifiEnabled(aEnabled) {
+  if (wifiManager.enabled === aEnabled) {
+    log('Already ' + (aEnabled ? 'enabled' : 'disabled'));
+    return Promise.resolve();
+  }
+  return requestWifiEnabled(aEnabled);
+}
+
+function requestWifiEnabled(aEnabled) {
+  let promises = [];
+
+  promises.push(waitForTargetEvent(wifiManager, aEnabled ? 'enabled' : 'disabled',
+    function() {
+      return wifiManager.enabled === aEnabled ? true : false;
+  }));
+  promises.push(setSettings(SETTINGS_KEY_WIFI_ENABLED, aEnabled));
+
+  return Promise.all(promises);
+}
+
+// Test initial State
+function verifyInitialState() {
+  log("= verifyInitialState =");
+
+  // Data and wifi should be off before starting any test.
+  return getSettings(SETTINGS_KEY_DATA_ENABLED)
+    .then(value => {
+      is(value, false, "Data must be off");
+    })
+    .then(() => ensureWifiEnabled(false));
+}
+
+function testAllNetworkInfo(aAnyConnected) {
+  log("= testAllNetworkInfo = " + aAnyConnected);
+
+  let allNetworkInfo = networkManager.allNetworkInfo;
+  ok(allNetworkInfo, "NetworkManager.allNetworkInfo");
+
+  let count = Object.keys(allNetworkInfo).length;
+  ok(count > 0, "NetworkManager.allNetworkInfo count");
+
+  let connected = false;
+  for (let networkId in allNetworkInfo) {
+    if (allNetworkInfo.hasOwnProperty(networkId)) {
+      let networkInfo = allNetworkInfo[networkId];
+      if (networkInfo.state == Ci.nsINetworkInfo.NETWORK_STATE_CONNECTED) {
+        connected = true;
+        break;
+      }
+    }
+  }
+
+  is(aAnyConnected, connected, "NetworkManager.allNetworkInfo any connected");
+}
+
+// Start test
+startTestBase(function() {
+
+  let origApnSettings, origWifiEnabled;
+  return Promise.resolve()
+    .then(() => {
+      origWifiEnabled = wifiManager.enabled;
+    })
+    .then(() => verifyInitialState())
+    .then(() => getSettings(SETTINGS_KEY_DATA_APN_SETTINGS))
+    .then(value => {
+      origApnSettings = value;
+    })
+    .then(() => setEmulatorAPN())
+    .then(() => setDataEnabledAndWait(true))
+    .then(() => testAllNetworkInfo(true))
+    .then(() => setDataEnabledAndWait(false))
+    .then(() => testAllNetworkInfo(false))
+    // Restore original apn settings and wifi state.
+    .then(() => {
+      if (origApnSettings) {
+        return setSettings(SETTINGS_KEY_DATA_APN_SETTINGS, origApnSettings);
+      }
+    })
+    .then(() => ensureWifiEnabled(origWifiEnabled));
+});
diff --git a/dom/system/gonk/tests/marionette/test_network_interface_list_service.js b/dom/system/gonk/tests/marionette/test_network_interface_list_service.js
index 37fa913557..549940fa5b 100644
--- a/dom/system/gonk/tests/marionette/test_network_interface_list_service.js
+++ b/dom/system/gonk/tests/marionette/test_network_interface_list_service.js
@@ -4,7 +4,7 @@
 MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
-function getNetworkInterface(aType) {
+function getNetworkInfo(aType) {
   let networkListService =
     Cc["@mozilla.org/network/interface-list-service;1"].
       getService(Ci.nsINetworkInterfaceListService);
@@ -14,9 +14,9 @@ function getNetworkInterface(aType) {
   // Try to get nsINetworkInterface for aType.
   let numberOfInterface = networkList.getNumberOfInterface();
   for (let i = 0; i < numberOfInterface; i++) {
-    let iface = networkList.getInterface(i);
-    if (iface.type === aType) {
-      return iface;
+    let info = networkList.getInterfaceInfo(i);
+    if (info.type === aType) {
+      return info;
     }
   }
 
@@ -29,27 +29,27 @@ function testGetDataInterfaceList(aMobileDataEnabled) {
       aMobileDataEnabled ? "enabled" : "disabled");
 
   return setDataEnabledAndWait(aMobileDataEnabled)
-    .then(() => getNetworkInterface(NETWORK_TYPE_MOBILE))
-    .then((networkInterface) => {
-      if (!networkInterface) {
-        ok(false, "Should get an valid nsINetworkInterface for mobile");
+    .then(() => getNetworkInfo(NETWORK_TYPE_MOBILE))
+    .then((networkInfo) => {
+      if (!networkInfo) {
+        ok(false, "Should get an valid nsINetworkInfo for mobile");
         return;
       }
 
-      ok(networkInterface instanceof Ci.nsINetworkInterface,
-         "networkInterface should be an instance of nsINetworkInterface");
+      ok(networkInfo instanceof Ci.nsINetworkInfo,
+         "networkInfo should be an instance of nsINetworkInfo");
 
       let ipAddresses = {};
       let prefixs = {};
       let numOfGateways = {};
       let numOfDnses = {};
-      let numOfIpAddresses = networkInterface.getAddresses(ipAddresses, prefixs);
-      let gateways = networkInterface.getGateways(numOfGateways);
-      let dnses = networkInterface.getDnses(numOfDnses);
+      let numOfIpAddresses = networkInfo.getAddresses(ipAddresses, prefixs);
+      let gateways = networkInfo.getGateways(numOfGateways);
+      let dnses = networkInfo.getDnses(numOfDnses);
 
       if (aMobileDataEnabled) {
         // Mobile data is enabled.
-        is(networkInterface.state, NETWORK_STATE_CONNECTED, "check state");
+        is(networkInfo.state, NETWORK_STATE_CONNECTED, "check state");
         ok(numOfIpAddresses > 0, "check number of ipAddresses");
         ok(ipAddresses.value.length > 0, "check ipAddresses.length");
         ok(prefixs.value.length > 0, "check prefixs.length");
@@ -60,7 +60,7 @@ function testGetDataInterfaceList(aMobileDataEnabled) {
         ok(dnses.length > 0, "check dnses.length");
       } else {
         // Mobile data is disabled.
-        is(networkInterface.state, NETWORK_STATE_DISCONNECTED, "check state");
+        is(networkInfo.state, NETWORK_STATE_DISCONNECTED, "check state");
         is(numOfIpAddresses, 0, "check number of ipAddresses");
         is(ipAddresses.value.length, 0, "check ipAddresses.length");
         is(prefixs.value.length, 0, "check prefixs.length");
diff --git a/dom/tethering/tests/marionette/head.js b/dom/tethering/tests/marionette/head.js
index 0b08dc5710..d7b6cad077 100644
--- a/dom/tethering/tests/marionette/head.js
+++ b/dom/tethering/tests/marionette/head.js
@@ -218,6 +218,14 @@ let gTestSuite = (function() {
     return setSettings1(SETTINGS_KEY_DATA_APN_SETTINGS, aApnSettings, aAllowError);
   }
 
+  /**
+   * Set 'ro.tethering.dun_required' system property to 1. Note that this is a
+   * 'ro' property, it can only be set once.
+   */
+  function setTetheringDunRequired() {
+    return runEmulatorShellSafe(['setprop', 'ro.tethering.dun_required', '1']);
+  }
+
   /**
    * Wrap DOMRequest onsuccess/onerror events to Promise resolve/reject.
    *
@@ -704,6 +712,7 @@ let gTestSuite = (function() {
   suite.setWifiTetheringEnabled = setWifiTetheringEnabled;
   suite.getDataApnSettings = getDataApnSettings;
   suite.setDataApnSettings = setDataApnSettings;
+  suite.setTetheringDunRequired = setTetheringDunRequired;
 
 
   /**
diff --git a/dom/tethering/tests/marionette/manifest.ini b/dom/tethering/tests/marionette/manifest.ini
index 9cd43c60da..90133b5a0e 100644
--- a/dom/tethering/tests/marionette/manifest.ini
+++ b/dom/tethering/tests/marionette/manifest.ini
@@ -4,4 +4,6 @@ browser = false
 qemu = true
 
 [test_wifi_tethering_enabled.js]
+; The following test must be the last tethering test ran, as it sets the
+; 'ro.tethering.dun_required' property.
 [test_wifi_tethering_dun.js]
diff --git a/dom/tethering/tests/marionette/test_wifi_tethering_dun.js b/dom/tethering/tests/marionette/test_wifi_tethering_dun.js
index e4e11c7cec..3d93cf8d34 100644
--- a/dom/tethering/tests/marionette/test_wifi_tethering_dun.js
+++ b/dom/tethering/tests/marionette/test_wifi_tethering_dun.js
@@ -22,6 +22,7 @@ gTestSuite.startTest(function() {
                              "types": ["dun"] } ]];
       return gTestSuite.setDataApnSettings(apnSettings);
     })
+    .then(() => gTestSuite.setTetheringDunRequired())
     .then(() => gTestSuite.startTetheringTest(function() {
       return gTestSuite.ensureWifiEnabled(false)
         .then(() => gTestSuite.setWifiTetheringEnabled(true, true))
diff --git a/dom/tv/TVSimulatorService.js b/dom/tv/TVSimulatorService.js
index a9fd2fe56f..785e9d8d22 100644
--- a/dom/tv/TVSimulatorService.js
+++ b/dom/tv/TVSimulatorService.js
@@ -4,16 +4,31 @@
 "use strict";
 
 function debug(aMsg) {
-   //dump("[TVSimulatorService] " + aMsg + "\n");
+  //dump("[TVSimulatorService] " + aMsg + "\n");
 }
 
 const Cc = Components.classes;
 const Cu = Components.utils;
 const Ci = Components.interfaces;
 const Cr = Components.returnCode;
+
+Cu.importGlobalProperties(["File"]);
+
 const TV_SIMULATOR_DUMMY_DIRECTORY = "dummy";
 const TV_SIMULATOR_DUMMY_FILE      = "settings.json";
 
+// See http://seanyhlin.github.io/TV-Manager-API/#idl-def-TVSourceType
+const TV_SOURCE_TYPES = ["dvb-t","dvb-t2","dvb-c","dvb-c2","dvb-s",
+                         "dvb-s2","dvb-h","dvb-sh","atsc","atsc-m/h",
+                         "isdb-t","isdb-tb","isdb-s","isdb-c","1seg",
+                         "dtmb","cmmb","t-dmb","s-dmb"];
+function containInvalidSourceType(aElement, aIndex, aArray) {
+  return !TV_SOURCE_TYPES.includes(aElement);
+}
+
+// See http://seanyhlin.github.io/TV-Manager-API/#idl-def-TVChannelType
+const TV_CHANNEL_TYPES = ["tv","radio","data"];
+
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function TVSimulatorService() {
@@ -66,7 +81,7 @@ TVSimulatorService.prototype = {
       cstream.close();
     }
 
-    let settingObj;
+    let settingsObj;
     try {
       /*
        *
@@ -109,18 +124,24 @@ TVSimulatorService.prototype = {
        *     },]
        *   }
        */
-      settingObj = JSON.parse(settingStr);
+      settingsObj = JSON.parse(settingStr);
     } catch(e) {
       debug("File load error: " + e);
       return;
     }
 
+    // validation
+    if (!this._validateSettings(settingsObj)) {
+      debug("Failed to validate settings.");
+      return;
+    }
+
     // Key is as follow
     // {'tunerId':tunerId, 'sourceType':sourceType}
     this._internalTuners = new Map();
 
     // TVTunerData
-    for each (let tunerData in settingObj.tuners) {
+    for (let tunerData of settingsObj.tuners) {
       let tuner = Cc["@mozilla.org/tv/tvtunerdata;1"]
                     .createInstance(Ci.nsITVTunerData);
       tuner.id = tunerData.id;
@@ -135,11 +156,11 @@ TVSimulatorService.prototype = {
       };
 
       // TVSource
-      for each (let sourceData in tunerData.sources) {
+      for (let sourceData of tunerData.sources) {
         wrapTunerData.sourceType = sourceData.type;
 
         // TVChannel
-        for each (let channelData in sourceData.channels) {
+        for (let channelData of sourceData.channels) {
           let channel = Cc["@mozilla.org/tv/tvchanneldata;1"]
                           .createInstance(Ci.nsITVChannelData);
           channel.networkId         = channelData.networkId;
@@ -158,7 +179,7 @@ TVSimulatorService.prototype = {
           };
 
           // TVProgram
-          for each (let programData in channelData.programs) {
+          for (let programData of channelData.programs) {
             let program = Cc["@mozilla.org/tv/tvprogramdata;1"]
                             .createInstance(Ci.nsITVProgramData);
             program.eventId     = programData.eventId;
@@ -365,7 +386,7 @@ TVSimulatorService.prototype = {
       return Cr.NS_ERROR_INVALID_ARG;
     }
 
-    for each (let program in wrapChannelData.programs) {
+    for (let program of wrapChannelData.programs) {
       programArray.appendElement(program, false);
     }
 
@@ -403,7 +424,7 @@ TVSimulatorService.prototype = {
     }
 
     let wrapChannelData = wrapTunerData.channels.get(aChannelNumber);
-    if (!wrapChannelData) {
+    if (!wrapChannelData || !wrapChannelData.videoFilePath) {
       return "";
     }
 
@@ -433,6 +454,84 @@ TVSimulatorService.prototype = {
 
     return dsFile.path;
   },
+
+  _validateSettings: function TVSimValidateSettings(aSettingsObject) {
+    return this._validateTuners(aSettingsObject.tuners);
+  },
+
+  _validateTuners: function TVSimValidateTuners(aTunersObject) {
+    let tunerIds = new Array();
+    for (let tuner of aTunersObject) {
+      if (!tuner.id ||
+          !tuner.supportedType ||
+          !tuner.supportedType.length ||
+          tuner.supportedType.some(containInvalidSourceType) ||
+          tunerIds.includes(tuner.id)) {
+        debug("invalid tuner data.");
+        return false;
+      }
+      tunerIds.push(tuner.id);
+
+      if (!this._validateSources(tuner.sources)) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  _validateSources: function TVSimValidateSources(aSourcesObject) {
+    for (let source of aSourcesObject) {
+      if (!source.type ||
+          !TV_SOURCE_TYPES.includes(source.type)) {
+        debug("invalid source data.");
+        return false;
+      }
+
+      if (!this._validateChannels(source.channels)) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  _validateChannels: function TVSimValidateChannels(aChannelsObject) {
+    let channelNumbers = new Array();
+    for (let channel of aChannelsObject) {
+      if (!channel.networkId ||
+          !channel.transportStreamId ||
+          !channel.serviceId ||
+          !channel.type ||
+          !TV_CHANNEL_TYPES.includes(channel.type) ||
+          !channel.number ||
+          channelNumbers.includes(channel.number) ||
+          !channel.name) {
+        debug("invalid channel data.");
+        return false;
+      }
+      channelNumbers.push(channel.number);
+
+      if (!this._validatePrograms(channel.programs)) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  _validatePrograms: function TVSimValidatePrograms(aProgramsObject) {
+    let eventIds = new Array();
+    for (let program of aProgramsObject) {
+      if (!program.eventId ||
+          eventIds.includes(program.eventId) ||
+          !program.title ||
+          !program.startTime ||
+          !program.duration) {
+        debug("invalid program data.");
+        return false;
+      }
+      eventIds.push(program.eventId);
+    }
+    return true;
+  },
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TVSimulatorService]);
diff --git a/dom/tv/TVTuner.cpp b/dom/tv/TVTuner.cpp
index 6493211a19..0431156c0b 100644
--- a/dom/tv/TVTuner.cpp
+++ b/dom/tv/TVTuner.cpp
@@ -285,7 +285,7 @@ TVTuner::CreateSimulatedMediaStream()
                                                      currentChannelNumber,
                                                      domWin,
                                                      currentVideoBlobUrl);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
+  if (NS_WARN_IF(NS_FAILED(rv) || currentVideoBlobUrl.IsEmpty())) {
     return nullptr;
   }
 
diff --git a/dom/voicemail/test/marionette/head.js b/dom/voicemail/test/marionette/head.js
index 69d966469a..0dd08fe938 100644
--- a/dom/voicemail/test/marionette/head.js
+++ b/dom/voicemail/test/marionette/head.js
@@ -128,7 +128,7 @@ let PDUBuilder = {
     let headerLength = 0;
     this.buf = "";
     if (options.headers) {
-      for each (let header in options.headers) {
+      for (let header of options.headers) {
         headerLength += 2; // id + length octets
         if (header.octets) {
           headerLength += header.octets.length;
@@ -149,12 +149,12 @@ let PDUBuilder = {
     if (options.headers) {
       this.writeHexOctet(headerLength);
 
-      for each (let header in options.headers) {
+      for (let header of options.headers) {
         this.writeHexOctet(header.id);
         this.writeHexOctet(header.length);
 
         if (header.octets) {
-          for each (let octet in header.octets) {
+          for (let octet of header.octets) {
             this.writeHexOctet(octet);
           }
         }
diff --git a/dom/webidl/NetworkOptions.webidl b/dom/webidl/NetworkOptions.webidl
index 07d0438b6a..ab5e679830 100644
--- a/dom/webidl/NetworkOptions.webidl
+++ b/dom/webidl/NetworkOptions.webidl
@@ -17,7 +17,6 @@ dictionary NetworkCommandOptions
   unsigned long prefixLength;         // for "removeNetworkRoute".
   DOMString domain;                   // for "setDNS"
   sequence<DOMString> dnses;          // for "setDNS", "setDefaultRouteAndDNS".
-  DOMString oldIfname;                // for "setDefaultRouteAndDNS".
   DOMString gateway;                  // for "addSecondaryRoute", "removeSecondaryRoute".
   sequence<DOMString> gateways;       // for "setDefaultRouteAndDNS", "removeDefaultRoute".
   DOMString mode;                     // for "setWifiOperationMode".
@@ -55,6 +54,8 @@ dictionary NetworkCommandOptions
   long gateway_long;                  // for "ifc_configure".
   long dns1_long;                     // for "ifc_configure".
   long dns2_long;                     // for "ifc_configure".
+
+  long mtu;                           // for "setMtu".
 };
 
 /**
diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js
index 7df032a5ab..6be09e50c3 100755
--- a/dom/wifi/WifiWorker.js
+++ b/dom/wifi/WifiWorker.js
@@ -2583,7 +2583,8 @@ WifiWorker.prototype = {
   // connect to which ever network it thinks is best, so when we select the
   // proper network (or fail to), we need to re-enable the rest.
   _enableAllNetworks: function() {
-    for each (let net in this.configuredNetworks) {
+    for (let key in this.configuredNetworks) {
+      let net = this.configuredNetworks[key];
       WifiManager.enableNetwork(net.netId, false, function(ok) {
         net.disabled = ok ? 1 : 0;
       });
diff --git a/dom/workers/test/extensions/bootstrap/bootstrap.js b/dom/workers/test/extensions/bootstrap/bootstrap.js
index 7bc77b7300..289fec8340 100644
--- a/dom/workers/test/extensions/bootstrap/bootstrap.js
+++ b/dom/workers/test/extensions/bootstrap/bootstrap.js
@@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function testForExpectedSymbols(stage, data) {
   const expectedSymbols = [ "Worker", "ChromeWorker" ];
-  for each (var symbol in expectedSymbols) {
+  for (var symbol of expectedSymbols) {
     Services.prefs.setBoolPref("workertest.bootstrap." + stage + "." + symbol,
                                symbol in this);
   }
diff --git a/dom/workers/test/test_extensionBootstrap.xul b/dom/workers/test/test_extensionBootstrap.xul
index 33ca229e27..18bdde1d3e 100644
--- a/dom/workers/test/test_extensionBootstrap.xul
+++ b/dom/workers/test/test_extensionBootstrap.xul
@@ -31,8 +31,8 @@
             const stages = [ "install", "startup", "shutdown", "uninstall" ];
             const symbols = [ "Worker", "ChromeWorker" ];
 
-            for each (var stage in stages) {
-              for each (var symbol in symbols) {
+            for (var stage of stages) {
+              for (var symbol of symbols) {
                 is(Services.prefs.getBoolPref("workertest.bootstrap." + stage +
                                               "." + symbol),
                    true,
diff --git a/embedding/browser/nsIWebBrowserChrome3.idl b/embedding/browser/nsIWebBrowserChrome3.idl
index 938ff55e26..05e35f455a 100644
--- a/embedding/browser/nsIWebBrowserChrome3.idl
+++ b/embedding/browser/nsIWebBrowserChrome3.idl
@@ -12,7 +12,7 @@ interface nsIInputStream;
 /**
  * nsIWebBrowserChrome3 is an extension to nsIWebBrowserChrome2.
  */
-[scriptable, uuid(9e6c2372-5d9d-4ce8-ab9e-c5df1494dc84)]
+[scriptable, uuid(da646a9c-5788-4860-88a4-bd5d0ad853da)]
 interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
 {
   /**
@@ -47,4 +47,7 @@ interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
   bool shouldLoadURI(in nsIDocShell    aDocShell,
                      in nsIURI         aURI,
                      in nsIURI         aReferrer);
+
+  bool shouldAddToSessionHistory(in nsIDocShell aDocShell,
+                                 in nsIURI      aURI);
 };
diff --git a/gfx/tests/gtest/TestGfxWidgets.cpp b/gfx/tests/gtest/TestGfxWidgets.cpp
index cc946d8ab0..830204e057 100644
--- a/gfx/tests/gtest/TestGfxWidgets.cpp
+++ b/gfx/tests/gtest/TestGfxWidgets.cpp
@@ -27,6 +27,35 @@ TEST(GfxWidgets, Split) {
   ASSERT_TRUE(SplitDriverVersion("25.4.0.8", aStr, bStr, cStr, dStr));
   ASSERT_TRUE(atoi(aStr) == 25 && atoi(bStr) == 4 && atoi(cStr) == 0 && atoi(dStr) == 8);
 
+  ASSERT_TRUE(SplitDriverVersion("424.143.84437.3", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 424 && atoi(bStr) == 143 && atoi(cStr) == 8443 && atoi(dStr) == 3);
+
+  ASSERT_FALSE(SplitDriverVersion("25.4.0.8.", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 25 && atoi(bStr) == 4 && atoi(cStr) == 0 && atoi(dStr) == 8);
+
+  ASSERT_TRUE(SplitDriverVersion("424.143.8.3143243", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 424 && atoi(bStr) == 143 && atoi(cStr) == 8 && atoi(dStr) == 3143);
+
+  ASSERT_FALSE(SplitDriverVersion("25.4.0.8..", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 25 && atoi(bStr) == 4 && atoi(cStr) == 0 && atoi(dStr) == 8);
+
+  ASSERT_FALSE(SplitDriverVersion("424.143.8.3143243.", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 424 && atoi(bStr) == 143 && atoi(cStr) == 8 && atoi(dStr) == 3143);
+
+  ASSERT_FALSE(SplitDriverVersion("25.4.0.8.13", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 25 && atoi(bStr) == 4 && atoi(cStr) == 0 && atoi(dStr) == 8);
+
+  ASSERT_FALSE(SplitDriverVersion("4.1.8.13.24.35", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 4 && atoi(bStr) == 1 && atoi(cStr) == 8 && atoi(dStr) == 13);
+
+  ASSERT_TRUE(SplitDriverVersion("28...74", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 28 && atoi(bStr) == 0 && atoi(cStr) == 0 && atoi(dStr) == 74);
+
+  ASSERT_FALSE(SplitDriverVersion("4.1.8.13.24.35", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 4 && atoi(bStr) == 1 && atoi(cStr) == 8 && atoi(dStr) == 13);
+
+  ASSERT_TRUE(SplitDriverVersion("35..42.0", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 35 && atoi(bStr) == 0 && atoi(cStr) == 42 && atoi(dStr) == 0);
 }
 
 TEST(GfxWidgets, Versioning) {
diff --git a/js/xpconnect/src/xpc.msg b/js/xpconnect/src/xpc.msg
index 4f3aabc0b6..486ec6507a 100644
--- a/js/xpconnect/src/xpc.msg
+++ b/js/xpconnect/src/xpc.msg
@@ -156,6 +156,7 @@ XPC_MSG_DEF(NS_ERROR_ENTITY_CHANGED                 , "It was attempted to resum
 XPC_MSG_DEF(NS_ERROR_REDIRECT_LOOP                  , "The request failed as a result of a detected redirection loop")
 XPC_MSG_DEF(NS_ERROR_UNSAFE_CONTENT_TYPE            , "The request failed because the content type returned by the server was not a type expected by the channel")
 XPC_MSG_DEF(NS_ERROR_REMOTE_XUL                     , "Attempt to access remote XUL document that is not in website's whitelist")
+XPC_MSG_DEF(NS_ERROR_LOAD_SHOWED_ERRORPAGE          , "The load caused an error page to be displayed.")
 
 XPC_MSG_DEF(NS_ERROR_FTP_LOGIN                      , "FTP error while logging in")
 XPC_MSG_DEF(NS_ERROR_FTP_CWD                        , "FTP error while changing directory")
diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
index ad45b3de19..a0db950abd 100644
--- a/layout/xul/nsMenuPopupFrame.cpp
+++ b/layout/xul/nsMenuPopupFrame.cpp
@@ -60,6 +60,11 @@ using namespace mozilla;
 using mozilla::dom::PopupBoxObject;
 
 int8_t nsMenuPopupFrame::sDefaultLevelIsTop = -1;
+
+// XXX, kyle.yuan@sun.com, there are 4 definitions for the same purpose:
+//  nsMenuPopupFrame.h, nsListControlFrame.cpp, listbox.xml, tree.xml
+//  need to find a good place to put them together.
+//  if someone changes one, please also change the other.
 uint32_t nsMenuPopupFrame::sTimeoutOfIncrementalSearch = 1000;
 
 const char* kPrefIncrementalSearchTimeout =
@@ -1170,7 +1175,7 @@ nsMenuPopupFrame::FlipOrResize(nscoord& aScreenPoint, nscoord aSize,
         // if the newly calculated position is different than the existing
         // position, we flip such that the popup is to the left or top of the
         // anchor point instead.
-        nscoord newScreenPoint = startpos - aSize - aMarginBegin - aOffsetForContextMenu;
+        nscoord newScreenPoint = startpos - aSize - aMarginBegin - std::max(aOffsetForContextMenu, 0);
         if (newScreenPoint != aScreenPoint) {
           *aFlipSide = true;
           aScreenPoint = newScreenPoint;
@@ -1309,7 +1314,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
   nsRect rootScreenRect = rootFrame->GetScreenRectInAppUnits();
 
   nsDeviceContext* devContext = presContext->DeviceContext();
-  nscoord offsetForContextMenu = 0;
+  nsPoint offsetForContextMenu;
 
   bool isNoAutoHide = IsNoAutoHide();
   nsPopupLevel popupLevel = PopupLevel(isNoAutoHide);
@@ -1370,13 +1375,17 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
     // coordinates.
     int32_t factor = devContext->AppUnitsPerDevPixelAtUnitFullZoom();
 
-    // context menus should be offset by two pixels so that they don't appear
-    // directly where the cursor is. Otherwise, it is too easy to have the
-    // context menu close up again.
+    // Depending on the platform, context menus should be offset by varying amounts
+    // to ensure that they don't appear directly where the cursor is. Otherwise,
+    // it is too easy to have the context menu close up again.
     if (mAdjustOffsetForContextMenu) {
-      int32_t offsetForContextMenuDev =
-        nsPresContext::CSSPixelsToAppUnits(CONTEXT_MENU_OFFSET_PIXELS) / factor;
-      offsetForContextMenu = presContext->DevPixelsToAppUnits(offsetForContextMenuDev);
+      nsPoint offsetForContextMenuDev;
+      offsetForContextMenuDev.x = nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt(
+                                    LookAndFeel::eIntID_ContextMenuOffsetHorizontal)) / factor;
+      offsetForContextMenuDev.y = nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt(
+                                    LookAndFeel::eIntID_ContextMenuOffsetVertical)) / factor;
+      offsetForContextMenu.x = presContext->DevPixelsToAppUnits(offsetForContextMenuDev.x);
+      offsetForContextMenu.y = presContext->DevPixelsToAppUnits(offsetForContextMenuDev.y);
     }
 
     // next, convert into app units accounting for the zoom
@@ -1387,8 +1396,8 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
     anchorRect = nsRect(screenPoint, nsSize(0, 0));
 
     // add the margins on the popup
-    screenPoint.MoveBy(margin.left + offsetForContextMenu,
-                       margin.top + offsetForContextMenu);
+    screenPoint.MoveBy(margin.left + offsetForContextMenu.x,
+                       margin.top + offsetForContextMenu.y);
 
     // screen positioned popups can be flipped vertically but never horizontally
     vFlip = FlipStyle_Outside;
@@ -1432,7 +1441,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
     } else {
       mRect.width = FlipOrResize(screenPoint.x, mRect.width, screenRect.x,
                                  screenRect.XMost(), anchorRect.x, anchorRect.XMost(),
-                                 margin.left, margin.right, offsetForContextMenu, hFlip,
+                                 margin.left, margin.right, offsetForContextMenu.x, hFlip,
                                  &mHFlip);
     }
     if (slideVertical) {
@@ -1441,7 +1450,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
     } else {
       mRect.height = FlipOrResize(screenPoint.y, mRect.height, screenRect.y,
                                   screenRect.YMost(), anchorRect.y, anchorRect.YMost(),
-                                  margin.top, margin.bottom, offsetForContextMenu, vFlip,
+                                  margin.top, margin.bottom, offsetForContextMenu.y, vFlip,
                                   &mVFlip);
     }
 
@@ -2150,10 +2159,10 @@ nsMenuPopupFrame::MoveTo(const CSSIntPoint& aPos, bool aUpdateAttrs)
 
   // Workaround for bug 788189.  See also bug 708278 comment #25 and following.
   if (mAdjustOffsetForContextMenu) {
-    nscoord offsetForContextMenu =
-      nsPresContext::CSSPixelsToAppUnits(CONTEXT_MENU_OFFSET_PIXELS);
-    margin.left += offsetForContextMenu;
-    margin.top += offsetForContextMenu;
+    margin.left += nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt(
+                     LookAndFeel::eIntID_ContextMenuOffsetHorizontal));
+    margin.top += nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt(
+                     LookAndFeel::eIntID_ContextMenuOffsetVertical));
   }
 
   nsPresContext* presContext = PresContext();
diff --git a/layout/xul/nsMenuPopupFrame.h b/layout/xul/nsMenuPopupFrame.h
index ebea6fd401..5bc575fa72 100644
--- a/layout/xul/nsMenuPopupFrame.h
+++ b/layout/xul/nsMenuPopupFrame.h
@@ -124,13 +124,6 @@ enum MenuPopupAnchorType {
 #define POPUPPOSITION_HFLIP(v) (v ^ 1)
 #define POPUPPOSITION_VFLIP(v) (v ^ 2)
 
-// XXX, kyle.yuan@sun.com, there are 4 definitions for the same purpose:
-//  nsMenuPopupFrame.h, nsListControlFrame.cpp, listbox.xml, tree.xml
-//  need to find a good place to put them together.
-//  if someone changes one, please also change the other.
-
-#define CONTEXT_MENU_OFFSET_PIXELS 2
-
 nsIFrame* NS_NewMenuPopupFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
 class nsView;
diff --git a/media/mtransport/gonk_addrs.cpp b/media/mtransport/gonk_addrs.cpp
index 31d700304c..1c69b711ec 100644
--- a/media/mtransport/gonk_addrs.cpp
+++ b/media/mtransport/gonk_addrs.cpp
@@ -12,7 +12,7 @@ extern "C" {
 
 #include <vector>
 #include <string>
-#include "nsINetworkManager.h"
+#include "nsINetworkInterface.h"
 #include "nsINetworkInterfaceListService.h"
 #include "runnable_utils.h"
 #include "nsCOMPtr.h"
@@ -58,8 +58,8 @@ GetInterfaces(std::vector<NetworkInterface>* aInterfaces)
   aInterfaces->clear();
 
   for (int32_t i = 0; i < listLength; i++) {
-    nsCOMPtr<nsINetworkInterface> iface;
-    if (NS_FAILED(networkList->GetInterface(i, getter_AddRefs(iface)))) {
+    nsCOMPtr<nsINetworkInfo> info;
+    if (NS_FAILED(networkList->GetInterfaceInfo(i, getter_AddRefs(info)))) {
       continue;
     }
 
@@ -71,7 +71,7 @@ GetInterfaces(std::vector<NetworkInterface>* aInterfaces)
     memset(&(interface.addr), 0, sizeof(interface.addr));
     interface.addr.sin_family = AF_INET;
 
-    if (NS_FAILED(iface->GetAddresses(&ips, &prefixs, &count))) {
+    if (NS_FAILED(info->GetAddresses(&ips, &prefixs, &count))) {
       continue;
     }
 
@@ -94,20 +94,20 @@ GetInterfaces(std::vector<NetworkInterface>* aInterfaces)
     }
 
     nsAutoString ifaceName;
-    if (NS_FAILED(iface->GetName(ifaceName))) {
+    if (NS_FAILED(info->GetName(ifaceName))) {
       continue;
     }
     interface.name = NS_ConvertUTF16toUTF8(ifaceName).get();
 
     int32_t type;
-    if (NS_FAILED(iface->GetType(&type))) {
+    if (NS_FAILED(info->GetType(&type))) {
       continue;
     }
     switch (type) {
-      case nsINetworkInterface::NETWORK_TYPE_WIFI:
+      case nsINetworkInfo::NETWORK_TYPE_WIFI:
         interface.type = NR_INTERFACE_TYPE_WIFI;
         break;
-      case nsINetworkInterface::NETWORK_TYPE_MOBILE:
+      case nsINetworkInfo::NETWORK_TYPE_MOBILE:
         interface.type = NR_INTERFACE_TYPE_MOBILE;
         break;
     }
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 02806b5b64..8b33fa9a34 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4747,18 +4747,19 @@ pref("dom.mozAlarms.enabled", false);
 
 pref("dom.push.enabled", false);
 
-#if !defined(RELEASE_BUILD)
-pref("dom.push.debug", true);
-#endif
-
+pref("dom.push.loglevel", "off");
 
 pref("dom.push.serverURL", "wss://push.services.mozilla.com/");
 pref("dom.push.userAgentID", "");
 
-// The maximum number of notifications that a service worker can receive
+// The maximum number of push messages that a service worker can receive
 // without user interaction.
 pref("dom.push.maxQuotaPerSubscription", 16);
 
+// The delay between receiving a push message and updating the quota for a
+// subscription.
+pref("dom.push.quotaUpdateDelay", 3000); // 3 seconds
+
 // Is the network connection allowed to be up?
 // This preference should be used in UX to enable/disable push.
 pref("dom.push.connection.enabled", true);
diff --git a/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py b/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py
index 2071a6f688..800998d7f5 100644
--- a/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py
+++ b/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py
@@ -75,6 +75,8 @@ prefs.setIntPref("ui.click_hold_context_menus.delay", arguments[0]);
     def test_wait_with_value(self):
         wait_with_value(self.marionette, self.wait_for_condition, "button1-mousemove-mousedown-mouseup-click")
 
+    """
+    // Skipping due to Bug 1191066
     def test_context_menu(self):
         context_menu(self.marionette, self.wait_for_condition, "button1-mousemove-mousedown-contextmenu", "button1-mousemove-mousedown-contextmenu-mouseup-click")
 
@@ -83,7 +85,8 @@ prefs.setIntPref("ui.click_hold_context_menus.delay", arguments[0]);
 
     def test_long_press_on_xy_action(self):
         long_press_on_xy_action(self.marionette, self.wait_for_condition, "button1-mousemove-mousedown-contextmenu-mouseup-click")
-
+    """
+    
     """
     //Skipping due to Bug 865334
     def test_long_press_fail(self):
diff --git a/toolkit/content/tests/chrome/popup_trigger.js b/toolkit/content/tests/chrome/popup_trigger.js
index 4bfa9a3cc9..c9c430e2c7 100644
--- a/toolkit/content/tests/chrome/popup_trigger.js
+++ b/toolkit/content/tests/chrome/popup_trigger.js
@@ -507,9 +507,11 @@ var popupTests = [
       }
     }
 
+    var openX = 8;
+    var openY = 16;
     var rect = gMenuPopup.getBoundingClientRect();
-    is(rect.left, 10, testname + " left");
-    is(rect.top, 18, testname + " top");
+    is(rect.left, openX + (platformIsMac() ? 1 : 2), testname + " left");
+    is(rect.top, openY + (platformIsMac() ? -6 : 2), testname + " top");
     ok(rect.right, testname + " right is " + rect.right);
     ok(rect.bottom, testname + " bottom is " + rect.bottom);
   }
@@ -749,7 +751,7 @@ var popupTests = [
   autohide: "thepopup",
   test: function(testname, step) {
     gTrigger.focus();
-    synthesizeKey("VK_DOWN", { altKey: (navigator.platform.indexOf("Mac") == -1) });
+    synthesizeKey("VK_DOWN", { altKey: !platformIsMac() });
   },
   result: function(testname, step) {
     checkOpen("trigger", testname);
@@ -762,7 +764,7 @@ var popupTests = [
   events: [ "popupshowing thepopup", "popupshown thepopup" ],
   test: function(testname, step) {
     gTrigger.focus();
-    synthesizeKey("VK_UP", { altKey: (navigator.platform.indexOf("Mac") == -1) });
+    synthesizeKey("VK_UP", { altKey: !platformIsMac() });
   },
   result: function(testname, step) {
     checkOpen("trigger", testname);
@@ -789,7 +791,7 @@ var popupTests = [
   autohide: "thepopup",
   test: function(testname, step) {
     gTrigger.focus();
-    synthesizeKey((navigator.platform.indexOf("Mac") == -1) ? "VK_F4" : " ", { });
+    synthesizeKey(platformIsMac() ? " " : "VK_F4", { });
   },
   result: function(testname, step) {
     checkOpen("trigger", testname);
@@ -802,10 +804,10 @@ var popupTests = [
   condition: function() { return gIsMenu; },
   test: function(testname, step) {
     gTrigger.focus();
-    if (navigator.platform.indexOf("Mac") == -1)
-      synthesizeKey("", { metaKey: true });
-    else
+    if (platformIsMac())
       synthesizeKey("VK_F4", { altKey: true });
+    else
+      synthesizeKey("", { metaKey: true });
   },
   result: function(testname, step) {
     checkClosed("trigger", testname);
@@ -850,3 +852,8 @@ var popupTests = [
 }
 
 ];
+
+function platformIsMac()
+{
+    return navigator.platform.indexOf("Mac") > -1;
+}
diff --git a/toolkit/content/tests/chrome/test_bug624329.xul b/toolkit/content/tests/chrome/test_bug624329.xul
index c37e7edd9b..46ee919e9a 100644
--- a/toolkit/content/tests/chrome/test_bug624329.xul
+++ b/toolkit/content/tests/chrome/test_bug624329.xul
@@ -103,8 +103,23 @@ function openContextMenu() {
 
         var x = menubox.screenX - winbox.screenX;
         var y = menubox.screenY - winbox.screenY;
-        ok(y >= mouseY,
-           "menu top " + y + " should be below click point " + mouseY);
+
+        if (navigator.userAgent.indexOf("Mac") > -1)
+        {
+          // This check is alterered slightly for OSX which adds padding to the top
+          // and bottom of its context menus. The menu position calculation must
+          // be changed to allow for the pointer to be outside this padding
+          // when the menu opens.
+          // (Bug 1075089)
+          ok(y + 6 >= mouseY,
+             "menu top " + (y + 6) + " should be below click point " + mouseY);
+        }
+        else
+        {
+          ok(y >= mouseY,
+             "menu top " + y + " should be below click point " + mouseY);
+        }
+        
         ok(y <= mouseY + 20,
            "menu top " + y + " should not be too far below click point " + mouseY);
 
diff --git a/toolkit/content/tests/chrome/test_contextmenu_list.xul b/toolkit/content/tests/chrome/test_contextmenu_list.xul
index 9fff789a4e..157831a581 100644
--- a/toolkit/content/tests/chrome/test_contextmenu_list.xul
+++ b/toolkit/content/tests/chrome/test_contextmenu_list.xul
@@ -189,7 +189,7 @@ function checkContextMenu(event)
   // context menu from mouse click
   switch (gTestId) {
     case -1:
-      var expected = gSelectionStep == 2 ? 1 : (navigator.platform.indexOf("Mac") >= 0 ? 3 : 0);
+      var expected = gSelectionStep == 2 ? 1 : (platformIsMac() ? 3 : 0);
       is($(gTestElement).selectedIndex, expected, "index after click " + gSelectionStep);
       break;
     case 0:
@@ -222,47 +222,57 @@ function checkContextMenuForMenu(event)
 function checkPopup()
 {
   var menurect = $("themenu").getBoundingClientRect();
+  
+  // Context menus are offset by a number of pixels from the mouse click
+  // which activates them. This is so that they don't appear exactly
+  // under the mouse which can cause them to be mistakenly dismissed.
+  // The number of pixels depends on the platform  and is defined in
+  // each platform's nsLookAndFeel
+  var contextMenuOffsetX = platformIsMac() ? 1 : 2;
+  var contextMenuOffsetY = platformIsMac() ? -6 : 2;
 
   if (gTestId == 0) {
     if (gTestElement == "list") {
       var itemrect = $("item3").getBoundingClientRect();
-      isRoundedX(menurect.left, itemrect.left + 2,
+      isRoundedX(menurect.left, itemrect.left + contextMenuOffsetX,
          "list selection keyboard left");
-      isRoundedY(menurect.top, itemrect.bottom + 2,
+      isRoundedY(menurect.top, itemrect.bottom + contextMenuOffsetY,
          "list selection keyboard top");
     }
     else {
       var tree = $("tree");
       var bodyrect = $("treechildren").getBoundingClientRect();
-      isRoundedX(menurect.left, bodyrect.left + 2,
+      isRoundedX(menurect.left, bodyrect.left + contextMenuOffsetX,
          "tree selection keyboard left");
       isRoundedY(menurect.top, bodyrect.top +
-         tree.treeBoxObject.rowHeight * 3 + 2,
+         tree.treeBoxObject.rowHeight * 3 + contextMenuOffsetY,
          "tree selection keyboard top");
     }
   }
   else if (gTestId == 1) {
-    // activating a context menu with the mouse from position (7, 1).
-    // Add 2 pixels to these values as context menus are offset by 2 pixels
-    // so that they don't appear exactly only the menu making them easier to
-    // dismiss. See nsXULPopupListener.
+    // activating a context menu with the mouse from position (7, 4).
     var elementrect = $(gTestElement).getBoundingClientRect();
-    isRoundedX(menurect.left, elementrect.left + 9,
+    isRoundedX(menurect.left, elementrect.left + 7 + contextMenuOffsetX,
        gTestElement + " mouse left");
-    isRoundedY(menurect.top, elementrect.top + 6,
+    isRoundedY(menurect.top, elementrect.top + 4 + contextMenuOffsetY,
        gTestElement + " mouse top");
   }
   else {
     var elementrect = $(gTestElement).getBoundingClientRect();
-    isRoundedX(menurect.left, elementrect.left + 2,
+    isRoundedX(menurect.left, elementrect.left + contextMenuOffsetX,
        gTestElement + " no selection keyboard left");
-    isRoundedY(menurect.top, elementrect.bottom + 2,
+    isRoundedY(menurect.top, elementrect.bottom + contextMenuOffsetY,
        gTestElement + " no selection keyboard top");
   }
 
   $("themenu").hidePopup();
 }
 
+function platformIsMac()
+{
+  return navigator.platform.indexOf("Mac") > -1;
+}
+
 ]]>
 </script>
 
diff --git a/toolkit/content/tests/chrome/window_largemenu.xul b/toolkit/content/tests/chrome/window_largemenu.xul
index f404b982e5..c54b8226c6 100644
--- a/toolkit/content/tests/chrome/window_largemenu.xul
+++ b/toolkit/content/tests/chrome/window_largemenu.xul
@@ -214,14 +214,17 @@ function contextMenuPopupShown()
   var popup = document.getElementById("popup");
   var rect = popup.getBoundingClientRect();
   var labelrect = document.getElementById("label").getBoundingClientRect();
-
-  is(rect.left, labelrect.left + 6, gTests[gTestIndex] + " left");
+  
+  // Click to open popup in popupHidden() occurs at (4,4) in label's coordinate space
+  var clickX = clickY = 4;
+  
+  is(rect.left, labelrect.left + clickX + (platformIsMac() ? 1 : 2), gTests[gTestIndex] + " left");
   switch (gTests[gTestIndex]) {
     case "context menu enough space below":
-      is(rect.top, labelrect.top + 6, gTests[gTestIndex] + " top");
+      is(rect.top, labelrect.top + clickY + (platformIsMac() ? -6 : 2), gTests[gTestIndex] + " top");
       break;
     case "context menu more space above":
-      is(rect.top, labelrect.top - rect.height + 2, gTests[gTestIndex] + " top");
+      is(rect.top, labelrect.top + clickY - rect.height - (platformIsMac() ? 0 : 2), gTests[gTestIndex] + " top");
       break;
     case "context menu too big either side":
       [, gScreenY] = getScreenXY(document.documentElement);
@@ -281,7 +284,7 @@ function testPopupMovement()
   var screenX, screenY, buttonScreenX, buttonScreenY;
   var rect = popup.getBoundingClientRect();
 
-  var overlapOSChrome = (navigator.platform.indexOf("Mac") == -1);
+  var overlapOSChrome = !platformIsMac();
   popup.moveTo(1, 1);
   [screenX, screenY] = getScreenXY(popup);
 
@@ -345,6 +348,11 @@ function testPopupMovement()
   popup.hidePopup();
 }
 
+function platformIsMac()
+{
+  return navigator.platform.indexOf("Mac") > -1;
+}
+
 window.opener.wrappedJSObject.SimpleTest.waitForFocus(runTests, window);
 
 ]]>
diff --git a/widget/GfxDriverInfo.cpp b/widget/GfxDriverInfo.cpp
index 914ce5a8a0..9d3e248a2e 100644
--- a/widget/GfxDriverInfo.cpp
+++ b/widget/GfxDriverInfo.cpp
@@ -266,6 +266,12 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id)
     case Bug1155608:
       APPEND_DEVICE(0x2e22); /* IntelG45_1 */
       break;
+    case Bug1207665:
+      APPEND_DEVICE(0xa001); /* Intel Media Accelerator 3150 */
+      APPEND_DEVICE(0xa002);
+      APPEND_DEVICE(0xa011);
+      APPEND_DEVICE(0xa012);
+      break;
     case AMDRadeonHD5800:
       APPEND_DEVICE(0x6899);
       break;
diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h
index 9b4f0b21ab..eeb8d58db6 100644
--- a/widget/GfxDriverInfo.h
+++ b/widget/GfxDriverInfo.h
@@ -6,7 +6,6 @@
 #ifndef __mozilla_widget_GfxDriverInfo_h__
 #define __mozilla_widget_GfxDriverInfo_h__
 
-#include "mozilla/ArrayUtils.h" // ArrayLength
 #include "nsString.h"
 
 // Macros for adding a blocklist item to the static list.
@@ -92,6 +91,7 @@ enum DeviceFamily {
   Bug1137716,
   Bug1116812,
   Bug1155608,
+  Bug1207665,
   DeviceFamilyMax
 };
 
@@ -186,17 +186,20 @@ inline bool SplitDriverVersion(const char *aSource, char *aAStr, char *aBStr, ch
 {
   // sscanf doesn't do what we want here to we parse this manually.
   int len = strlen(aSource);
+
+  // This "4" is hardcoded in a few places, including once as a 3.
   char *dest[4] = { aAStr, aBStr, aCStr, aDStr };
   unsigned destIdx = 0;
   unsigned destPos = 0;
 
   for (int i = 0; i < len; i++) {
-    if (destIdx > ArrayLength(dest)) {
+    if (destIdx >= 4) {
       // Invalid format found. Ensure we don't access dest beyond bounds.
       return false;
     }
 
     if (aSource[i] == '.') {
+      MOZ_ASSERT (destIdx < 4 && destPos <= 4);
       dest[destIdx++][destPos] = 0;
       destPos = 0;
       continue;
@@ -208,13 +211,20 @@ inline bool SplitDriverVersion(const char *aSource, char *aAStr, char *aBStr, ch
       continue;
     }
 
+    MOZ_ASSERT (destIdx < 4 && destPos < 4);
     dest[destIdx][destPos++] = aSource[i];
   }
 
+  // Take care of the trailing period
+  if (destIdx >= 4) {
+    return false;
+  }
+
   // Add last terminator.
+  MOZ_ASSERT (destIdx < 4 && destPos <= 4);
   dest[destIdx][destPos] = 0;
 
-  if (destIdx != ArrayLength(dest) - 1) {
+  if (destIdx != 3) {
     return false;
   }
   return true;
diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
index 90d0574321..a03ac43cfe 100644
--- a/widget/GfxInfoX11.cpp
+++ b/widget/GfxInfoX11.cpp
@@ -14,7 +14,6 @@
 #include "prenv.h"
 
 #include "GfxInfoX11.h"
-#include "mozilla/X11Util.h"
 
 namespace mozilla {
 namespace widget {
@@ -505,34 +504,6 @@ GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
   return NS_ERROR_FAILURE;
 }
 
-nsresult
-GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray)
-{
-#if defined(MOZ_WIDGET_GTK)
-  // No display in xpcshell mode.
-  if (!gdk_display_get_default()) {
-    return NS_OK;
-  }
-#endif
-
-  // Note: this doesn't support Xinerama. Two physical displays will be
-  // reported as one monitor covering the entire virtual screen.
-  Display* display = DefaultXDisplay();
-  Screen* screen = DefaultScreenOfDisplay(display);
-
-  JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
-
-  JS::Rooted<JS::Value> screenWidth(aCx, JS::Int32Value(WidthOfScreen(screen)));
-  JS_SetProperty(aCx, obj, "screenWidth", screenWidth);
-
-  JS::Rooted<JS::Value> screenHeight(aCx, JS::Int32Value(HeightOfScreen(screen)));
-  JS_SetProperty(aCx, obj, "screenHeight", screenHeight);
-
-  JS::Rooted<JS::Value> element(aCx, JS::ObjectValue(*obj));
-  JS_SetElement(aCx, aOutArray, 0, element);
-  return NS_OK;
-}
-
 #ifdef DEBUG
 
 // Implement nsIGfxInfoDebug
diff --git a/widget/GfxInfoX11.h b/widget/GfxInfoX11.h
index d54c16235d..04e8e2e24f 100644
--- a/widget/GfxInfoX11.h
+++ b/widget/GfxInfoX11.h
@@ -48,8 +48,6 @@ public:
   
   NS_IMETHOD_(void) GetData() override;
 
-  nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override;
-
 #ifdef DEBUG
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIGFXINFODEBUG
diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
index e62884a6f8..97b8ca0f41 100644
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -429,7 +429,14 @@ public:
       * Overlay scrollbar animation constants.
       */
      eIntID_ScrollbarFadeBeginDelay,
-     eIntID_ScrollbarFadeDuration
+     eIntID_ScrollbarFadeDuration,
+      
+     /**
+      * Distance in pixels to offset the context menu from the cursor
+      * on open.
+      */
+     eIntID_ContextMenuOffsetVertical,
+     eIntID_ContextMenuOffsetHorizontal
   };
 
   /**
diff --git a/widget/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp
index 23c1a33842..0e3896fec7 100644
--- a/widget/VsyncDispatcher.cpp
+++ b/widget/VsyncDispatcher.cpp
@@ -10,6 +10,11 @@
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/CompositorParent.h"
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+#include "GeckoProfiler.h"
+#include "ProfilerMarkers.h"
+#endif
+
 namespace mozilla {
 static bool sThreadAssertionsEnabled = true;
 
@@ -32,12 +37,16 @@ CompositorVsyncDispatcher::~CompositorVsyncDispatcher()
 {
   MOZ_ASSERT(XRE_IsParentProcess());
   // We auto remove this vsync dispatcher from the vsync source in the nsBaseWidget
-  MOZ_ASSERT(NS_IsMainThread());
 }
 
 void
 CompositorVsyncDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp)
 {
+  // In vsync thread
+#ifdef MOZ_ENABLE_PROFILER_SPS
+  layers::CompositorParent::PostInsertVsyncProfilerMarker(aVsyncTimestamp);
+#endif
+
   MutexAutoLock lock(mCompositorObserverLock);
   if (mCompositorVsyncObserver) {
     mCompositorVsyncObserver->NotifyVsync(aVsyncTimestamp);
diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
index ea905b233a..719190f055 100644
--- a/widget/cocoa/nsLookAndFeel.mm
+++ b/widget/cocoa/nsLookAndFeel.mm
@@ -474,6 +474,12 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
     case eIntID_ColorPickerAvailable:
       aResult = 1;
       break;
+    case eIntID_ContextMenuOffsetVertical:
+      aResult = -6;
+      break;
+    case eIntID_ContextMenuOffsetHorizontal:
+      aResult = 1;
+      break;
     default:
       aResult = 0;
       res = NS_ERROR_FAILURE;
diff --git a/widget/gonk/nsLookAndFeel.cpp b/widget/gonk/nsLookAndFeel.cpp
index 3aae4eae86..120f257df4 100644
--- a/widget/gonk/nsLookAndFeel.cpp
+++ b/widget/gonk/nsLookAndFeel.cpp
@@ -392,6 +392,11 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
             aResult = atoi(propValue);
             break;
         }
+            
+        case eIntID_ContextMenuOffsetVertical:
+        case eIntID_ContextMenuOffsetHorizontal:
+            aResult = 2;
+            break;
 
         default:
             aResult = 0;
diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
index 2f77a3dc0f..e1be6e7c44 100644
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -679,6 +679,10 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
     case eIntID_ColorPickerAvailable:
         aResult = 1;
         break;
+    case eIntID_ContextMenuOffsetVertical:
+    case eIntID_ContextMenuOffsetHorizontal:
+        aResult = 2;
+        break;
     default:
         aResult = 0;
         res     = NS_ERROR_FAILURE;
diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index fadfed26eb..39c54319f5 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -221,6 +221,7 @@ void
 WidgetShutdownObserver::Unregister()
 {
   if (mRegistered) {
+    mWidget = nullptr;
     nsContentUtils::UnregisterShutdownObserver(this);
     mRegistered = false;
   }
diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
index 4d42be3bca..e270e6f566 100644
--- a/widget/nsXPLookAndFeel.cpp
+++ b/widget/nsXPLookAndFeel.cpp
@@ -117,6 +117,12 @@ nsLookAndFeelIntPref nsXPLookAndFeel::sIntPrefs[] =
   { "ui.physicalHomeButton",
     eIntID_PhysicalHomeButton,
     false, 0 },
+  { "ui.contextMenuOffsetVertical",
+    eIntID_ContextMenuOffsetVertical,
+    false, 0 },
+  { "ui.contextMenuOffsetHorizontal",
+    eIntID_ContextMenuOffsetHorizontal,
+    false, 0 }
 };
 
 nsLookAndFeelFloatPref nsXPLookAndFeel::sFloatPrefs[] =
diff --git a/widget/qt/nsLookAndFeel.cpp b/widget/qt/nsLookAndFeel.cpp
index 890e224d19..50d943e8dc 100644
--- a/widget/qt/nsLookAndFeel.cpp
+++ b/widget/qt/nsLookAndFeel.cpp
@@ -373,6 +373,11 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
         case eIntID_ScrollbarButtonAutoRepeatBehavior:
             aResult = 0;
             break;
+        
+        case eIntID_ContextMenuOffsetVertical:
+        case eIntID_ContextMenuOffsetHorizontal:
+            aResult = 2;
+            break;
 
         default:
             aResult = 0;
diff --git a/widget/uikit/nsLookAndFeel.mm b/widget/uikit/nsLookAndFeel.mm
index c28f52c031..bb593eb51e 100644
--- a/widget/uikit/nsLookAndFeel.mm
+++ b/widget/uikit/nsLookAndFeel.mm
@@ -345,6 +345,10 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
     case eIntID_SpellCheckerUnderlineStyle:
       aResult = NS_STYLE_TEXT_DECORATION_STYLE_DOTTED;
       break;
+    case eIntID_ContextMenuOffsetVertical:
+    case eIntID_ContextMenuOffsetHorizontal:
+      aResult = 2;
+      break;
     default:
       aResult = 0;
       res = NS_ERROR_FAILURE;
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index d947e758f8..0cda82134b 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -1028,6 +1028,18 @@ GfxInfo::GetGfxDriverInfo()
       nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
       DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
 
+    /* Disable D3D11 layers on Intel GMA 3150 for failing to allocate a shared handle for textures.
+     * See bug 1207665. Additionally block D2D so we don't accidentally use WARP.
+     */
+    APPEND_TO_DRIVER_BLOCKLIST2(DRIVER_OS_ALL,
+        (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorIntel), (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(Bug1207665),
+        nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
+      DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
+    APPEND_TO_DRIVER_BLOCKLIST2(DRIVER_OS_ALL,
+        (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorIntel), (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(Bug1207665),
+        nsIGfxInfo::FEATURE_DIRECT2D, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
+      DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
+
     /* Disable D2D on AMD Catalyst 14.4 until 14.6
      * See bug 984488
      */
diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp
index d0767980d6..8301378d56 100644
--- a/widget/windows/nsLookAndFeel.cpp
+++ b/widget/windows/nsLookAndFeel.cpp
@@ -518,6 +518,10 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
     case eIntID_ScrollbarFadeDuration:
         aResult = 350;
         break;
+    case eIntID_ContextMenuOffsetVertical:
+    case eIntID_ContextMenuOffsetHorizontal:
+        aResult = 2;
+        break;
     default:
         aResult = 0;
         res = NS_ERROR_FAILURE;
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 39d6a2d016..d68a0cb5a9 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -60,7 +60,6 @@
 #include "mozilla/AutoRestore.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/DebuggerOnGCRunnable.h"
 #include "mozilla/dom/DOMJSClass.h"
 #include "mozilla/dom/Promise.h"
@@ -1138,7 +1137,9 @@ CycleCollectedJSRuntime::RunInMetastableState(already_AddRefed<nsIRunnable>&& aR
   data.mRecursionDepth = RecursionDepth();
 
   // There must be an event running to get here.
+#ifndef MOZ_WIDGET_COCOA
   MOZ_ASSERT(data.mRecursionDepth > mBaseRecursionDepth);
+#endif
 
   mMetastableStateEvents.AppendElement(Move(data));
 }
diff --git a/xpcom/base/ErrorList.h b/xpcom/base/ErrorList.h
index b984c0fdda..6c7b888295 100644
--- a/xpcom/base/ErrorList.h
+++ b/xpcom/base/ErrorList.h
@@ -231,6 +231,8 @@
   /* The request failed because the user tried to access to a remote XUL
    * document from a website that is not in its white-list. */
   ERROR(NS_ERROR_REMOTE_XUL,           FAILURE(75)),
+  /* The request resulted in an error page being displayed. */
+  ERROR(NS_ERROR_LOAD_SHOWED_ERRORPAGE, FAILURE(77)),
 
 
   /* FTP specific error codes: */
@@ -933,6 +935,16 @@
   ERROR(NS_ERROR_DOM_ANIM_NO_TARGET_ERR,                  FAILURE(2)),
 #undef MODULE
 
+  /* ======================================================================= */
+  /* 40: NS_ERROR_MODULE_DOM_PUSH */
+  /* ======================================================================= */
+#define MODULE NS_ERROR_MODULE_DOM_PUSH
+  ERROR(NS_ERROR_DOM_PUSH_INVALID_REGISTRATION_ERR, FAILURE(1)),
+  ERROR(NS_ERROR_DOM_PUSH_DENIED_ERR, FAILURE(2)),
+  ERROR(NS_ERROR_DOM_PUSH_ABORT_ERR, FAILURE(3)),
+  ERROR(NS_ERROR_DOM_PUSH_SERVICE_UNREACHABLE, FAILURE(4)),
+#undef MODULE
+
   /* ======================================================================= */
   /* 51: NS_ERROR_MODULE_GENERAL */
   /* ======================================================================= */
diff --git a/xpcom/base/nsError.h b/xpcom/base/nsError.h
index 7fccef1f8d..cc8f47d0b8 100644
--- a/xpcom/base/nsError.h
+++ b/xpcom/base/nsError.h
@@ -77,6 +77,7 @@
 #define NS_ERROR_MODULE_DOM_BLUETOOTH 37
 #define NS_ERROR_MODULE_SIGNED_APP 38
 #define NS_ERROR_MODULE_DOM_ANIM 39
+#define NS_ERROR_MODULE_DOM_PUSH 40
 
 /* NS_ERROR_MODULE_GENERAL should be used by modules that do not
  * care if return code values overlap. Callers of methods that
diff --git a/xpfe/appshell/nsContentTreeOwner.cpp b/xpfe/appshell/nsContentTreeOwner.cpp
index 2ba93eca03..f2e2bf14c6 100644
--- a/xpfe/appshell/nsContentTreeOwner.cpp
+++ b/xpfe/appshell/nsContentTreeOwner.cpp
@@ -483,6 +483,24 @@ NS_IMETHODIMP nsContentTreeOwner::ShouldLoadURI(nsIDocShell *aDocShell,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsContentTreeOwner::ShouldAddToSessionHistory(nsIDocShell *aDocShell,
+                                              nsIURI *aURI,
+                                              bool *_retval)
+{
+  NS_ENSURE_STATE(mXULWindow);
+
+  nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
+  mXULWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));
+
+  if (xulBrowserWindow) {
+    return xulBrowserWindow->ShouldAddToSessionHistory(aDocShell, aURI, _retval);
+  }
+
+  *_retval = true;
+  return NS_OK;
+}
+
 //*****************************************************************************
 // nsContentTreeOwner::nsIWebBrowserChrome2
 //*****************************************************************************   
diff --git a/xpfe/appshell/nsIXULBrowserWindow.idl b/xpfe/appshell/nsIXULBrowserWindow.idl
index de69319f12..a3e8602731 100644
--- a/xpfe/appshell/nsIXULBrowserWindow.idl
+++ b/xpfe/appshell/nsIXULBrowserWindow.idl
@@ -19,7 +19,7 @@ interface nsITabParent;
  * internals of the browser area to tell the containing xul window to update
  * its ui. 
  */
-[scriptable, uuid(db89f748-9736-40b2-a172-3928aa1194b2)]
+[scriptable, uuid(8974a499-d49b-43e1-8b32-c9b3ed81be3f)]
 interface nsIXULBrowserWindow : nsISupports
 {
   /**
@@ -62,6 +62,9 @@ interface nsIXULBrowserWindow : nsISupports
   bool shouldLoadURI(in nsIDocShell    aDocShell,
                      in nsIURI         aURI,
                      in nsIURI         aReferrer);
+
+  bool shouldAddToSessionHistory(in nsIDocShell aDocShell,
+                                 in nsIURI      aURI);
   /**
    * Show/hide a tooltip (when the user mouses over a link, say).
    */