diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
index 5fa1c59b98..1eb35372f0 100644
--- a/chrome/nsChromeRegistry.cpp
+++ b/chrome/nsChromeRegistry.cpp
@@ -414,14 +414,12 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
   nsCOMPtr<nsIPresShell> shell = document->GetShell();
   if (shell) {
     // Reload only the chrome URL agent style sheets.
-    nsCOMArray<nsIStyleSheet> agentSheets;
+    nsTArray<RefPtr<CSSStyleSheet>> agentSheets;
     rv = shell->GetAgentStyleSheets(agentSheets);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsCOMArray<nsIStyleSheet> newAgentSheets;
-    for (int32_t l = 0; l < agentSheets.Count(); ++l) {
-      nsIStyleSheet *sheet = agentSheets[l];
-
+    nsTArray<RefPtr<CSSStyleSheet>> newAgentSheets;
+    for (CSSStyleSheet* sheet : agentSheets) {
       nsIURI* uri = sheet->GetSheetURI();
 
       if (IsChromeURI(uri)) {
@@ -431,12 +429,12 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
                                            getter_AddRefs(newSheet));
         if (NS_FAILED(rv)) return rv;
         if (newSheet) {
-          rv = newAgentSheets.AppendObject(newSheet) ? NS_OK : NS_ERROR_FAILURE;
+          rv = newAgentSheets.AppendElement(newSheet) ? NS_OK : NS_ERROR_FAILURE;
           if (NS_FAILED(rv)) return rv;
         }
       }
       else {  // Just use the same sheet.
-        rv = newAgentSheets.AppendObject(sheet) ? NS_OK : NS_ERROR_FAILURE;
+        rv = newAgentSheets.AppendElement(sheet) ? NS_OK : NS_ERROR_FAILURE;
         if (NS_FAILED(rv)) return rv;
       }
     }
@@ -445,27 +443,22 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  // Build an array of nsIURIs of style sheets we need to load.
-  nsCOMArray<nsIStyleSheet> oldSheets;
-  nsCOMArray<nsIStyleSheet> newSheets;
-
   int32_t count = document->GetNumberOfStyleSheets();
 
-  // Iterate over the style sheets.
-  int32_t i;
-  for (i = 0; i < count; i++) {
-    // Get the style sheet
-    nsIStyleSheet *styleSheet = document->GetStyleSheetAt(i);
+  // Build an array of style sheets we need to reload.
+  nsTArray<RefPtr<CSSStyleSheet>> oldSheets(count);
+  nsTArray<RefPtr<CSSStyleSheet>> newSheets(count);
 
-    if (!oldSheets.AppendObject(styleSheet)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
+  // Iterate over the style sheets.
+  for (int32_t i = 0; i < count; i++) {
+    // Get the style sheet
+    CSSStyleSheet* styleSheet = document->GetStyleSheetAt(i);
+    oldSheets.AppendElement(styleSheet);
   }
 
   // Iterate over our old sheets and kick off a sync load of the new
   // sheet if and only if it's a chrome URL.
-  for (i = 0; i < count; i++) {
-    RefPtr<CSSStyleSheet> sheet = do_QueryObject(oldSheets[i]);
+  for (CSSStyleSheet* sheet : oldSheets) {
     nsIURI* uri = sheet ? sheet->GetOriginalURI() : nullptr;
 
     if (uri && IsChromeURI(uri)) {
@@ -475,11 +468,10 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
       // only works by sheer dumb luck.
       document->LoadChromeSheetSync(uri, false, getter_AddRefs(newSheet));
       // Even if it's null, we put in in there.
-      newSheets.AppendObject(newSheet);
-    }
-    else {
+      newSheets.AppendElement(newSheet);
+    } else {
       // Just use the same sheet.
-      newSheets.AppendObject(sheet);
+      newSheets.AppendElement(sheet);
     }
   }
 
diff --git a/dom/base/FileReader.cpp b/dom/base/FileReader.cpp
index e6c255ee49..cabda2fe97 100644
--- a/dom/base/FileReader.cpp
+++ b/dom/base/FileReader.cpp
@@ -13,6 +13,7 @@
 #include "nsIStreamTransportService.h"
 
 #include "mozilla/Base64.h"
+#include "mozilla/CheckedInt.h"
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/EncodingUtils.h"
 #include "mozilla/dom/File.h"
@@ -315,11 +316,17 @@ FileReader::DoReadData(uint64_t aCount)
     NS_ASSERTION(bytesRead == aCount, "failed to read data");
   }
   else {
+    CheckedInt<uint64_t> size = mDataLen;
+    size += aCount;
+
     //Update memory buffer to reflect the contents of the file
-    if (mDataLen + aCount > UINT32_MAX) {
-      // PR_Realloc doesn't support over 4GB memory size even if 64-bit OS
+    if (!size.isValid() ||
+        // PR_Realloc doesn't support over 4GB memory size even if 64-bit OS
+        size.value() > UINT32_MAX ||
+        size.value() > mTotal) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
+
     if (mDataFormat != FILE_AS_ARRAYBUFFER) {
       mFileData = (char *) moz_realloc(mFileData, mDataLen + aCount);
       NS_ENSURE_TRUE(mFileData, NS_ERROR_OUT_OF_MEMORY);
@@ -347,6 +354,14 @@ FileReader::ReadFileContent(Blob& aBlob,
   Abort(error);
   error.SuppressException();
 
+  if (mReadyState == LOADING) {
+    // A nested ReadAsSomething() as been called during one of the events
+    // dispatched by Abort(). We have to terminate this operation in order to
+    // continue the nested one.
+    aRv.Throw(NS_ERROR_ABORT);
+    return;
+  }
+
   mError = nullptr;
   SetDOMStringToNull(mResult);
   mTransferred = 0;
diff --git a/dom/base/FormData.cpp b/dom/base/FormData.cpp
index ac5396572f..fd55894bc4 100644
--- a/dom/base/FormData.cpp
+++ b/dom/base/FormData.cpp
@@ -23,16 +23,17 @@ FormData::FormData(nsISupports* aOwner)
 
 namespace {
 
-already_AddRefed<Blob>
-GetBlobForFormDataStorage(Blob& aBlob, const Optional<nsAString>& aFilename,
-                          ErrorResult& aRv)
+already_AddRefed<File>
+GetOrCreateFileCalledBlob(Blob& aBlob, ErrorResult& aRv)
 {
-  if (!aFilename.WasPassed()) {
-    RefPtr<Blob> blob = &aBlob;
-    return blob.forget();
+  // If this is file, we can just use it
+  RefPtr<File> file = aBlob.ToFile();
+  if (file) {
+    return file.forget();
   }
 
-  RefPtr<File> file = aBlob.ToFile(aFilename.Value(), aRv);
+  // Forcing 'blob' as filename
+  file = aBlob.ToFile(NS_LITERAL_STRING("blob"), aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
@@ -40,6 +41,23 @@ GetBlobForFormDataStorage(Blob& aBlob, const Optional<nsAString>& aFilename,
   return file.forget();
 }
 
+already_AddRefed<File>
+GetBlobForFormDataStorage(Blob& aBlob, const Optional<nsAString>& aFilename,
+                          ErrorResult& aRv)
+{
+  // Forcing a filename
+  if (aFilename.WasPassed()) {
+    RefPtr<File> file = aBlob.ToFile(aFilename.Value(), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return nullptr;
+    }
+
+    return file.forget();
+  }
+
+  return GetOrCreateFileCalledBlob(aBlob, aRv);
+}
+
 } // namespace
 
 // -------------------------------------------------------------------------
@@ -102,12 +120,12 @@ FormData::Append(const nsAString& aName, Blob& aBlob,
                  const Optional<nsAString>& aFilename,
                  ErrorResult& aRv)
 {
-  RefPtr<Blob> blob = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
+  RefPtr<File> file = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
-  AddNameBlobPair(aName, blob);
+  AddNameBlobPair(aName, file);
 }
 
 void
@@ -165,8 +183,14 @@ FormData::AddNameBlobPair(const nsAString& aName, Blob* aBlob)
 {
   MOZ_ASSERT(aBlob);
 
+  ErrorResult rv;
+  RefPtr<File> file = GetOrCreateFileCalledBlob(*aBlob, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
   FormDataTuple* data = mFormData.AppendElement();
-  SetNameBlobPair(data, aName, aBlob);
+  SetNameFilePair(data, aName, file);
   return NS_OK;
 }
 
@@ -199,12 +223,12 @@ FormData::Set(const nsAString& aName, Blob& aBlob,
 {
   FormDataTuple* tuple = RemoveAllOthersAndGetFirstFormDataTuple(aName);
   if (tuple) {
-    RefPtr<Blob> blob = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
+    RefPtr<File> file = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       return;
     }
 
-    SetNameBlobPair(tuple, aName, blob);
+    SetNameFilePair(tuple, aName, file);
   } else {
     Append(aName, aBlob, aFilename, aRv);
   }
@@ -253,15 +277,15 @@ FormData::SetNameValuePair(FormDataTuple* aData,
 }
 
 void
-FormData::SetNameBlobPair(FormDataTuple* aData,
+FormData::SetNameFilePair(FormDataTuple* aData,
                           const nsAString& aName,
-                          Blob* aBlob)
+                          File* aFile)
 {
   MOZ_ASSERT(aData);
-  MOZ_ASSERT(aBlob);
+  MOZ_ASSERT(aFile);
 
   aData->name = aName;
-  aData->value.SetAsBlob() = aBlob;
+  aData->value.SetAsBlob() = aFile;
 }
 
 // -------------------------------------------------------------------------
@@ -343,20 +367,7 @@ FormData::GetSendInfo(nsIInputStream** aBody, uint64_t* aContentLength,
 
   for (uint32_t i = 0; i < mFormData.Length(); ++i) {
     if (mFormData[i].value.IsBlob()) {
-      RefPtr<File> file = mFormData[i].value.GetAsBlob()->ToFile();
-      if (file) {
-        fs.AddNameBlobPair(mFormData[i].name, file);
-        continue;
-      }
-
-      ErrorResult rv;
-      file =
-        mFormData[i].value.GetAsBlob()->ToFile(NS_LITERAL_STRING("blob"), rv);
-      if (NS_WARN_IF(rv.Failed())) {
-        return rv.StealNSResult();
-      }
-
-      fs.AddNameBlobPair(mFormData[i].name, file);
+      fs.AddNameBlobPair(mFormData[i].name, mFormData[i].value.GetAsBlob());
     } else if (mFormData[i].value.IsUSVString()) {
       fs.AddNameValuePair(mFormData[i].name,
                           mFormData[i].value.GetAsUSVString());
diff --git a/dom/base/FormData.h b/dom/base/FormData.h
index e50cd20960..66373730cb 100644
--- a/dom/base/FormData.h
+++ b/dom/base/FormData.h
@@ -47,9 +47,9 @@ private:
                         const nsAString& aName,
                         const nsAString& aValue);
 
-  void SetNameBlobPair(FormDataTuple* aData,
+  void SetNameFilePair(FormDataTuple* aData,
                        const nsAString& aName,
-                       Blob* aBlob);
+                       File* aFile);
 
 public:
   explicit FormData(nsISupports* aOwner = nullptr);
diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp
index 7c23a188b9..972e0aa77a 100644
--- a/dom/base/WebSocket.cpp
+++ b/dom/base/WebSocket.cpp
@@ -2121,17 +2121,6 @@ public:
     return true;
   }
 
-  bool Suspend(JSContext* aCx) override
-  {
-    {
-      MutexAutoLock lock(mWebSocketImpl->mMutex);
-      mWebSocketImpl->mWorkerShuttingDown = true;
-    }
-
-    mWebSocketImpl->CloseConnection(nsIWebSocketChannel::CLOSE_GOING_AWAY);
-    return true;
-  }
-
 private:
   WebSocketImpl* mWebSocketImpl;
 };
diff --git a/dom/base/crashtests/1230422.html b/dom/base/crashtests/1230422.html
new file mode 100644
index 0000000000..fbaa63d385
--- /dev/null
+++ b/dom/base/crashtests/1230422.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<script>
+
+var a = new FileReader();
+
+function f() {
+  a.removeEventListener("loadend", f);
+  g();
+}
+
+function g() {
+  a.readAsBinaryString(new Blob());
+}
+
+a.addEventListener("loadend", f);
+
+try {
+  g();
+  g();
+} catch(e) {}
+
+</script>
+</body>
+</html>
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index a4d67018e0..73ad2f1e42 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -204,3 +204,4 @@ load structured_clone_container_throws.html
 HTTP(..) load xhr_abortinprogress.html
 load xhr_empty_datauri.html
 load xhr_html_nullresponse.html
+load 1230422.html
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index b447ad2ca3..233827cdb2 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -99,7 +99,6 @@
 #include "mozilla/Preferences.h"
 #include "nsIContentIterator.h"
 #include "nsIDOMStyleSheet.h"
-#include "nsIStyleSheet.h"
 #include "nsIStyleSheetService.h"
 #include "nsContentPermissionHelper.h"
 #include "nsCSSPseudoElements.h"            // for CSSPseudoElementType
@@ -3381,7 +3380,7 @@ nsDOMWindowUtils::AddSheet(nsIDOMStyleSheet *aSheet, uint32_t aSheetType)
   NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
   nsIDocument::additionalSheetType type = convertSheetType(aSheetType);
-  nsCOMPtr<nsIStyleSheet> sheet = do_QueryInterface(aSheet);
+  RefPtr<CSSStyleSheet> sheet = do_QueryObject(aSheet);
   NS_ENSURE_TRUE(sheet, NS_ERROR_FAILURE);
   if (sheet->GetOwningDocument()) {
     return NS_ERROR_INVALID_ARG;
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 88f6cd6138..22e19397cd 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -716,15 +716,6 @@ nsDOMStyleSheetList::Length()
   // been added or removed.
   if (-1 == mLength) {
     mLength = mDocument->GetNumberOfStyleSheets();
-
-#ifdef DEBUG
-    int32_t i;
-    for (i = 0; i < mLength; i++) {
-      nsIStyleSheet *sheet = mDocument->GetStyleSheetAt(i);
-      nsCOMPtr<nsIDOMStyleSheet> domss(do_QueryInterface(sheet));
-      NS_ASSERTION(domss, "All \"normal\" sheets implement nsIDOMStyleSheet");
-    }
-#endif
   }
   return mLength;
 }
@@ -738,7 +729,7 @@ nsDOMStyleSheetList::IndexedGetter(uint32_t aIndex, bool& aFound)
   }
 
   aFound = true;
-  nsIStyleSheet *sheet = mDocument->GetStyleSheetAt(aIndex);
+  CSSStyleSheet* sheet = mDocument->GetStyleSheetAt(aIndex);
   NS_ASSERTION(sheet, "Must have a sheet");
 
   return static_cast<CSSStyleSheet*>(sheet);
@@ -751,26 +742,20 @@ nsDOMStyleSheetList::NodeWillBeDestroyed(const nsINode *aNode)
 }
 
 void
-nsDOMStyleSheetList::StyleSheetAdded(nsIStyleSheet* aStyleSheet,
+nsDOMStyleSheetList::StyleSheetAdded(CSSStyleSheet* aStyleSheet,
                                      bool aDocumentSheet)
 {
   if (aDocumentSheet && -1 != mLength) {
-    nsCOMPtr<nsIDOMStyleSheet> domss(do_QueryInterface(aStyleSheet));
-    if (domss) {
-      mLength++;
-    }
+    mLength++;
   }
 }
 
 void
-nsDOMStyleSheetList::StyleSheetRemoved(nsIStyleSheet* aStyleSheet,
+nsDOMStyleSheetList::StyleSheetRemoved(CSSStyleSheet* aStyleSheet,
                                        bool aDocumentSheet)
 {
   if (aDocumentSheet && -1 != mLength) {
-    nsCOMPtr<nsIDOMStyleSheet> domss(do_QueryInterface(aStyleSheet));
-    if (domss) {
-      mLength--;
-    }
+    mLength--;
   }
 }
 
@@ -1333,7 +1318,7 @@ nsDOMStyleSheetSetList::EnsureFresh()
   int32_t count = mDocument->GetNumberOfStyleSheets();
   nsAutoString title;
   for (int32_t index = 0; index < count; index++) {
-    nsIStyleSheet* sheet = mDocument->GetStyleSheetAt(index);
+    CSSStyleSheet* sheet = mDocument->GetStyleSheetAt(index);
     NS_ASSERTION(sheet, "Null sheet in sheet list!");
     sheet->GetTitle(title);
     if (!title.IsEmpty() && !mNames.Contains(title) && !Add(title)) {
@@ -1607,9 +1592,7 @@ nsDocument::~nsDocument()
 
   nsAutoScriptBlocker scriptBlocker;
 
-  int32_t indx; // must be signed
-  uint32_t count = mChildren.ChildCount();
-  for (indx = int32_t(count) - 1; indx >= 0; --indx) {
+  for (uint32_t indx = mChildren.ChildCount(); indx-- != 0; ) {
     mChildren.ChildAt(indx)->UnbindFromTree();
     mChildren.RemoveChildAt(indx);
   }
@@ -1617,9 +1600,8 @@ nsDocument::~nsDocument()
   mCachedRootElement = nullptr;
 
   // Let the stylesheets know we're going away
-  indx = mStyleSheets.Count();
-  while (--indx >= 0) {
-    mStyleSheets[indx]->SetOwningDocument(nullptr);
+  for (CSSStyleSheet* sheet : mStyleSheets) {
+    sheet->SetOwningDocument(nullptr);
   }
   if (mAttrStyleSheet) {
     mAttrStyleSheet->SetOwningDocument(nullptr);
@@ -2297,9 +2279,7 @@ void
 nsDocument::RemoveDocStyleSheetsFromStyleSets()
 {
   // The stylesheets should forget us
-  int32_t indx = mStyleSheets.Count();
-  while (--indx >= 0) {
-    nsIStyleSheet* sheet = mStyleSheets[indx];
+  for (CSSStyleSheet* sheet : Reversed(mStyleSheets)) {
     sheet->SetOwningDocument(nullptr);
 
     if (sheet->IsApplicable()) {
@@ -2313,12 +2293,12 @@ nsDocument::RemoveDocStyleSheetsFromStyleSets()
 }
 
 void
-nsDocument::RemoveStyleSheetsFromStyleSets(nsCOMArray<nsIStyleSheet>& aSheets, SheetType aType)
+nsDocument::RemoveStyleSheetsFromStyleSets(
+    nsTArray<RefPtr<CSSStyleSheet>>& aSheets,
+    SheetType aType)
 {
   // The stylesheets should forget us
-  int32_t indx = aSheets.Count();
-  while (--indx >= 0) {
-    nsIStyleSheet* sheet = aSheets[indx];
+  for (CSSStyleSheet* sheet : Reversed(aSheets)) {
     sheet->SetOwningDocument(nullptr);
 
     if (sheet->IsApplicable()) {
@@ -2327,10 +2307,8 @@ nsDocument::RemoveStyleSheetsFromStyleSets(nsCOMArray<nsIStyleSheet>& aSheets, S
         shell->StyleSet()->RemoveStyleSheet(aType, sheet);
       }
     }
-
     // XXX Tell observers?
   }
-
 }
 
 void
@@ -2385,21 +2363,13 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
   }
 }
 
-static bool
-AppendAuthorSheet(nsIStyleSheet *aSheet, void *aData)
-{
-  nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
-  styleSet->AppendStyleSheet(SheetType::Doc, aSheet);
-  return true;
-}
-
 static void
 AppendSheetsToStyleSet(nsStyleSet* aStyleSet,
-                       const nsCOMArray<nsIStyleSheet>& aSheets,
+                       const nsTArray<RefPtr<CSSStyleSheet>>& aSheets,
                        SheetType aType)
 {
-  for (int32_t i = aSheets.Count() - 1; i >= 0; --i) {
-    aStyleSet->AppendStyleSheet(aType, aSheets[i]);
+  for (CSSStyleSheet* sheet : Reversed(aSheets)) {
+    aStyleSet->AppendStyleSheet(aType, sheet);
   }
 }
 
@@ -2411,9 +2381,7 @@ nsDocument::FillStyleSet(nsStyleSet* aStyleSet)
   NS_PRECONDITION(aStyleSet->SheetCount(SheetType::Doc) == 0,
                   "Style set already has document sheets?");
 
-  int32_t i;
-  for (i = mStyleSheets.Count() - 1; i >= 0; --i) {
-    nsIStyleSheet* sheet = mStyleSheets[i];
+  for (CSSStyleSheet* sheet : Reversed(mStyleSheets)) {
     if (sheet->IsApplicable()) {
       aStyleSet->AddDocStyleSheet(sheet, this);
     }
@@ -2421,13 +2389,13 @@ nsDocument::FillStyleSet(nsStyleSet* aStyleSet)
 
   nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance();
   if (sheetService) {
-    sheetService->AuthorStyleSheets()->EnumerateForwards(AppendAuthorSheet,
-                                                         aStyleSet);
+    for (CSSStyleSheet* sheet : *sheetService->AuthorStyleSheets()) {
+      aStyleSet->AppendStyleSheet(SheetType::Doc, sheet);
+    }
   }
 
   // Iterate backwards to maintain order
-  for (i = mOnDemandBuiltInUASheets.Count() - 1; i >= 0; --i) {
-    nsIStyleSheet* sheet = mOnDemandBuiltInUASheets[i];
+  for (CSSStyleSheet* sheet : Reversed(mOnDemandBuiltInUASheets)) {
     if (sheet->IsApplicable()) {
       aStyleSet->PrependStyleSheet(SheetType::Agent, sheet);
     }
@@ -4082,8 +4050,7 @@ nsDocument::RemoveChildAt(uint32_t aIndex, bool aNotify)
 void
 nsDocument::EnsureOnDemandBuiltInUASheet(CSSStyleSheet* aSheet)
 {
-  // Contains() takes nsISupport*, so annoyingly we have to cast here
-  if (mOnDemandBuiltInUASheets.Contains(static_cast<nsIStyleSheet*>(aSheet))) {
+  if (mOnDemandBuiltInUASheets.Contains(aSheet)) {
     return;
   }
   BeginUpdate(UPDATE_STYLE);
@@ -4094,8 +4061,7 @@ nsDocument::EnsureOnDemandBuiltInUASheet(CSSStyleSheet* aSheet)
 void
 nsDocument::AddOnDemandBuiltInUASheet(CSSStyleSheet* aSheet)
 {
-  // Contains() takes nsISupport*, so annoyingly we have to cast here
-  MOZ_ASSERT(!mOnDemandBuiltInUASheets.Contains(static_cast<nsIStyleSheet*>(aSheet)));
+  MOZ_ASSERT(!mOnDemandBuiltInUASheets.Contains(aSheet));
 
   // Prepend here so that we store the sheets in mOnDemandBuiltInUASheets in
   // the same order that they should end up in the style set.
@@ -4119,24 +4085,23 @@ nsDocument::AddOnDemandBuiltInUASheet(CSSStyleSheet* aSheet)
 int32_t
 nsDocument::GetNumberOfStyleSheets() const
 {
-  return mStyleSheets.Count();
+  return mStyleSheets.Length();
 }
 
-nsIStyleSheet*
+CSSStyleSheet*
 nsDocument::GetStyleSheetAt(int32_t aIndex) const
 {
-  NS_ENSURE_TRUE(0 <= aIndex && aIndex < mStyleSheets.Count(), nullptr);
-  return mStyleSheets[aIndex];
+  return mStyleSheets.SafeElementAt(aIndex, nullptr);
 }
 
 int32_t
-nsDocument::GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const
+nsDocument::GetIndexOfStyleSheet(CSSStyleSheet* aSheet) const
 {
   return mStyleSheets.IndexOf(aSheet);
 }
 
 void
-nsDocument::AddStyleSheetToStyleSets(nsIStyleSheet* aSheet)
+nsDocument::AddStyleSheetToStyleSets(CSSStyleSheet* aSheet)
 {
   nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
@@ -4146,15 +4111,10 @@ nsDocument::AddStyleSheetToStyleSets(nsIStyleSheet* aSheet)
 
 #define DO_STYLESHEET_NOTIFICATION(className, type, memberName, argName)      \
   do {                                                                        \
-    RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(aSheet);                \
-    if (!cssSheet) {                                                          \
-      return;                                                                 \
-    }                                                                         \
-                                                                              \
     className##Init init;                                                     \
     init.mBubbles = true;                                                     \
     init.mCancelable = true;                                                  \
-    init.mStylesheet = cssSheet;                                              \
+    init.mStylesheet = aSheet;                                                \
     init.memberName = argName;                                                \
                                                                               \
     RefPtr<className> event =                                               \
@@ -4168,7 +4128,7 @@ nsDocument::AddStyleSheetToStyleSets(nsIStyleSheet* aSheet)
   } while (0);
 
 void
-nsDocument::NotifyStyleSheetAdded(nsIStyleSheet* aSheet, bool aDocumentSheet)
+nsDocument::NotifyStyleSheetAdded(CSSStyleSheet* aSheet, bool aDocumentSheet)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(StyleSheetAdded, (aSheet, aDocumentSheet));
 
@@ -4181,7 +4141,7 @@ nsDocument::NotifyStyleSheetAdded(nsIStyleSheet* aSheet, bool aDocumentSheet)
 }
 
 void
-nsDocument::NotifyStyleSheetRemoved(nsIStyleSheet* aSheet, bool aDocumentSheet)
+nsDocument::NotifyStyleSheetRemoved(CSSStyleSheet* aSheet, bool aDocumentSheet)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(StyleSheetRemoved, (aSheet, aDocumentSheet));
 
@@ -4194,10 +4154,10 @@ nsDocument::NotifyStyleSheetRemoved(nsIStyleSheet* aSheet, bool aDocumentSheet)
 }
 
 void
-nsDocument::AddStyleSheet(nsIStyleSheet* aSheet)
+nsDocument::AddStyleSheet(CSSStyleSheet* aSheet)
 {
   NS_PRECONDITION(aSheet, "null arg");
-  mStyleSheets.AppendObject(aSheet);
+  mStyleSheets.AppendElement(aSheet);
   aSheet->SetOwningDocument(this);
 
   if (aSheet->IsApplicable()) {
@@ -4208,7 +4168,7 @@ nsDocument::AddStyleSheet(nsIStyleSheet* aSheet)
 }
 
 void
-nsDocument::RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet)
+nsDocument::RemoveStyleSheetFromStyleSets(CSSStyleSheet* aSheet)
 {
   nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
@@ -4217,12 +4177,12 @@ nsDocument::RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet)
 }
 
 void
-nsDocument::RemoveStyleSheet(nsIStyleSheet* aSheet)
+nsDocument::RemoveStyleSheet(CSSStyleSheet* aSheet)
 {
   NS_PRECONDITION(aSheet, "null arg");
-  nsCOMPtr<nsIStyleSheet> sheet = aSheet; // hold ref so it won't die too soon
+  RefPtr<CSSStyleSheet> sheet = aSheet; // hold ref so it won't die too soon
 
-  if (!mStyleSheets.RemoveObject(aSheet)) {
+  if (!mStyleSheets.RemoveElement(aSheet)) {
     NS_ASSERTION(mInUnlinkOrDeletion, "stylesheet not found");
     return;
   }
@@ -4239,17 +4199,17 @@ nsDocument::RemoveStyleSheet(nsIStyleSheet* aSheet)
 }
 
 void
-nsDocument::UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
-                              nsCOMArray<nsIStyleSheet>& aNewSheets)
+nsDocument::UpdateStyleSheets(nsTArray<RefPtr<CSSStyleSheet>>& aOldSheets,
+                              nsTArray<RefPtr<CSSStyleSheet>>& aNewSheets)
 {
   BeginUpdate(UPDATE_STYLE);
 
   // XXX Need to set the sheet on the ownernode, if any
-  NS_PRECONDITION(aOldSheets.Count() == aNewSheets.Count(),
+  NS_PRECONDITION(aOldSheets.Length() == aNewSheets.Length(),
                   "The lists must be the same length!");
-  int32_t count = aOldSheets.Count();
+  int32_t count = aOldSheets.Length();
 
-  nsCOMPtr<nsIStyleSheet> oldSheet;
+  RefPtr<CSSStyleSheet> oldSheet;
   int32_t i;
   for (i = 0; i < count; ++i) {
     oldSheet = aOldSheets[i];
@@ -4260,9 +4220,9 @@ nsDocument::UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
     RemoveStyleSheet(oldSheet);  // This does the right notifications
 
     // Now put the new one in its place.  If it's null, just ignore it.
-    nsIStyleSheet* newSheet = aNewSheets[i];
+    CSSStyleSheet* newSheet = aNewSheets[i];
     if (newSheet) {
-      mStyleSheets.InsertObjectAt(newSheet, oldIndex);
+      mStyleSheets.InsertElementAt(oldIndex, newSheet);
       newSheet->SetOwningDocument(this);
       if (newSheet->IsApplicable()) {
         AddStyleSheetToStyleSets(newSheet);
@@ -4276,10 +4236,11 @@ nsDocument::UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
 }
 
 void
-nsDocument::InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex)
+nsDocument::InsertStyleSheetAt(CSSStyleSheet* aSheet, int32_t aIndex)
 {
   NS_PRECONDITION(aSheet, "null ptr");
-  mStyleSheets.InsertObjectAt(aSheet, aIndex);
+
+  mStyleSheets.InsertElementAt(aIndex, aSheet);
 
   aSheet->SetOwningDocument(this);
 
@@ -4292,13 +4253,13 @@ nsDocument::InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex)
 
 
 void
-nsDocument::SetStyleSheetApplicableState(nsIStyleSheet* aSheet,
+nsDocument::SetStyleSheetApplicableState(CSSStyleSheet* aSheet,
                                          bool aApplicable)
 {
   NS_PRECONDITION(aSheet, "null arg");
 
   // If we're actually in the document style sheet list
-  if (-1 != mStyleSheets.IndexOf(aSheet)) {
+  if (mStyleSheets.IndexOf(aSheet) != mStyleSheets.NoIndex) {
     if (aApplicable) {
       AddStyleSheetToStyleSets(aSheet);
     } else {
@@ -4358,9 +4319,9 @@ ConvertAdditionalSheetType(nsIDocument::additionalSheetType aType)
 }
 
 static int32_t
-FindSheet(const nsCOMArray<nsIStyleSheet>& aSheets, nsIURI* aSheetURI)
+FindSheet(const nsTArray<RefPtr<CSSStyleSheet>>& aSheets, nsIURI* aSheetURI)
 {
-  for (int32_t i = aSheets.Count() - 1; i >= 0; i-- ) {
+  for (int32_t i = aSheets.Length() - 1; i >= 0; i-- ) {
     bool bEqual;
     nsIURI* uri = aSheets[i]->GetSheetURI();
 
@@ -4414,7 +4375,7 @@ nsDocument::LoadAdditionalStyleSheet(additionalSheetType aType,
 }
 
 nsresult
-nsDocument::AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aSheet)
+nsDocument::AddAdditionalStyleSheet(additionalSheetType aType, CSSStyleSheet* aSheet)
 {
   if (mAdditionalSheets[aType].Contains(aSheet))
     return NS_ERROR_INVALID_ARG;
@@ -4422,7 +4383,7 @@ nsDocument::AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aS
   if (!aSheet->IsApplicable())
     return NS_ERROR_INVALID_ARG;
 
-  mAdditionalSheets[aType].AppendObject(aSheet);
+  mAdditionalSheets[aType].AppendElement(aSheet);
 
   BeginUpdate(UPDATE_STYLE);
   nsCOMPtr<nsIPresShell> shell = GetShell();
@@ -4443,12 +4404,12 @@ nsDocument::RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheet
 {
   MOZ_ASSERT(aSheetURI);
 
-  nsCOMArray<nsIStyleSheet>& sheets = mAdditionalSheets[aType];
+  nsTArray<RefPtr<CSSStyleSheet>>& sheets = mAdditionalSheets[aType];
 
   int32_t i = FindSheet(mAdditionalSheets[aType], aSheetURI);
   if (i >= 0) {
-    nsCOMPtr<nsIStyleSheet> sheetRef = sheets[i];
-    sheets.RemoveObjectAt(i);
+    RefPtr<CSSStyleSheet> sheetRef = sheets[i];
+    sheets.RemoveElementAt(i);
 
     BeginUpdate(UPDATE_STYLE);
     if (!mIsGoingAway) {
@@ -4469,10 +4430,10 @@ nsDocument::RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheet
   }
 }
 
-nsIStyleSheet*
+CSSStyleSheet*
 nsDocument::FirstAdditionalAuthorSheet()
 {
-  return mAdditionalSheets[eAuthorSheet].SafeObjectAt(0);
+  return mAdditionalSheets[eAuthorSheet].SafeElementAt(0, nullptr);
 }
 
 nsIGlobalObject*
@@ -5212,7 +5173,7 @@ nsDocument::DocumentStatesChanged(EventStates aStateMask)
 }
 
 void
-nsDocument::StyleRuleChanged(nsIStyleSheet* aSheet,
+nsDocument::StyleRuleChanged(CSSStyleSheet* aSheet,
                              css::Rule* aStyleRule)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(StyleRuleChanged, (aSheet));
@@ -5226,7 +5187,7 @@ nsDocument::StyleRuleChanged(nsIStyleSheet* aSheet,
 }
 
 void
-nsDocument::StyleRuleAdded(nsIStyleSheet* aSheet,
+nsDocument::StyleRuleAdded(CSSStyleSheet* aSheet,
                            css::Rule* aStyleRule)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(StyleRuleAdded, (aSheet));
@@ -5241,7 +5202,7 @@ nsDocument::StyleRuleAdded(nsIStyleSheet* aSheet,
 }
 
 void
-nsDocument::StyleRuleRemoved(nsIStyleSheet* aSheet,
+nsDocument::StyleRuleRemoved(CSSStyleSheet* aSheet,
                              css::Rule* aStyleRule)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(StyleRuleRemoved, (aSheet));
@@ -6482,13 +6443,11 @@ nsIDocument::GetSelectedStyleSheetSet(nsAString& aSheetSet)
   int32_t count = GetNumberOfStyleSheets();
   nsAutoString title;
   for (int32_t index = 0; index < count; index++) {
-    nsIStyleSheet* sheet = GetStyleSheetAt(index);
+    CSSStyleSheet* sheet = GetStyleSheetAt(index);
     NS_ASSERTION(sheet, "Null sheet in sheet list!");
 
-    nsCOMPtr<nsIDOMStyleSheet> domSheet = do_QueryInterface(sheet);
-    NS_ASSERTION(domSheet, "Sheet must QI to nsIDOMStyleSheet");
     bool disabled;
-    domSheet->GetDisabled(&disabled);
+    sheet->GetDisabled(&disabled);
     if (disabled) {
       // Disabled sheets don't affect the currently selected set
       continue;
@@ -6598,7 +6557,7 @@ nsDocument::EnableStyleSheetsForSetInternal(const nsAString& aSheetSet,
   int32_t count = GetNumberOfStyleSheets();
   nsAutoString title;
   for (int32_t index = 0; index < count; index++) {
-    nsIStyleSheet* sheet = GetStyleSheetAt(index);
+    CSSStyleSheet* sheet = GetStyleSheetAt(index);
     NS_ASSERTION(sheet, "Null sheet in sheet list!");
     sheet->GetTitle(title);
     if (!title.IsEmpty()) {
@@ -10205,7 +10164,7 @@ nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer)
 
       int32_t sheetsCount = GetNumberOfStyleSheets();
       for (int32_t i = 0; i < sheetsCount; ++i) {
-        RefPtr<CSSStyleSheet> sheet = do_QueryObject(GetStyleSheetAt(i));
+        RefPtr<CSSStyleSheet> sheet = GetStyleSheetAt(i);
         if (sheet) {
           if (sheet->IsApplicable()) {
             RefPtr<CSSStyleSheet> clonedSheet =
@@ -10218,11 +10177,8 @@ nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer)
         }
       }
 
-      sheetsCount = thisAsDoc->mOnDemandBuiltInUASheets.Count();
       // Iterate backwards to maintain order
-      for (int32_t i = sheetsCount - 1; i >= 0; --i) {
-        RefPtr<CSSStyleSheet> sheet =
-          do_QueryObject(thisAsDoc->mOnDemandBuiltInUASheets[i]);
+      for (CSSStyleSheet* sheet : Reversed(thisAsDoc->mOnDemandBuiltInUASheets)) {
         if (sheet) {
           if (sheet->IsApplicable()) {
             RefPtr<CSSStyleSheet> clonedSheet =
@@ -12360,7 +12316,7 @@ nsDocument::OnAppThemeChanged()
   }
 
   for (int32_t i = 0; i < GetNumberOfStyleSheets(); i++) {
-    RefPtr<CSSStyleSheet> sheet =  do_QueryObject(GetStyleSheetAt(i));
+    RefPtr<CSSStyleSheet> sheet = GetStyleSheetAt(i);
     if (!sheet) {
       continue;
     }
@@ -12727,15 +12683,19 @@ nsIDocument::DocAddSizeOfIncludingThis(nsWindowSizes* aWindowSizes) const
 }
 
 static size_t
-SizeOfStyleSheetsElementIncludingThis(nsIStyleSheet* aStyleSheet,
-                                      MallocSizeOf aMallocSizeOf,
-                                      void* aData)
+SizeOfOwnedSheetArrayExcludingThis(const nsTArray<RefPtr<CSSStyleSheet>>& aSheets,
+                                   MallocSizeOf aMallocSizeOf)
 {
-  if (!aStyleSheet->GetOwningDocument()) {
-    // Avoid over-reporting shared sheets.
-    return 0;
+  size_t n = 0;
+  n += aSheets.ShallowSizeOfExcludingThis(aMallocSizeOf);
+  for (CSSStyleSheet* sheet : aSheets) {
+    if (!sheet->GetOwningDocument()) {
+      // Avoid over-reporting shared sheets.
+      continue;
+    }
+    n += sheet->SizeOfIncludingThis(aMallocSizeOf);
   }
-  return aStyleSheet->SizeOfIncludingThis(aMallocSizeOf);
+  return n;
 }
 
 size_t
@@ -12786,26 +12746,18 @@ nsDocument::DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const
   }
 
   aWindowSizes->mStyleSheetsSize +=
-    mStyleSheets.SizeOfExcludingThis(SizeOfStyleSheetsElementIncludingThis,
-                                     aWindowSizes->mMallocSizeOf);
+    SizeOfOwnedSheetArrayExcludingThis(mStyleSheets,
+                                       aWindowSizes->mMallocSizeOf);
   // Note that we do not own the sheets pointed to by mOnDemandBuiltInUASheets
-  // (the nsLayoutStyleSheetCache singleton does) so pass nullptr as the
-  // aSizeOfElementIncludingThis callback argument.
+  // (the nsLayoutStyleSheetCache singleton does).
   aWindowSizes->mStyleSheetsSize +=
-    mOnDemandBuiltInUASheets.SizeOfExcludingThis(nullptr,
-                                                 aWindowSizes->mMallocSizeOf);
-  aWindowSizes->mStyleSheetsSize +=
-    mAdditionalSheets[eAgentSheet].
-      SizeOfExcludingThis(SizeOfStyleSheetsElementIncludingThis,
-                          aWindowSizes->mMallocSizeOf);
-  aWindowSizes->mStyleSheetsSize +=
-    mAdditionalSheets[eUserSheet].
-      SizeOfExcludingThis(SizeOfStyleSheetsElementIncludingThis,
-                          aWindowSizes->mMallocSizeOf);
-  aWindowSizes->mStyleSheetsSize +=
-    mAdditionalSheets[eAuthorSheet].
-      SizeOfExcludingThis(SizeOfStyleSheetsElementIncludingThis,
-                          aWindowSizes->mMallocSizeOf);
+    mOnDemandBuiltInUASheets.ShallowSizeOfExcludingThis(
+        aWindowSizes->mMallocSizeOf);
+  for (auto& sheetArray : mAdditionalSheets) {
+    aWindowSizes->mStyleSheetsSize +=
+      SizeOfOwnedSheetArrayExcludingThis(sheetArray,
+                                         aWindowSizes->mMallocSizeOf);
+  }
   // Lumping in the loader with the style-sheets size is not ideal,
   // but most of the things in there are in fact stylesheets, so it
   // doesn't seem worthwhile to separate it out.
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
index 85b1caeb2f..0f715f7d65 100644
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -775,24 +775,29 @@ public:
    * These are ordered, highest priority last
    */
   virtual int32_t GetNumberOfStyleSheets() const override;
-  virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const override;
-  virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const override;
-  virtual void AddStyleSheet(nsIStyleSheet* aSheet) override;
-  virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) override;
+  virtual mozilla::CSSStyleSheet* GetStyleSheetAt(int32_t aIndex) const override;
+  virtual int32_t GetIndexOfStyleSheet(mozilla::CSSStyleSheet* aSheet) const override;
+  virtual void AddStyleSheet(mozilla::CSSStyleSheet* aSheet) override;
+  virtual void RemoveStyleSheet(mozilla::CSSStyleSheet* aSheet) override;
 
-  virtual void UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
-                                 nsCOMArray<nsIStyleSheet>& aNewSheets) override;
-  virtual void AddStyleSheetToStyleSets(nsIStyleSheet* aSheet);
-  virtual void RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet);
+  virtual void UpdateStyleSheets(
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aOldSheets,
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aNewSheets) override;
+  virtual void AddStyleSheetToStyleSets(mozilla::CSSStyleSheet* aSheet);
+  virtual void RemoveStyleSheetFromStyleSets(mozilla::CSSStyleSheet* aSheet);
 
-  virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) override;
-  virtual void SetStyleSheetApplicableState(nsIStyleSheet* aSheet,
+  virtual void InsertStyleSheetAt(mozilla::CSSStyleSheet* aSheet,
+                                  int32_t aIndex) override;
+  virtual void SetStyleSheetApplicableState(mozilla::CSSStyleSheet* aSheet,
                                             bool aApplicable) override;
 
-  virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) override;
-  virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aSheet) override;
-  virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) override;
-  virtual nsIStyleSheet* FirstAdditionalAuthorSheet() override;
+  virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType,
+                                            nsIURI* aSheetURI) override;
+  virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType,
+                                           mozilla::CSSStyleSheet* aSheet) override;
+  virtual void RemoveAdditionalStyleSheet(additionalSheetType aType,
+                                          nsIURI* sheetURI) override;
+  virtual mozilla::CSSStyleSheet* FirstAdditionalAuthorSheet() override;
 
   virtual nsIChannel* GetChannel() const override {
     return mChannel;
@@ -852,11 +857,11 @@ public:
   virtual void DocumentStatesChanged(
                  mozilla::EventStates aStateMask) override;
 
-  virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleChanged(mozilla::CSSStyleSheet* aStyleSheet,
                                 mozilla::css::Rule* aStyleRule) override;
-  virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleAdded(mozilla::CSSStyleSheet* aStyleSheet,
                               mozilla::css::Rule* aStyleRule) override;
-  virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleRemoved(mozilla::CSSStyleSheet* aStyleSheet,
                                 mozilla::css::Rule* aStyleRule) override;
 
   virtual void FlushPendingNotifications(mozFlushType aType) override;
@@ -1483,8 +1488,9 @@ protected:
                                                nsStyleSet* aStyleSet);
 
   void RemoveDocStyleSheetsFromStyleSets();
-  void RemoveStyleSheetsFromStyleSets(nsCOMArray<nsIStyleSheet>& aSheets, 
-                                      mozilla::SheetType aType);
+  void RemoveStyleSheetsFromStyleSets(
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets,
+      mozilla::SheetType aType);
   void ResetStylesheetsToURI(nsIURI* aURI);
   void FillStyleSet(nsStyleSet* aStyleSet);
 
@@ -1532,9 +1538,9 @@ protected:
   // EndLoad() has already happened.
   nsWeakPtr mWeakSink;
 
-  nsCOMArray<nsIStyleSheet> mStyleSheets;
-  nsCOMArray<nsIStyleSheet> mOnDemandBuiltInUASheets;
-  nsCOMArray<nsIStyleSheet> mAdditionalSheets[AdditionalSheetTypeCount];
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>> mStyleSheets;
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>> mOnDemandBuiltInUASheets;
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>> mAdditionalSheets[AdditionalSheetTypeCount];
 
   // Array of observers
   nsTObserverArray<nsIDocumentObserver*> mObservers;
@@ -1713,8 +1719,8 @@ private:
   friend class nsUnblockOnloadEvent;
   // Recomputes the visibility state but doesn't set the new value.
   mozilla::dom::VisibilityState GetVisibilityState() const;
-  void NotifyStyleSheetAdded(nsIStyleSheet* aSheet, bool aDocumentSheet);
-  void NotifyStyleSheetRemoved(nsIStyleSheet* aSheet, bool aDocumentSheet);
+  void NotifyStyleSheetAdded(mozilla::CSSStyleSheet* aSheet, bool aDocumentSheet);
+  void NotifyStyleSheetRemoved(mozilla::CSSStyleSheet* aSheet, bool aDocumentSheet);
 
   void PostUnblockOnloadEvent();
   void DoUnblockOnload();
diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index 5a28e9e4b0..d493932218 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -73,7 +73,6 @@ class nsIRequest;
 class nsIRunnable;
 class nsIStreamListener;
 class nsIStructuredCloneContainer;
-class nsIStyleSheet;
 class nsIURI;
 class nsIVariant;
 class nsLocation;
@@ -946,7 +945,7 @@ public:
    * @return the stylesheet at aIndex.  Null if aIndex is out of range.
    * @throws no exceptions
    */
-  virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const = 0;
+  virtual mozilla::CSSStyleSheet* GetStyleSheetAt(int32_t aIndex) const = 0;
 
   /**
    * Insert a sheet at a particular spot in the stylesheet list (zero-based)
@@ -955,7 +954,8 @@ public:
    *   adjusted for the "special" sheets.
    * @throws no exceptions
    */
-  virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) = 0;
+  virtual void InsertStyleSheetAt(mozilla::CSSStyleSheet* aSheet,
+                                  int32_t aIndex) = 0;
 
   /**
    * Get the index of a particular stylesheet.  This will _always_
@@ -963,7 +963,7 @@ public:
    * @param aSheet the sheet to get the index of
    * @return aIndex the index of the sheet in the full list
    */
-  virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const = 0;
+  virtual int32_t GetIndexOfStyleSheet(mozilla::CSSStyleSheet* aSheet) const = 0;
 
   /**
    * Replace the stylesheets in aOldSheets with the stylesheets in
@@ -973,24 +973,25 @@ public:
    * may be null; if so the corresponding sheets in the first list
    * will simply be removed.
    */
-  virtual void UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
-                                 nsCOMArray<nsIStyleSheet>& aNewSheets) = 0;
+  virtual void UpdateStyleSheets(
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aOldSheets,
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aNewSheets) = 0;
 
   /**
    * Add a stylesheet to the document
    */
-  virtual void AddStyleSheet(nsIStyleSheet* aSheet) = 0;
+  virtual void AddStyleSheet(mozilla::CSSStyleSheet* aSheet) = 0;
 
   /**
    * Remove a stylesheet from the document
    */
-  virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) = 0;
+  virtual void RemoveStyleSheet(mozilla::CSSStyleSheet* aSheet) = 0;
 
   /**
    * Notify the document that the applicable state of the sheet changed
    * and that observers should be notified and style sets updated
    */
-  virtual void SetStyleSheetApplicableState(nsIStyleSheet* aSheet,
+  virtual void SetStyleSheetApplicableState(mozilla::CSSStyleSheet* aSheet,
                                             bool aApplicable) = 0;
 
   enum additionalSheetType {
@@ -1000,10 +1001,13 @@ public:
     AdditionalSheetTypeCount
   };
 
-  virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) = 0;
-  virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aSheet) = 0;
-  virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) = 0;
-  virtual nsIStyleSheet* FirstAdditionalAuthorSheet() = 0;
+  virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType,
+                                            nsIURI* aSheetURI) = 0;
+  virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType,
+                                           mozilla::CSSStyleSheet* aSheet) = 0;
+  virtual void RemoveAdditionalStyleSheet(additionalSheetType aType,
+                                          nsIURI* sheetURI) = 0;
+  virtual mozilla::CSSStyleSheet* FirstAdditionalAuthorSheet() = 0;
 
   /**
    * Get this document's CSSLoader.  This is guaranteed to not return null.
@@ -1306,11 +1310,11 @@ public:
 
   // Observation hooks for style data to propagate notifications
   // to document observers
-  virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleChanged(mozilla::CSSStyleSheet* aStyleSheet,
                                 mozilla::css::Rule* aStyleRule) = 0;
-  virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleAdded(mozilla::CSSStyleSheet* aStyleSheet,
                               mozilla::css::Rule* aStyleRule) = 0;
-  virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet,
+  virtual void StyleRuleRemoved(mozilla::CSSStyleSheet* aStyleSheet,
                                 mozilla::css::Rule* aStyleRule) = 0;
 
   /**
diff --git a/dom/base/nsIDocumentObserver.h b/dom/base/nsIDocumentObserver.h
index 9814ad7865..5d6d2542a2 100644
--- a/dom/base/nsIDocumentObserver.h
+++ b/dom/base/nsIDocumentObserver.h
@@ -11,10 +11,10 @@
 #include "nsIMutationObserver.h"
 
 class nsIContent;
-class nsIStyleSheet;
 class nsIDocument;
 
 namespace mozilla {
+class CSSStyleSheet;
 namespace css {
 class Rule;
 } // namespace css
@@ -100,7 +100,7 @@ public:
    * @param aDocumentSheet True if sheet is in document's style sheet list,
    *                       false if sheet is not (i.e., UA or user sheet)
    */
-  virtual void StyleSheetAdded(nsIStyleSheet* aStyleSheet,
+  virtual void StyleSheetAdded(mozilla::CSSStyleSheet* aStyleSheet,
                                bool aDocumentSheet) = 0;
 
   /**
@@ -113,7 +113,7 @@ public:
    * @param aDocumentSheet True if sheet is in document's style sheet list,
    *                       false if sheet is not (i.e., UA or user sheet)
    */
-  virtual void StyleSheetRemoved(nsIStyleSheet* aStyleSheet,
+  virtual void StyleSheetRemoved(mozilla::CSSStyleSheet* aStyleSheet,
                                  bool aDocumentSheet) = 0;
   
   /**
@@ -125,7 +125,7 @@ public:
    *
    * @param aStyleSheet the StyleSheet that has changed state
    */
-  virtual void StyleSheetApplicableStateChanged(nsIStyleSheet* aStyleSheet) = 0;
+  virtual void StyleSheetApplicableStateChanged(mozilla::CSSStyleSheet* aStyleSheet) = 0;
 
   /**
    * A StyleRule has just been modified within a style sheet.
@@ -136,7 +136,7 @@ public:
    *
    * @param aStyleSheet the StyleSheet that contians the rule
    */
-  virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet) = 0;
+  virtual void StyleRuleChanged(mozilla::CSSStyleSheet* aStyleSheet) = 0;
 
   /**
    * A StyleRule has just been added to a style sheet.
@@ -147,7 +147,7 @@ public:
    *
    * @param aStyleSheet the StyleSheet that has been modified
    */
-  virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet) = 0;
+  virtual void StyleRuleAdded(mozilla::CSSStyleSheet* aStyleSheet) = 0;
 
   /**
    * A StyleRule has just been removed from a style sheet.
@@ -158,7 +158,7 @@ public:
    *
    * @param aStyleSheet the StyleSheet that has been modified
    */
-  virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet) = 0;
+  virtual void StyleRuleRemoved(mozilla::CSSStyleSheet* aStyleSheet) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentObserver, NS_IDOCUMENT_OBSERVER_IID)
@@ -186,24 +186,25 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentObserver, NS_IDOCUMENT_OBSERVER_IID)
                                        mozilla::EventStates aStateMask) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETADDED                          \
-    virtual void StyleSheetAdded(nsIStyleSheet* aStyleSheet,                 \
+    virtual void StyleSheetAdded(mozilla::CSSStyleSheet* aStyleSheet,        \
                                  bool aDocumentSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETREMOVED                        \
-    virtual void StyleSheetRemoved(nsIStyleSheet* aStyleSheet,               \
+    virtual void StyleSheetRemoved(mozilla::CSSStyleSheet* aStyleSheet,      \
                                    bool aDocumentSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETAPPLICABLESTATECHANGED         \
-    virtual void StyleSheetApplicableStateChanged(nsIStyleSheet* aStyleSheet) override;
+    virtual void StyleSheetApplicableStateChanged(                           \
+        mozilla::CSSStyleSheet* aStyleSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULECHANGED                         \
-    virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet) override;
+    virtual void StyleRuleChanged(mozilla::CSSStyleSheet* aStyleSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULEADDED                           \
-    virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet) override;
+    virtual void StyleRuleAdded(mozilla::CSSStyleSheet* aStyleSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULEREMOVED                         \
-    virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet) override;
+    virtual void StyleRuleRemoved(mozilla::CSSStyleSheet* aStyleSheet) override;
 
 #define NS_DECL_NSIDOCUMENTOBSERVER                                          \
     NS_DECL_NSIDOCUMENTOBSERVER_BEGINUPDATE                                  \
@@ -261,29 +262,29 @@ NS_IMPL_NSIMUTATIONOBSERVER_CONTENT(_class)
 
 #define NS_IMPL_NSIDOCUMENTOBSERVER_STYLE_STUB(_class)                    \
 void                                                                      \
-_class::StyleSheetAdded(nsIStyleSheet* aStyleSheet,                       \
+_class::StyleSheetAdded(mozilla::CSSStyleSheet* aStyleSheet,              \
                         bool aDocumentSheet)                              \
 {                                                                         \
 }                                                                         \
 void                                                                      \
-_class::StyleSheetRemoved(nsIStyleSheet* aStyleSheet,                     \
+_class::StyleSheetRemoved(mozilla::CSSStyleSheet* aStyleSheet,            \
                           bool aDocumentSheet)                            \
 {                                                                         \
 }                                                                         \
 void                                                                      \
-_class::StyleSheetApplicableStateChanged(nsIStyleSheet* aStyleSheet)      \
+_class::StyleSheetApplicableStateChanged(mozilla::CSSStyleSheet* aStyleSheet) \
 {                                                                         \
 }                                                                         \
 void                                                                      \
-_class::StyleRuleChanged(nsIStyleSheet* aStyleSheet)                      \
+_class::StyleRuleChanged(mozilla::CSSStyleSheet* aStyleSheet)             \
 {                                                                         \
 }                                                                         \
 void                                                                      \
-_class::StyleRuleAdded(nsIStyleSheet* aStyleSheet)                        \
+_class::StyleRuleAdded(mozilla::CSSStyleSheet* aStyleSheet)               \
 {                                                                         \
 }                                                                         \
 void                                                                      \
-_class::StyleRuleRemoved(nsIStyleSheet* aStyleSheet)                      \
+_class::StyleRuleRemoved(mozilla::CSSStyleSheet* aStyleSheet)             \
 {                                                                         \
 }
 
diff --git a/dom/base/nsStyleLinkElement.cpp b/dom/base/nsStyleLinkElement.cpp
index efd0809a6d..56fc539ef3 100644
--- a/dom/base/nsStyleLinkElement.cpp
+++ b/dom/base/nsStyleLinkElement.cpp
@@ -285,17 +285,6 @@ UpdateIsElementInStyleScopeFlagOnSubtree(Element* aElement)
   }
 }
 
-static Element*
-GetScopeElement(nsIStyleSheet* aSheet)
-{
-  RefPtr<CSSStyleSheet> cssStyleSheet = do_QueryObject(aSheet);
-  if (!cssStyleSheet) {
-    return nullptr;
-  }
-
-  return cssStyleSheet->GetScopeElement();
-}
-
 nsresult
 nsStyleLinkElement::DoUpdateStyleSheet(nsIDocument* aOldDocument,
                                        ShadowRoot* aOldShadowRoot,
@@ -327,7 +316,8 @@ nsStyleLinkElement::DoUpdateStyleSheet(nsIDocument* aOldDocument,
     return NS_OK;
   }
 
-  Element* oldScopeElement = GetScopeElement(mStyleSheet);
+  Element* oldScopeElement =
+    mStyleSheet ? mStyleSheet->GetScopeElement() : nullptr;
 
   if (mStyleSheet && (aOldDocument || aOldShadowRoot)) {
     MOZ_ASSERT(!(aOldDocument && aOldShadowRoot),
diff --git a/dom/base/test/browser.ini b/dom/base/test/browser.ini
index ad4958f6ff..64a31e34f6 100644
--- a/dom/base/test/browser.ini
+++ b/dom/base/test/browser.ini
@@ -26,3 +26,5 @@ skip-if = true # Intermittent failures - bug 987493. Restore the skip-if above o
 [browser_bug1058164.js]
 skip-if = e10s # We need bug 918634 to land before this can be tested with e10s.
 [browser_use_counters.js]
+[browser_bug1238440.js]
+skip-if = e10s
diff --git a/dom/base/test/browser_bug1238440.js b/dom/base/test/browser_bug1238440.js
new file mode 100644
index 0000000000..cdafe29f15
--- /dev/null
+++ b/dom/base/test/browser_bug1238440.js
@@ -0,0 +1,76 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+Components.utils.import("resource://gre/modules/NetUtil.jsm");
+Components.utils.import("resource://gre/modules/FileUtils.jsm");
+
+waitForExplicitFinish();
+
+const PAGE = "data:text/html,<html><body><input type=\"file\"/></body></html>";
+
+function writeFile(file, text) {
+  return new Promise((resolve) => {
+    let converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+                              .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+    converter.charset = "UTF-8";
+
+    let ostream = FileUtils.openSafeFileOutputStream(file);
+    let istream = converter.convertToInputStream(text);
+    NetUtil.asyncCopy(istream, ostream, function(status) {
+      if (!Components.isSuccessCode(status)) throw 'fail';
+      resolve();
+    });
+  });
+}
+
+function runFileReader(input, status) {
+  return new Promise((resolve) => {
+    let fr = new FileReader();
+    fr.onload = function() {
+      ok(status, "FileReader called onload");
+      resolve();
+    }
+
+    fr.onerror = function(e) {
+      e.preventDefault();
+      ok(!status, "FileReader called onerror");
+      resolve();
+    }
+
+    fr.readAsArrayBuffer(input);
+  });
+}
+
+add_task(function() {
+  info("Creating a temporary file...");
+  let file = FileUtils.getFile("TmpD", ["bug1238440.txt"]);
+  yield writeFile(file, "hello world");
+
+  info("Opening a tab...");
+  let tab = gBrowser.addTab(PAGE);
+  gBrowser.selectedTab = tab;
+  let browser = tab.linkedBrowser;
+  yield BrowserTestUtils.browserLoaded(browser);
+
+  info("Populating the form...");
+  let doc = browser.contentDocument;
+  let input = doc.querySelector('input');
+  input.value = file.path;
+
+  info("Running the FileReader...");
+  yield runFileReader(input.files[0], true);
+
+  info("Writing the temporary file again...");
+  yield writeFile(file, "hello world-----------------------------");
+
+  info("Running the FileReader again...");
+  yield runFileReader(input.files[0], false);
+
+  info("Closing the tab...");
+  gBrowser.removeTab(gBrowser.selectedTab);
+
+  ok(true, "we didn't crash.");
+});
diff --git a/dom/base/test/fileutils.js b/dom/base/test/fileutils.js
index ecfc801b86..25f6118b26 100644
--- a/dom/base/test/fileutils.js
+++ b/dom/base/test/fileutils.js
@@ -127,23 +127,6 @@ function testHasRun() {
   }
 }
 
-function createFileWithData(fileData) {
-  var dirSvc = SpecialPowers.Cc["@mozilla.org/file/directory_service;1"].getService(SpecialPowers.Ci.nsIProperties);
-  var testFile = dirSvc.get("ProfD", SpecialPowers.Ci.nsIFile);
-  testFile.append("fileAPItestfile2-" + fileNum);
-  fileNum++;
-  var outStream = SpecialPowers.Cc["@mozilla.org/network/file-output-stream;1"].createInstance(SpecialPowers.Ci.nsIFileOutputStream);
-  outStream.init(testFile, 0x02 | 0x08 | 0x20, // write, create, truncate
-                 0666, 0);
-  outStream.write(fileData, fileData.length);
-  outStream.close();
-
-  var fileList = document.getElementById('fileList');
-  SpecialPowers.wrap(fileList).value = testFile.path;
-
-  return fileList.files[0];
-}
-
 function gc() {
   window.QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
         .getInterface(SpecialPowers.Ci.nsIDOMWindowUtils)
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 32a7ffc350..24987fdc11 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -513,7 +513,6 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
 [test_bug433533.html]
 [test_bug433662.html]
 [test_bug435425.html]
-[test_bug438519.html]
 [test_bug444030.xhtml]
 [test_bug444322.html]
 [test_bug444722.html]
@@ -732,7 +731,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183
 [test_encodeToStringWithMaxLength.html]
 [test_fileapi.html]
 [test_fileapi_slice.html]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' || e10s #bug 775227
+skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 775227
 [test_getElementById.html]
 [test_html_colors_quirks.html]
 [test_html_colors_standards.html]
diff --git a/dom/base/test/test_bug438519.html b/dom/base/test/test_bug438519.html
deleted file mode 100644
index 35508b1a69..0000000000
--- a/dom/base/test/test_bug438519.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=438519
--->
-<head>
-  <title>Test for Bug 438519</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="doTest()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=438519">Mozilla Bug 438519</a>
-<p id="display"></p>
-<div id="content" style="display:none">
-
-<iframe id="empty" src="data:text/xml,<!DOCTYPE HTML []><html></html>"></iframe>
-<iframe id="missing" src="data:text/xml,<!DOCTYPE HTML><html></html>"></iframe>
-<iframe id="entity" src="data:text/xml,<!DOCTYPE HTML [ <!ENTITY foo 'foo'> ]><html></html>"></iframe>
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 218236 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function doTest() {
-  function checkInternalSubset(id, expected) {
-    var e = document.getElementById(id);
-    is(e.contentDocument.doctype.internalSubset, expected, "checking '" + id + "'");
-  }
-
-  checkInternalSubset("empty", "");
-  checkInternalSubset("missing", null);
-  checkInternalSubset("entity", " <!ENTITY foo 'foo'> ");
-  SimpleTest.finish();
-}
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/dom/base/test/test_createHTMLDocument.html b/dom/base/test/test_createHTMLDocument.html
index 14749a2df8..66b090d189 100644
--- a/dom/base/test/test_createHTMLDocument.html
+++ b/dom/base/test/test_createHTMLDocument.html
@@ -24,7 +24,6 @@ function checkDoc(title, expectedtitle, normalizedtitle) {
   is(doc.doctype.name, "html");
   is(doc.doctype.publicId, "");
   is(doc.doctype.systemId, "");
-  is(doc.doctype.internalSubset, null, "internalSubset should be null!");
   isElement(doc.documentElement, "html");
   isElement(doc.documentElement.firstChild, "head");
   if (title !== undefined) {
@@ -38,8 +37,7 @@ function checkDoc(title, expectedtitle, normalizedtitle) {
   }
   isElement(doc.documentElement.lastChild, "body");
   is(doc.documentElement.lastChild.childNodes.length, 0);
-  ((!title || title.indexOf("\f") === -1) ? is : todo_is)
-    (doc.title, normalizedtitle);
+  is(doc.title, normalizedtitle);
   doc.body.innerHTML = "foo";
   is(doc.body.innerHTML, "foo", "innerHTML should work in HTML data documents!");
 }
diff --git a/dom/base/test/test_fileapi_slice.html b/dom/base/test/test_fileapi_slice.html
index 581f3dae6f..efe4aa2592 100644
--- a/dom/base/test/test_fileapi_slice.html
+++ b/dom/base/test/test_fileapi_slice.html
@@ -54,31 +54,6 @@ cx.fill();
 cx.closePath();
 
 
-var fileData =
-  atob(cx.canvas.toDataURL("image/png").substring("data:text/png;base64,".length + 1));
-var memFile = cx.canvas.mozGetAsFile("image/png");
-var fileFile = createFileWithData(fileData);
-var size = fileData.length;
-
-// This might fail if we dramatically improve the png encoder. If that happens
-// please increase the complexity or size of the image generated above to ensure
-// that we're testing with files that are large enough.
-ok(size > 65536, "test data sufficiently large");
-
-
-// Test that basic properties work
-testSlice(memFile, size, "image/png", fileData, "memFile");
-testSlice(fileFile, size, "", fileData, "fileFile");
-
-
-// Try loading directly from slice into an image
-var testBinaryData = "";
-for (var i = 0; i < 256; i++) {
-  testBinaryData += String.fromCharCode(i);
-}
-while (testBinaryData.length < 20000) {
-  testBinaryData += testBinaryData;
-}
 function imageLoadHandler(event) {
   var origcanvas = $("canvas");
   var testcanvas = $("testcanvas");
@@ -100,37 +75,93 @@ function imageLoadHandler(event) {
   testHasRun();
 }
 
-// image in the middle
-var imgfile = createFileWithData(testBinaryData + fileData + testBinaryData);
-is(imgfile.size, size + testBinaryData.length * 2, "correct file size (middle)");
-var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size));
-img.onload = imageLoadHandler;
-expectedTestCount++;
+var fileData =
+  atob(cx.canvas.toDataURL("image/png").substring("data:text/png;base64,".length + 1));
+var size = fileData.length;
+var testBinaryData = "";
 
-// image at start
-var imgfile = createFileWithData(fileData + testBinaryData);
-is(imgfile.size, size + testBinaryData.length, "correct file size (start)");
-var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(0, size));
-img.onload = imageLoadHandler;
-expectedTestCount++;
+// This might fail if we dramatically improve the png encoder. If that happens
+// please increase the complexity or size of the image generated above to ensure
+// that we're testing with files that are large enough.
+ok(size > 65536, "test data sufficiently large");
 
-// image at end
-var imgfile = createFileWithData(testBinaryData + fileData);
-is(imgfile.size, size + testBinaryData.length, "correct file size (end)");
-var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size));
-img.onload = imageLoadHandler;
-expectedTestCount++;
+SpecialPowers.createFiles([{name: "basicTestFile", data: fileData}],
+                          basicTest);
+
+function basicTest(files) {
+  var fileFile = files[0];
+
+  // Test that basic properties work
+  var memFile = cx.canvas.mozGetAsFile("image/png");
+  testSlice(memFile, size, "image/png", fileData, "memFile");
+  testSlice(fileFile, size, "", fileData, "fileFile");
+
+  // Try loading directly from slice into an image
+  for (var i = 0; i < 256; i++) {
+    testBinaryData += String.fromCharCode(i);
+  }
+  while (testBinaryData.length < 20000) {
+    testBinaryData += testBinaryData;
+  }
+
+  // image in the middle
+  SpecialPowers.createFiles([{name: "middleTestFile",
+                             data: testBinaryData + fileData + testBinaryData}],
+                            imageMiddleTest);
+}
+
+function imageMiddleTest(files) {
+  var imgfile = files[0];
+  is(imgfile.size, size + testBinaryData.length * 2, "correct file size (middle)");
+  var img = new Image;
+  img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size));
+  img.onload = imageLoadHandler;
+  expectedTestCount++;
+
+  // image at start
+  SpecialPowers.createFiles([{name: "startTestFile",
+                             data: fileData + testBinaryData}],
+                            imageStartTest);
+}
+
+function imageStartTest(files) {
+  var imgfile = files[0];
+  is(imgfile.size, size + testBinaryData.length, "correct file size (start)");
+  var img = new Image;
+  img.src = URL.createObjectURL(imgfile.slice(0, size));
+  img.onload = imageLoadHandler;
+  expectedTestCount++;
+
+  // image at end
+  SpecialPowers.createFiles([{name: "endTestFile",
+                             data: testBinaryData + fileData}],
+                            imageEndTest);
+}
+
+function imageEndTest(files) {
+  var imgfile = files[0];
+  is(imgfile.size, size + testBinaryData.length, "correct file size (end)");
+  var img = new Image;
+  img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size));
+  img.onload = imageLoadHandler;
+  expectedTestCount++;
+
+  // image past end
+  SpecialPowers.createFiles([{name: "pastEndTestFile",
+                             data: testBinaryData + fileData}],
+                            imagePastEndTest);
+}
+
+function imagePastEndTest(files) {
+  var imgfile = files[0];
+  is(imgfile.size, size + testBinaryData.length, "correct file size (past end)");
+  var img = new Image;
+  img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size + 1000));
+  img.onload = imageLoadHandler;
+  expectedTestCount++;
+}
 
-// image past end
-var imgfile = createFileWithData(testBinaryData + fileData);
-is(imgfile.size, size + testBinaryData.length, "correct file size (past end)");
-var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, testBinaryData.length + size + 1000));
-img.onload = imageLoadHandler;
-expectedTestCount++;
 </script>
 </pre>
-</body> </html>
+</body>
+</html>
diff --git a/dom/bindings/Errors.msg b/dom/bindings/Errors.msg
index 92c725dc62..54da8ba66d 100644
--- a/dom/bindings/Errors.msg
+++ b/dom/bindings/Errors.msg
@@ -89,3 +89,4 @@ MSG_DEF(MSG_IS_NOT_PROMISE, 1, JSEXN_TYPEERR, "{0} is not a Promise")
 MSG_DEF(MSG_SW_INSTALL_ERROR, 2, JSEXN_TYPEERR, "ServiceWorker script at {0} for scope {1} encountered an error during installation.")
 MSG_DEF(MSG_SW_SCRIPT_THREW, 2, JSEXN_TYPEERR, "ServiceWorker script at {0} for scope {1} threw an exception during script evaluation.")
 MSG_DEF(MSG_TYPEDARRAY_IS_SHARED, 1, JSEXN_TYPEERR, "{0} can't be a typed array on SharedArrayBuffer")
+MSG_DEF(MSG_CACHE_ADD_FAILED_RESPONSE, 3, JSEXN_TYPEERR, "Cache got {0} response with bad status {1} while trying to add request {2}")
diff --git a/dom/bluetooth/common/webapi/BluetoothAdapter.h b/dom/bluetooth/common/webapi/BluetoothAdapter.h
index 2a90e0e8f2..5f2b7be2aa 100644
--- a/dom/bluetooth/common/webapi/BluetoothAdapter.h
+++ b/dom/bluetooth/common/webapi/BluetoothAdapter.h
@@ -75,7 +75,7 @@ public:
     return mDiscoverable;
   }
 
-  BluetoothPairingListener* PairingReqs() const
+  BluetoothPairingListener* GetPairingReqs() const
   {
     return mPairingReqs;
   }
diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js
index 5c2424e823..0e80c0f786 100644
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -75,15 +75,6 @@ const OBSERVED_EVENTS = [
   'will-launch-app'
 ];
 
-const COMMAND_MAP = {
-  'cut': 'cmd_cut',
-  'copy': 'cmd_copyAndCollapseToEnd',
-  'copyImage': 'cmd_copyImage',
-  'copyLink': 'cmd_copyLink',
-  'paste': 'cmd_paste',
-  'selectall': 'cmd_selectAll'
-};
-
 /**
  * The BrowserElementChild implements one half of <iframe mozbrowser>.
  * (The other half is, unsurprisingly, BrowserElementParent.)
@@ -269,7 +260,6 @@ BrowserElementChild.prototype = {
       "activate-next-paint-listener": this._activateNextPaintListener.bind(this),
       "set-input-method-active": this._recvSetInputMethodActive.bind(this),
       "deactivate-next-paint-listener": this._deactivateNextPaintListener.bind(this),
-      "do-command": this._recvDoCommand,
       "find-all": this._recvFindAll.bind(this),
       "find-next": this._recvFindNext.bind(this),
       "clear-match": this._recvClearMatch.bind(this),
@@ -419,15 +409,6 @@ BrowserElementChild.prototype = {
     }
   },
 
-  _isCommandEnabled: function(cmd) {
-    let command = COMMAND_MAP[cmd];
-    if (!command) {
-      return false;
-    }
-
-    return docShell.isCommandEnabled(command);
-  },
-
   /**
    * Spin in a nested event loop until we receive a unblock-modal-prompt message for
    * this window.
@@ -1187,14 +1168,16 @@ BrowserElementChild.prototype = {
   _recvFireCtxCallback: function(data) {
     debug("Received fireCtxCallback message: (" + data.json.menuitem + ")");
 
+    let doCommandIfEnabled = (command) => {
+      if (docShell.isCommandEnabled(command)) {
+        docShell.doCommand(command);
+      }
+    };
+
     if (data.json.menuitem == 'copy-image') {
-      // Set command
-      data.json.command = 'copyImage';
-      this._recvDoCommand(data);
+      doCommandIfEnabled('cmd_copyImage');
     } else if (data.json.menuitem == 'copy-link') {
-      // Set command
-      data.json.command = 'copyLink';
-      this._recvDoCommand(data);
+      doCommandIfEnabled('cmd_copyLink');
     } else if (data.json.menuitem in this._ctxHandlers) {
       this._ctxHandlers[data.json.menuitem].click();
       this._ctxHandlers = {};
@@ -1378,12 +1361,6 @@ BrowserElementChild.prototype = {
     docShell.contentViewer.fullZoom = data.json.zoom;
   },
 
-  _recvDoCommand: function(data) {
-    if (this._isCommandEnabled(data.json.command)) {
-      docShell.doCommand(COMMAND_MAP[data.json.command]);
-    }
-  },
-
   _recvGetAudioChannelVolume: function(data) {
     debug("Received getAudioChannelVolume message: (" + data.json.id + ")");
 
@@ -1871,6 +1848,7 @@ BrowserElementChild.prototype = {
           case Cr.NS_BINDING_ABORTED :
             // Ignoring NS_BINDING_ABORTED, which is set when loading page is
             // stopped.
+          case Cr.NS_ERROR_PARSED_DATA_CACHED:
             return;
 
           // TODO See nsDocShell::DisplayLoadError to see what extra
diff --git a/dom/browser-element/BrowserElementCopyPaste.js b/dom/browser-element/BrowserElementCopyPaste.js
index abf8a5f7ff..acb6085d21 100644
--- a/dom/browser-element/BrowserElementCopyPaste.js
+++ b/dom/browser-element/BrowserElementCopyPaste.js
@@ -30,7 +30,7 @@ var CopyPasteAssistent = {
     switch (e.data.msg_name) {
       case 'copypaste-do-command':
         if (this._isCommandEnabled(e.data.command)) {
-          docShell.doCommand(COMMAND_MAP[e.data.command]);
+          docShell.doCommand(this.COMMAND_MAP[e.data.command]);
         }
         break;
     }
diff --git a/dom/browser-element/BrowserElementParent.js b/dom/browser-element/BrowserElementParent.js
index 5a9c7c3cf9..8fb2f5b7b3 100644
--- a/dom/browser-element/BrowserElementParent.js
+++ b/dom/browser-element/BrowserElementParent.js
@@ -15,6 +15,7 @@ var Cr = Components.results;
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/BrowserElementPromptService.jsm");
 
@@ -262,7 +263,6 @@ function BrowserElementParent() {
 
   Services.obs.addObserver(this, 'ask-children-to-exit-fullscreen', /* ownsWeak = */ true);
   Services.obs.addObserver(this, 'oop-frameloader-crashed', /* ownsWeak = */ true);
-  Services.obs.addObserver(this, 'copypaste-docommand', /* ownsWeak = */ true);
   Services.obs.addObserver(this, 'ask-children-to-execute-copypaste-command', /* ownsWeak = */ true);
   Services.obs.addObserver(this, 'back-docommand', /* ownsWeak = */ true);
 
@@ -470,6 +470,7 @@ BrowserElementParent.prototype = {
     /* username and password */
     let detail = {
       host:     authDetail.host,
+      path:     authDetail.path,
       realm:    authDetail.realm,
       isProxy:  authDetail.isProxy
     };
@@ -1008,36 +1009,17 @@ BrowserElementParent.prototype = {
                                              Ci.nsIRequestObserver])
     };
 
-    // If we have a URI we'll use it to get the triggering principal to use,
-    // if not available a null principal is acceptable.
-    let referrer = null;
-    let principal = null;
-    if (_options.referrer) {
-      // newURI can throw on malformed URIs.
-      try {
-        referrer = Services.io.newURI(_options.referrer, null, null);
-      }
-      catch(e) {
-        debug('Malformed referrer -- ' + e);
-      }
+    let referrer = Services.io.newURI(_options.referrer, null, null);
+    let principal =
+      Services.scriptSecurityManager.createCodebasePrincipal(
+        referrer, this._frameLoader.loadContext.originAttributes);
 
-      // This simply returns null if there is no principal available
-      // for the requested uri. This is an acceptable fallback when
-      // calling newChannelFromURI2.
-      principal =
-        Services.scriptSecurityManager.createCodebasePrincipal(
-          referrer, this._frameLoader.loadContext.originAttributes);
-    }
-
-    debug('Using principal? ' + !!principal);
-
-    let channel =
-      Services.io.newChannelFromURI2(url,
-                                     null,       // No document.
-                                     principal,  // Loading principal
-                                     principal,  // Triggering principal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = NetUtil.newChannel({
+      uri: url,
+      loadingPrincipal: principal,
+      securityFlags: SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER
+    });
 
     // XXX We would set private browsing information prior to calling this.
     channel.notificationCallbacks = interfaceRequestor;
@@ -1062,7 +1044,7 @@ BrowserElementParent.prototype = {
     }
 
     // Set-up complete, let's get things started.
-    channel.asyncOpen(new DownloadListener(), null);
+    channel.asyncOpen2(new DownloadListener());
 
     return req;
   },
@@ -1292,11 +1274,6 @@ BrowserElementParent.prototype = {
         this._sendAsyncMsg('exit-fullscreen');
       }
       break;
-    case 'copypaste-docommand':
-      if (this._isAlive() && this._frameElement.isEqualNode(subject.wrappedJSObject)) {
-        this._sendAsyncMsg('do-command', { command: data });
-      }
-      break;
     case 'ask-children-to-execute-copypaste-command':
       if (this._isAlive() && this._frameElement == subject.wrappedJSObject) {
         this._sendAsyncMsg('copypaste-do-command', { command: data });
diff --git a/dom/browser-element/BrowserElementPromptService.jsm b/dom/browser-element/BrowserElementPromptService.jsm
index a70ee28f89..a6a41fe5d2 100644
--- a/dom/browser-element/BrowserElementPromptService.jsm
+++ b/dom/browser-element/BrowserElementPromptService.jsm
@@ -381,6 +381,7 @@ BrowserElementAuthPrompt.prototype = {
     let [hostname, httpRealm] = this._getAuthTarget(channel, authInfo);
     return {
       host:             hostname,
+      path:             channel.URI.path,
       realm:            httpRealm,
       username:         authInfo.username,
       isProxy:          !!(authInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY),
diff --git a/dom/browser-element/mochitest/browserElement_Auth.js b/dom/browser-element/mochitest/browserElement_Auth.js
index 9298987867..4925a3e0f7 100644
--- a/dom/browser-element/mochitest/browserElement_Auth.js
+++ b/dom/browser-element/mochitest/browserElement_Auth.js
@@ -49,6 +49,9 @@ function testHttpAuthCancel(e) {
 
   is(e.detail.realm, 'http_realm', 'expected realm matches');
   is(e.detail.host, 'http://test', 'expected host matches');
+  is(e.detail.path,
+     '/tests/dom/browser-element/mochitest/file_http_401_response.sjs',
+     'expected path matches');
   e.preventDefault();
 
   SimpleTest.executeSoon(function() {
@@ -71,6 +74,9 @@ function testHttpAuth(e) {
 
   is(e.detail.realm, 'http_realm', 'expected realm matches');
   is(e.detail.host, 'http://test', 'expected host matches');
+  is(e.detail.path,
+     '/tests/dom/browser-element/mochitest/file_http_401_response.sjs',
+     'expected path matches');
   is(e.detail.isProxy, false, 'expected isProxy is false');
   e.preventDefault();
 
@@ -98,6 +104,9 @@ function testProxyAuth(e) {
 
     is(e.detail.realm, 'http_realm', 'expected realm matches');
     is(e.detail.host, mozproxy, 'expected host matches');
+    is(e.detail.path,
+       '/tests/dom/browser-element/mochitest/file_http_407_response.sjs',
+       'expected path matches');
     is(e.detail.isProxy, true, 'expected isProxy is true');
     e.preventDefault();
 
diff --git a/dom/browser-element/mochitest/browserElement_CopyPaste.js b/dom/browser-element/mochitest/browserElement_CopyPaste.js
index 20d505d912..d357b26ba8 100644
--- a/dom/browser-element/mochitest/browserElement_CopyPaste.js
+++ b/dom/browser-element/mochitest/browserElement_CopyPaste.js
@@ -86,8 +86,14 @@ function runTest() {
 }
 
 function doCommand(cmd) {
-  Services.obs.notifyObservers({wrappedJSObject: SpecialPowers.unwrap(iframeInner)},
-                               'copypaste-docommand', cmd);
+  var COMMAND_MAP = {
+    'cut': 'cmd_cut',
+    'copy': 'cmd_copyAndCollapseToEnd',
+    'paste': 'cmd_paste',
+    'selectall': 'cmd_selectAll'
+  };
+  var script = 'data:,docShell.doCommand("' + COMMAND_MAP[cmd] + '");';
+  mm.loadFrameScript(script, false);
 }
 
 function dispatchTest(e) {
diff --git a/dom/browser-element/mochitest/browserElement_SetInputMethodActive.js b/dom/browser-element/mochitest/browserElement_SetInputMethodActive.js
index e88d7bde44..d4bfa0aabf 100644
--- a/dom/browser-element/mochitest/browserElement_SetInputMethodActive.js
+++ b/dom/browser-element/mochitest/browserElement_SetInputMethodActive.js
@@ -9,6 +9,27 @@ SimpleTest.waitForExplicitFinish();
 browserElementTestHelpers.setEnabledPref(true);
 browserElementTestHelpers.addPermission();
 
+// We'll need to get the appId from the current document,
+// it's either SpecialPowers.Ci.nsIScriptSecurityManager.NO_APP_ID when
+// we are not running inside an app (e.g. Firefox Desktop),
+// or the appId of Mochitest app when we are running inside that app
+// (e.g. Emulator).
+var currentAppId = SpecialPowers.wrap(document).nodePrincipal.appId;
+var inApp =
+  currentAppId !== SpecialPowers.Ci.nsIScriptSecurityManager.NO_APP_ID;
+// We will also need the manifest URL and set it on iframes.
+var currentAppManifestURL;
+
+if (inApp) {
+  let appsService = SpecialPowers.Cc["@mozilla.org/AppsService;1"]
+                      .getService(SpecialPowers.Ci.nsIAppsService);
+
+  currentAppManifestURL = appsService.getManifestURLByLocalId(currentAppId);
+};
+
+info('appId=' + currentAppId);
+info('manifestURL=' + currentAppManifestURL);
+
 function setup() {
   let appInfo = SpecialPowers.Cc['@mozilla.org/xre/app-info;1']
                 .getService(SpecialPowers.Ci.nsIXULAppInfo);
@@ -27,110 +48,134 @@ function tearDown() {
 }
 
 function runTest() {
-  let path = location.pathname;
-  let imeUrl = location.protocol + '//' + location.host +
-               path.substring(0, path.lastIndexOf('/')) +
-               '/file_inputmethod.html';
-  SpecialPowers.pushPermissions([{
-    type: 'input',
-    allow: true,
-    context: {
-      url: imeUrl,
-      originAttributes: {inBrowser: true}
-    }
-  }], SimpleTest.waitForFocus.bind(SimpleTest, createFrames));
+  createFrames();
 }
 
-var gFrames = [];
+var gInputMethodFrames = [];
 var gInputFrame;
 
 function createFrames() {
   // Create two input method iframes.
   let loadendCount = 0;
   let countLoadend = function() {
-    if (this === gInputFrame) {
-      // The frame script running in the frame where the input is hosted.
-      let appFrameScript = function appFrameScript() {
-        let input = content.document.body.firstElementChild;
-        input.oninput = function() {
-          sendAsyncMessage('test:InputMethod:oninput', {
-            from: 'input',
-            value: this.value
-          });
-        };
-
-        input.onblur = function() {
-          // "Expected" lost of focus since the test is finished.
-          if (input.value === '#0#1hello') {
-            return;
-          }
-
-          sendAsyncMessage('test:InputMethod:oninput', {
-            from: 'input',
-            error: true,
-            value: 'Unexpected lost of focus on the input frame!'
-          });
-        };
-
-        input.focus();
-      }
-
-      // Inject frame script to receive input.
-      let mm = SpecialPowers.getBrowserFrameMessageManager(gInputFrame);
-      mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
-      mm.addMessageListener("test:InputMethod:oninput", next);
-    } else {
-      ok(this.setInputMethodActive, 'Can access setInputMethodActive.');
-
-      // The frame script running in the input method frames.
-
-      let appFrameScript = function appFrameScript() {
-        content.addEventListener("message", function(evt) {
-          sendAsyncMessage('test:InputMethod:imFrameMessage', {
-            from: 'im',
-            value: evt.data
-          });
-        });
-      }
-
-      // Inject frame script to receive message.
-      let mm = SpecialPowers.getBrowserFrameMessageManager(this);
-      mm.loadFrameScript('data:,(' + appFrameScript.toString() + ')();', false);
-      mm.addMessageListener("test:InputMethod:imFrameMessage", next);
-    }
-
     loadendCount++;
     if (loadendCount === 3) {
-      startTest();
+      setPermissions();
+     }
+   };
+
+   // Create an input field to receive string from input method iframes.
+   gInputFrame = document.createElement('iframe');
+   gInputFrame.setAttribute('mozbrowser', 'true');
+   gInputFrame.src =
+     'data:text/html,<input autofocus value="hello" />' +
+     '<p>This is targetted mozbrowser frame.</p>';
+   document.body.appendChild(gInputFrame);
+   gInputFrame.addEventListener('mozbrowserloadend', countLoadend);
+
+   for (let i = 0; i < 2; i++) {
+    let frame = gInputMethodFrames[i] = document.createElement('iframe');
+    frame.setAttribute('mozbrowser', 'true');
+    if (currentAppManifestURL) {
+      frame.setAttribute('mozapp', currentAppManifestURL);
     }
-  };
+    frame.src = 'file_empty.html#' + i;
+     document.body.appendChild(frame);
+     frame.addEventListener('mozbrowserloadend', countLoadend);
+   }
+ }
 
-  // Create an input field to receive string from input method iframes.
-  gInputFrame = document.createElement('iframe');
-  gInputFrame.setAttribute('mozbrowser', 'true');
-  gInputFrame.src =
-    'data:text/html,<input autofocus value="hello" />' +
-    '<p>This is targetted mozbrowser frame.</p>';
-  document.body.appendChild(gInputFrame);
-  gInputFrame.addEventListener('mozbrowserloadend', countLoadend);
+function setPermissions() {
+  let permissions = [{
+    type: 'input',
+    allow: true,
+    context: {
+      url: SimpleTest.getTestFileURL('/file_empty.html'),
+      originAttributes: {
+        appId: currentAppId,
+        inBrowser: true
+      }
+    }
+  }];
 
-  for (let i = 0; i < 2; i++) {
-    let frame = gFrames[i] = document.createElement('iframe');
-    gFrames[i].setAttribute('mozbrowser', 'true');
-    // When the input method iframe is activated, it will send the URL
-    // hash to current focused element. We set different hash to each
-    // iframe so that iframes can be differentiated by their hash.
-    frame.src = 'file_inputmethod.html#' + i;
-    document.body.appendChild(frame);
-    frame.addEventListener('mozbrowserloadend', countLoadend);
+  if (inApp) {
+    // The current document would also need to be given access for IPC to
+    // recognize our permission (why)?
+    permissions.push({
+      type: 'input', allow: true, context: document });
   }
+
+  SpecialPowers.pushPermissions(permissions,
+    SimpleTest.waitForFocus.bind(SimpleTest, startTest));
 }
 
-function startTest() {
-  // Set focus to the input field and wait for input methods' inputting.
-  SpecialPowers.DOMWindowUtils.focus(gInputFrame);
+ function startTest() {
+  // The frame script running in the frame where the input is hosted.
+  let appFrameScript = function appFrameScript() {
+    let input = content.document.body.firstElementChild;
+    input.oninput = function() {
+      sendAsyncMessage('test:InputMethod:oninput', {
+        from: 'input',
+        value: this.value
+      });
+    };
 
-  let req0 = gFrames[0].setInputMethodActive(true);
+    input.onblur = function() {
+      // "Expected" lost of focus since the test is finished.
+      if (input.value === '#0#1hello') {
+        return;
+      }
+
+      sendAsyncMessage('test:InputMethod:oninput', {
+        from: 'input',
+        error: true,
+        value: 'Unexpected lost of focus on the input frame!'
+      });
+    };
+
+    input.focus();
+  };
+
+  // Inject frame script to receive input.
+  let mm = SpecialPowers.getBrowserFrameMessageManager(gInputFrame);
+  mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+  mm.addMessageListener("test:InputMethod:oninput", next);
+
+  gInputMethodFrames.forEach((frame) => {
+    ok(frame.setInputMethodActive, 'Can access setInputMethodActive.');
+
+    // The frame script running in the input method frames.
+    let appFrameScript = function appFrameScript() {
+      let im = content.navigator.mozInputMethod;
+      im.oninputcontextchange = function() {
+        let ctx = im.inputcontext;
+        // Report back to parent frame on status of ctx gotten.
+        // (A setTimeout() here to ensure this always happens after
+        //  DOMRequest succeed.)
+        content.setTimeout(() => {
+          sendAsyncMessage('test:InputMethod:imFrameMessage', {
+            from: 'im',
+            value: content.location.hash + !!ctx
+          });
+        });
+
+        // If there is a context, send out the hash.
+        if (ctx) {
+          ctx.replaceSurroundingText(content.location.hash);
+        }
+      };
+    };
+
+    // Inject frame script to receive message.
+    let mm = SpecialPowers.getBrowserFrameMessageManager(frame);
+    mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+    mm.addMessageListener("test:InputMethod:imFrameMessage", next);
+  });
+
+   // Set focus to the input field and wait for input methods' inputting.
+   SpecialPowers.DOMWindowUtils.focus(gInputFrame);
+
+  let req0 = gInputMethodFrames[0].setInputMethodActive(true);
   req0.onsuccess = function() {
     ok(true, 'setInputMethodActive succeeded (0).');
   };
@@ -203,14 +248,14 @@ function next(msg) {
 
       gCount++;
 
-      let req0 = gFrames[0].setInputMethodActive(false);
+      let req0 = gInputMethodFrames[0].setInputMethodActive(false);
       req0.onsuccess = function() {
         ok(true, 'setInputMethodActive succeeded (0).');
       };
       req0.onerror = function() {
         ok(false, 'setInputMethodActive failed (0): ' + this.error.name);
       };
-      let req1 = gFrames[1].setInputMethodActive(true);
+      let req1 = gInputMethodFrames[1].setInputMethodActive(true);
       req1.onsuccess = function() {
         ok(true, 'setInputMethodActive succeeded (1).');
       };
@@ -259,7 +304,7 @@ function next(msg) {
 
       // Receive the second input from the second iframe.
       // Deactive the second iframe.
-      let req3 = gFrames[1].setInputMethodActive(false);
+      let req3 = gInputMethodFrames[1].setInputMethodActive(false);
       req3.onsuccess = function() {
         ok(true, 'setInputMethodActive(false) succeeded (2).');
       };
diff --git a/dom/browser-element/mochitest/file_inputmethod.html b/dom/browser-element/mochitest/file_inputmethod.html
deleted file mode 100644
index b20be6b00d..0000000000
--- a/dom/browser-element/mochitest/file_inputmethod.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<script>
-  var im = navigator.mozInputMethod;
-  if (im) {
-    im.oninputcontextchange = function() {
-      var ctx = im.inputcontext;
-      // Report back to parent frame on status of ctx gotten.
-      window.postMessage(window.location.hash + !!ctx, '*');
-      // If there is a context, send out the hash.
-      if (ctx) {
-        ctx.replaceSurroundingText(location.hash);
-      }
-    };
-  }
-</script>
-<p>This frame represents the input method frame.</p>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/mochitest-oop.ini b/dom/browser-element/mochitest/mochitest-oop.ini
index bdbf2c65e7..f4e239656e 100644
--- a/dom/browser-element/mochitest/mochitest-oop.ini
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@@ -75,8 +75,10 @@ skip-if = (toolkit == 'gonk') # Disabled on emulator. See bug 1144015 comment 8
 [test_browserElement_oop_PrivateBrowsing.html]
 [test_browserElement_oop_PromptCheck.html]
 [test_browserElement_oop_PromptConfirm.html]
+# Disabled on B2G Emulator because permission cannot be asserted in content process,
+# need to fix either bug 1094055 or bug 1020135.
 [test_browserElement_oop_Proxy.html]
-skip-if = (toolkit == 'gonk') # Disabled on B2G Emulator bug 1198163
+skip-if = (toolkit == 'gonk')
 [test_browserElement_oop_PurgeHistory.html]
 [test_browserElement_oop_Reload.html]
 [test_browserElement_oop_ReloadPostRequest.html]
@@ -86,7 +88,7 @@ skip-if = (toolkit == 'gonk') # Disabled on B2G Emulator bug 1198163
 skip-if = toolkit == 'android' || (toolkit == 'gonk' && !debug) #TIMED_OUT, bug 766586
 [test_browserElement_oop_SendEvent.html]
 [test_browserElement_oop_SetInputMethodActive.html]
-skip-if = (os == "android") || (toolkit == 'gonk') # Disabled on B2G Emulator bug 1198163
+skip-if = (os == "android")
 [test_browserElement_oop_SetVisible.html]
 [test_browserElement_oop_SetVisibleFrames.html]
 [test_browserElement_oop_SetVisibleFrames2.html]
diff --git a/dom/browser-element/mochitest/mochitest.ini b/dom/browser-element/mochitest/mochitest.ini
index 445d890978..2dc9cb8096 100644
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -129,12 +129,10 @@ support-files =
   file_focus.html
   file_http_401_response.sjs
   file_http_407_response.sjs
-  file_inputmethod.html
   file_microdata.html
   file_microdata_bad_itemref.html
   file_microdata_itemref.html
   file_microformats.html
-  file_inputmethod.html
   file_post_request.html
   file_wyciwyg.html
   file_audio.html
@@ -212,8 +210,10 @@ skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_PrivateBrowsing.html]
 [test_browserElement_inproc_PromptCheck.html]
 [test_browserElement_inproc_PromptConfirm.html]
+# Disabled on B2G Emulator because permission cannot be asserted in content process,
+# need to fix either bug 1094055 or bug 1020135.
 [test_browserElement_inproc_Proxy.html]
-skip-if = (toolkit == 'gonk') # Disabled on B2G Emulator bug 1198163
+skip-if = (toolkit == 'gonk')
 [test_browserElement_inproc_PurgeHistory.html]
 [test_browserElement_inproc_ReloadPostRequest.html]
 [test_browserElement_inproc_RemoveBrowserElement.html]
@@ -223,7 +223,7 @@ skip-if = toolkit == 'android' || (toolkit == 'gonk' && !debug) # android(TIMED_
 [test_browserElement_inproc_SendEvent.html]
 # The setInputMethodActive() tests will timed out on Android
 [test_browserElement_inproc_SetInputMethodActive.html]
-skip-if = (os == "android") || (toolkit == 'gonk') # Disabled on B2G Emulator bug 1198163
+skip-if = (os == "android")
 [test_browserElement_inproc_SetVisible.html]
 [test_browserElement_inproc_SetVisibleFrames.html]
 [test_browserElement_inproc_SetVisibleFrames2.html]
diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
index 3134f410ee..270b4ca8e3 100644
--- a/dom/cache/Cache.cpp
+++ b/dom/cache/Cache.cpp
@@ -158,6 +158,26 @@ public:
         return;
       }
 
+      // Do not allow the convenience methods .add()/.addAll() to store failed
+      // responses.  A consequence of this is that these methods cannot be
+      // used to store opaque or opaqueredirect responses since they always
+      // expose a 0 status value.
+      if (!response->Ok()) {
+        uint32_t t = static_cast<uint32_t>(response->Type());
+        NS_ConvertASCIItoUTF16 type(ResponseTypeValues::strings[t].value,
+                                    ResponseTypeValues::strings[t].length);
+        nsAutoString status;
+        status.AppendInt(response->Status());
+        nsAutoString url;
+        mRequestList[i]->GetUrl(url);
+        ErrorResult rv;
+        rv.ThrowTypeError<MSG_CACHE_ADD_FAILED_RESPONSE>(type, status, url);
+
+        // TODO: abort the fetch requests we have running (bug 1157434)
+        mPromise->MaybeReject(rv);
+        return;
+      }
+
       responseList.AppendElement(Move(response));
     }
 
@@ -234,6 +254,8 @@ Cache::Match(const RequestOrUSVString& aRequest,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   RefPtr<InternalRequest> ir = ToInternalRequest(aRequest, IgnoreBody, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
@@ -261,6 +283,8 @@ Cache::MatchAll(const Optional<RequestOrUSVString>& aRequest,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   CacheQueryParams params;
   ToCacheQueryParams(params, aOptions);
 
@@ -291,6 +315,8 @@ Cache::Add(JSContext* aContext, const RequestOrUSVString& aRequest,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   if (!IsValidPutRequestMethod(aRequest, aRv)) {
     return nullptr;
   }
@@ -325,6 +351,8 @@ Cache::AddAll(JSContext* aContext,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   GlobalObject global(aContext, mGlobal->GetGlobalJSObject());
   MOZ_ASSERT(!global.Failed());
 
@@ -371,6 +399,8 @@ Cache::Put(const RequestOrUSVString& aRequest, Response& aResponse,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   if (NS_WARN_IF(!IsValidPutRequestMethod(aRequest, aRv))) {
     return nullptr;
   }
@@ -400,6 +430,8 @@ Cache::Delete(const RequestOrUSVString& aRequest,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   RefPtr<InternalRequest> ir = ToInternalRequest(aRequest, IgnoreBody, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
@@ -427,6 +459,8 @@ Cache::Keys(const Optional<RequestOrUSVString>& aRequest,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   CacheQueryParams params;
   ToCacheQueryParams(params, aOptions);
 
@@ -529,6 +563,8 @@ Cache::~Cache()
 already_AddRefed<Promise>
 Cache::ExecuteOp(AutoChildOpArgs& aOpArgs, ErrorResult& aRv)
 {
+  MOZ_ASSERT(mActor);
+
   RefPtr<Promise> promise = Promise::Create(mGlobal, aRv);
   if (NS_WARN_IF(!promise)) {
     return nullptr;
@@ -603,6 +639,8 @@ Cache::PutAll(const nsTArray<RefPtr<Request>>& aRequestList,
     return nullptr;
   }
 
+  CacheChild::AutoLock actorLock(mActor);
+
   AutoChildOpArgs args(this, CachePutAllArgs());
 
   for (uint32_t i = 0; i < aRequestList.Length(); ++i) {
diff --git a/dom/cache/CacheChild.cpp b/dom/cache/CacheChild.cpp
index 20ee44f1a8..28c7de5419 100644
--- a/dom/cache/CacheChild.cpp
+++ b/dom/cache/CacheChild.cpp
@@ -34,6 +34,7 @@ CacheChild::CacheChild()
   : mListener(nullptr)
   , mNumChildActors(0)
   , mDelayedDestroy(false)
+  , mLocked(false)
 {
   MOZ_COUNT_CTOR(cache::CacheChild);
 }
@@ -44,6 +45,7 @@ CacheChild::~CacheChild()
   NS_ASSERT_OWNINGTHREAD(CacheChild);
   MOZ_ASSERT(!mListener);
   MOZ_ASSERT(!mNumChildActors);
+  MOZ_ASSERT(!mLocked);
 }
 
 void
@@ -103,8 +105,9 @@ CacheChild::StartDestroy()
   // If we have outstanding child actors, then don't destroy ourself yet.
   // The child actors should be short lived and we should allow them to complete
   // if possible.  NoteDeletedActor() will call back into this Shutdown()
-  // method when the last child actor is gone.
-  if (mNumChildActors) {
+  // method when the last child actor is gone.  Also, delay destruction if we
+  // have been explicitly locked by someone using us on the stack.
+  if (mNumChildActors || mLocked) {
     mDelayedDestroy = true;
     return;
   }
@@ -175,11 +178,34 @@ void
 CacheChild::NoteDeletedActor()
 {
   mNumChildActors -= 1;
-  if (!mNumChildActors && mDelayedDestroy) {
+  MaybeFlushDelayedDestroy();
+}
+
+void
+CacheChild::MaybeFlushDelayedDestroy()
+{
+  if (!mNumChildActors && !mLocked && mDelayedDestroy) {
     StartDestroy();
   }
 }
 
+void
+CacheChild::Lock()
+{
+  NS_ASSERT_OWNINGTHREAD(CacheChild);
+  MOZ_ASSERT(!mLocked);
+  mLocked = true;
+}
+
+void
+CacheChild::Unlock()
+{
+  NS_ASSERT_OWNINGTHREAD(CacheChild);
+  MOZ_ASSERT(mLocked);
+  mLocked = false;
+  MaybeFlushDelayedDestroy();
+}
+
 } // namespace cache
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/cache/CacheChild.h b/dom/cache/CacheChild.h
index 4d43535cc5..ab58ccf4c2 100644
--- a/dom/cache/CacheChild.h
+++ b/dom/cache/CacheChild.h
@@ -28,6 +28,24 @@ class CacheChild final : public PCacheChild
                        , public ActorChild
 {
 public:
+  class MOZ_RAII AutoLock final
+  {
+    CacheChild* mActor;
+
+  public:
+    explicit AutoLock(CacheChild* aActor)
+      : mActor(aActor)
+    {
+      MOZ_ASSERT(mActor);
+      mActor->Lock();
+    }
+
+    ~AutoLock()
+    {
+      mActor->Unlock();
+    }
+  };
+
   CacheChild();
   ~CacheChild();
 
@@ -74,12 +92,24 @@ private:
   void
   NoteDeletedActor();
 
+  void
+  MaybeFlushDelayedDestroy();
+
+  // Methods used to temporarily force the actor alive.  Only called from
+  // AutoLock.
+  void
+  Lock();
+
+  void
+  Unlock();
+
   // Use a weak ref so actor does not hold DOM object alive past content use.
   // The Cache object must call ClearListener() to null this before its
   // destroyed.
   Cache* MOZ_NON_OWNING_REF mListener;
   uint32_t mNumChildActors;
   bool mDelayedDestroy;
+  bool mLocked;
 
   NS_DECL_OWNINGTHREAD
 };
diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
index 96e10a0de6..d0a6a2a63e 100644
--- a/dom/cache/CacheStorage.cpp
+++ b/dom/cache/CacheStorage.cpp
@@ -119,7 +119,6 @@ IsTrusted(const PrincipalInfo& aPrincipalInfo, bool aTestingPrefEnabled)
 
   nsAutoCString scheme(Substring(flatURL, schemePos, schemeLen));
   if (scheme.LowerCaseEqualsLiteral("https") ||
-      scheme.LowerCaseEqualsLiteral("app") ||
       scheme.LowerCaseEqualsLiteral("file")) {
     return true;
   }
diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp
index dce6909509..76c453046f 100644
--- a/dom/cache/TypeUtils.cpp
+++ b/dom/cache/TypeUtils.cpp
@@ -417,8 +417,7 @@ TypeUtils::ProcessURL(nsACString& aUrl, bool* aSchemeValidOut,
   if (aSchemeValidOut) {
     nsAutoCString scheme(Substring(flatURL, schemePos, schemeLen));
     *aSchemeValidOut = scheme.LowerCaseEqualsLiteral("http") ||
-                       scheme.LowerCaseEqualsLiteral("https") ||
-                       scheme.LowerCaseEqualsLiteral("app");
+                       scheme.LowerCaseEqualsLiteral("https");
   }
 
   uint32_t queryPos;
diff --git a/dom/cache/test/mochitest/app/after_clear.html b/dom/cache/test/mochitest/app/after_clear.html
new file mode 100644
index 0000000000..0f8186ed9f
--- /dev/null
+++ b/dom/cache/test/mochitest/app/after_clear.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test app for bug 1172562</title>
+    <script src='test.js'></script>
+    <script type='application/javascript;version=1.7'>
+
+function runTests() {
+  return Promise.resolve()
+    .then(() => { return navigator.serviceWorker.ready })
+    .then((registration) => {
+      return new Promise((resolve) => {
+        var worker = registration.waiting || registration.active;
+        worker.postMessage('read');
+        navigator.serviceWorker.onmessage = (message) => {
+          if (message.data.type == 'done') {
+            ok(!message.data.cached, 'No cached data');
+            resolve();
+          }
+        };
+      });
+    })
+    .then(done);
+}
+  </script>
+  </head>
+  <body onload='runTests()'>
+  </body>
+</html>
diff --git a/dom/cache/test/mochitest/app/before_clear.html b/dom/cache/test/mochitest/app/before_clear.html
new file mode 100644
index 0000000000..ed3726df83
--- /dev/null
+++ b/dom/cache/test/mochitest/app/before_clear.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test app for bug 1172562</title>
+    <script src='test.js'></script>
+    <script type='application/javascript;version=1.7'>
+
+function runTests() {
+  return Promise.resolve()
+    .then(() => { return navigator.serviceWorker.ready })
+    .then((registration) => {
+      return new Promise((resolve) => {
+        var worker = registration.waiting || registration.active;
+        worker.postMessage('write');
+        navigator.serviceWorker.onmessage = (message) => {
+          if (message.data.type == 'written') {
+            worker.postMessage('read');
+          } else if (message.data.type == 'done') {
+            ok(message.data.cached, 'Write success');
+            resolve();
+          }
+        };
+      });
+    })
+    .then(done);
+}
+  </script>
+  </head>
+  <body onload='runTests()'>
+  </body>
+</html>
diff --git a/dom/workers/test/serviceworkers/app/index.html b/dom/cache/test/mochitest/app/index.html
similarity index 94%
rename from dom/workers/test/serviceworkers/app/index.html
rename to dom/cache/test/mochitest/app/index.html
index a12702484f..0e8f70e0c8 100644
--- a/dom/workers/test/serviceworkers/app/index.html
+++ b/dom/cache/test/mochitest/app/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Test app for bug 1169249</title>
+    <title>Test app for bug 1172562</title>
     <script type='application/javascript;version=1.7'>
 function ok(aCondition, aMessage) {
   if (aCondition) {
diff --git a/dom/workers/test/serviceworkers/app-protocol/manifest.webapp b/dom/cache/test/mochitest/app/manifest.webapp
similarity index 54%
rename from dom/workers/test/serviceworkers/app-protocol/manifest.webapp
rename to dom/cache/test/mochitest/app/manifest.webapp
index e47d156f44..8f468b00ef 100644
--- a/dom/workers/test/serviceworkers/app-protocol/manifest.webapp
+++ b/dom/cache/test/mochitest/app/manifest.webapp
@@ -1,5 +1,5 @@
 {
   "name": "App",
   "launch_path": "/index.html",
-  "description": "Test app for bug 1161684"
+  "description": "Test app for bug 1172562"
 }
diff --git a/dom/workers/test/serviceworkers/app/manifest.webapp^headers^ b/dom/cache/test/mochitest/app/manifest.webapp^headers^
similarity index 100%
rename from dom/workers/test/serviceworkers/app/manifest.webapp^headers^
rename to dom/cache/test/mochitest/app/manifest.webapp^headers^
diff --git a/dom/cache/test/mochitest/app/sw.js b/dom/cache/test/mochitest/app/sw.js
new file mode 100644
index 0000000000..f5219b068a
--- /dev/null
+++ b/dom/cache/test/mochitest/app/sw.js
@@ -0,0 +1,19 @@
+var url = 'index.html';
+self.addEventListener('message', (message) => {
+  caches.open('acache').then((cache) => {
+    if(message.data == 'write') {
+      cache.add(url).then(() => {
+        message.source.postMessage({
+          type: 'written'
+        });
+      });
+    } else if (message.data == 'read') {
+      cache.match(url).then((result) => {
+        message.source.postMessage({
+          type: 'done',
+          cached: !!result
+        });
+      });
+    }
+  });
+});
diff --git a/dom/cache/test/mochitest/app/test.js b/dom/cache/test/mochitest/app/test.js
new file mode 100644
index 0000000000..e9b5523510
--- /dev/null
+++ b/dom/cache/test/mochitest/app/test.js
@@ -0,0 +1,15 @@
+function ok(aCondition, aMessage) {
+  if (aCondition) {
+    alert('OK: ' + aMessage);
+  } else {
+    alert('KO: ' + aMessage);
+  }
+}
+
+function ready() {
+  alert('READY');
+}
+
+function done() {
+  alert('DONE');
+}
diff --git a/dom/cache/test/mochitest/empty.html b/dom/cache/test/mochitest/empty.html
new file mode 100644
index 0000000000..5b56631db7
--- /dev/null
+++ b/dom/cache/test/mochitest/empty.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<!-- This is only used to give us access to the caches global after setting the pref. -->
diff --git a/dom/cache/test/mochitest/mochitest.ini b/dom/cache/test/mochitest/mochitest.ini
index 70f1140599..63fcf08bb3 100644
--- a/dom/cache/test/mochitest/mochitest.ini
+++ b/dom/cache/test/mochitest/mochitest.ini
@@ -22,6 +22,8 @@ support-files =
   test_cache_put_reorder.js
   test_cache_https.js
   large_url_list.js
+  empty.html
+  app/*
 
 [test_cache.html]
 [test_cache_add.html]
@@ -39,6 +41,8 @@ support-files =
   skip-if = buildapp == 'b2g' # bug 1162353
 [test_cache_restart.html]
 [test_cache_shrink.html]
+[test_cache_clear_on_app_uninstall.html]
+  skip-if = e10s || buildapp == 'b2g' # bug 1178685
 [test_cache_orphaned_cache.html]
 [test_cache_orphaned_body.html]
 [test_cache_untrusted.html]
diff --git a/dom/cache/test/mochitest/test_cache_add.js b/dom/cache/test/mochitest/test_cache_add.js
index cee4ebd817..0719f1a10a 100644
--- a/dom/cache/test/mochitest/test_cache_add.js
+++ b/dom/cache/test/mochitest/test_cache_add.js
@@ -1,7 +1,7 @@
 var singleUrl = './test_cache_add.js';
 var urlList = [
-  './helloworld.txt',
-  './foobar.txt',
+  './empty.html',
+  './frame.html',
   './test_cache.js'
 ];
 var cache;
diff --git a/dom/workers/test/serviceworkers/test_app_protocol.html b/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
similarity index 76%
rename from dom/workers/test/serviceworkers/test_app_protocol.html
rename to dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
index b5b72ff7e0..0f6035fac7 100644
--- a/dom/workers/test/serviceworkers/test_app_protocol.html
+++ b/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
@@ -5,7 +5,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Bug 1161684 - Allow JAR channels to be intercepted by service workers</title>
+  <title>Bug 1172562 - Clear QuotaManager storage when uninstalling an app</title>
   <script type='text/javascript' src='/tests/SimpleTest/SimpleTest.js'></script>
   <link rel='stylesheet' type='text/css' href='/tests/SimpleTest/test.css' />
 </head>
@@ -17,8 +17,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
-const appManifestURL =
-  'http://mochi.test:8888/tests/dom/workers/test/serviceworkers/app-protocol/update.webapp';
+const gOrigin = 'http://mochi.test:8888/tests/dom/cache/test/mochitest/app';
+const appManifestURL = gOrigin + '/manifest.webapp';
 let gApp;
 
 function setup() {
@@ -27,7 +27,6 @@ function setup() {
     SpecialPowers.pushPrefEnv({'set': [
       ['dom.mozBrowserFramesEnabled', true],
       ['dom.serviceWorkers.exemptFromPerDomainMax', true],
-      ["dom.serviceWorkers.interception.enabled", true],
       ['dom.serviceWorkers.enabled', true],
       ['dom.serviceWorkers.testing.enabled', true],
       ['dom.caches.enabled', true],
@@ -47,7 +46,7 @@ function setup() {
 
 function installApp() {
   return new Promise((resolve, reject) => {
-    let req = navigator.mozApps.installPackage(appManifestURL);
+    let req = navigator.mozApps.install(appManifestURL);
     req.onsuccess = function() {
       gApp = req.result;
       is(req.result.manifestURL, appManifestURL, 'app installed');
@@ -90,11 +89,11 @@ function launchApp() {
     let domParent = document.getElementById('container');
     domParent.appendChild(iframe);
     SpecialPowers.wrap(iframe.contentWindow).location =
-      gApp.origin + gApp.manifest.launch_path;
+      gOrigin + gApp.manifest.launch_path;
   });
 }
 
-function loadControlled() {
+function loadControlled(aUrl) {
   return new Promise((resolve, reject) => {
     let iframe = document.createElement('iframe');
     iframe.setAttribute('mozbrowser', 'true');
@@ -105,18 +104,6 @@ function loadControlled() {
         ok(true, "Message from app: " + message);
       } else if (/KO/.exec(message)) {
         ok(false, "Message from app: " + message);
-      } else if (/HTTPSIFRAMELOADED/.exec(message)) {
-        let doc = SpecialPowers.wrap(iframe).contentDocument;
-        let innerDoc = SpecialPowers.wrap(doc.getElementById("redirected-https").contentDocument);
-        let innerLocation = innerDoc.defaultView.location;
-        is(innerDoc.domain, "example.org", "Correct domain expected (https)");
-        is(innerLocation.origin, "https://example.org", "Correct origin expected (https)");
-      } else if (/IFRAMELOADED/.exec(message)) {
-        let doc = SpecialPowers.wrap(iframe).contentDocument;
-        let innerDoc = SpecialPowers.wrap(doc.getElementById("redirected").contentDocument);
-        let innerLocation = innerDoc.defaultView.location;
-        is(innerDoc.domain, "example.org", "Correct domain expected");
-        is(innerLocation.origin, "http://example.org", "Correct origin expected");
       } else if (/DONE/.exec(message)) {
         ok(true, "Messaging from app complete");
         iframe.removeEventListener('mozbrowsershowmodalprompt', listener);
@@ -130,10 +117,18 @@ function loadControlled() {
     let domParent = document.getElementById('container');
     domParent.appendChild(iframe);
     SpecialPowers.wrap(iframe.contentWindow).location =
-      gApp.origin + '/controlled.html';
+      gOrigin + aUrl;
   });
 }
 
+function loadBeforeClear() {
+  return loadControlled('/before_clear.html');
+}
+
+function loadAfterClear() {
+  return loadControlled('/after_clear.html');
+}
+
 function uninstallApp() {
   return new Promise((resolve, reject) => {
     if (!gApp) {
@@ -149,11 +144,15 @@ function runTests() {
   setup()
     .then(installApp)
     .then(launchApp)
-    .then(loadControlled)
+    .then(loadBeforeClear)
+    .then(uninstallApp)
+    .then(installApp)
+    .then(launchApp)
+    .then(loadAfterClear)
     .then(uninstallApp)
     .then(SimpleTest.finish)
     .catch((e) => {
-      ok(false, 'Unexpected error ' + e);
+      ok(false, 'Unexpected error ' + e.target.error.name);
       SimpleTest.finish();
     });
 }
diff --git a/dom/cache/test/mochitest/test_cache_https.js b/dom/cache/test/mochitest/test_cache_https.js
index 1c1cfffebd..b12b6d4f3a 100644
--- a/dom/cache/test/mochitest/test_cache_https.js
+++ b/dom/cache/test/mochitest/test_cache_https.js
@@ -4,10 +4,18 @@ var urlBase = 'https://example.com/tests/dom/cache/test/mochitest';
 var url1 = urlBase + '/test_cache.js';
 var url2 = urlBase + '/test_cache_add.js';
 
+function addOpaque(cache, url) {
+  return fetch(new Request(url, { mode: 'no-cors' })).then(function(response) {
+    return cache.put(url, response);
+  });
+}
+
 caches.open(name).then(function(c) {
   cache = c;
-  return cache.addAll([new Request(url1, { mode: 'no-cors' }),
-                       new Request(url2, { mode: 'no-cors' })]);
+  return Promise.all([
+    addOpaque(cache, url1),
+    addOpaque(cache, url2)
+  ]);
 }).then(function() {
   return cache.delete(url1);
 }).then(function(result) {
diff --git a/dom/cache/test/mochitest/test_cache_orphaned_body.html b/dom/cache/test/mochitest/test_cache_orphaned_body.html
index cb30c368fa..bc0cbe5423 100644
--- a/dom/cache/test/mochitest/test_cache_orphaned_body.html
+++ b/dom/cache/test/mochitest/test_cache_orphaned_body.html
@@ -59,7 +59,7 @@ SpecialPowers.pushPrefEnv({
   var fullUsage = 0;
   var resetUsage = 0;
   var endUsage = 0;
-  var url = 'cache_add.js';
+  var url = 'test_cache_add.js';
 
   // start from a fresh origin directory so other tests do not influence our
   // results
diff --git a/dom/cache/test/mochitest/test_cache_orphaned_cache.html b/dom/cache/test/mochitest/test_cache_orphaned_cache.html
index 8c51962d27..e7d9b87416 100644
--- a/dom/cache/test/mochitest/test_cache_orphaned_cache.html
+++ b/dom/cache/test/mochitest/test_cache_orphaned_cache.html
@@ -58,7 +58,7 @@ SpecialPowers.pushPrefEnv({
   var fullUsage = 0;
   var resetUsage = 0;
   var endUsage = 0;
-  var url = 'cache_add.js';
+  var url = 'test_cache_add.js';
 
   // start from a fresh origin directory so other tests do not influence our
   // results
diff --git a/dom/cache/test/mochitest/test_cache_restart.html b/dom/cache/test/mochitest/test_cache_restart.html
index 007441c3fd..0c0ad94fcd 100644
--- a/dom/cache/test/mochitest/test_cache_restart.html
+++ b/dom/cache/test/mochitest/test_cache_restart.html
@@ -9,6 +9,18 @@
 </head>
 <body>
 <script class="testbody" type="text/javascript">
+function setupTestIframe() {
+  return new Promise(function(resolve) {
+    var iframe = document.createElement("iframe");
+    iframe.src = "empty.html";
+    iframe.onload = function() {
+      window.caches = iframe.contentWindow.caches;
+      resolve();
+    };
+    document.body.appendChild(iframe);
+  });
+}
+
 function resetStorage() {
   return new Promise(function(resolve, reject) {
     SpecialPowers.resetStorageForDoc(SpecialPowers.wrap(document), resolve);
@@ -24,7 +36,9 @@ SpecialPowers.pushPrefEnv({
   var name = 'foo';
   var url = './test_cache_add.js';
   var cache;
-  caches.open(name).then(function(c) {
+  setupTestIframe().then(function() {
+    return caches.open(name);
+  }).then(function(c) {
     cache = c;
     return cache.add(url);
   }).then(function() {
diff --git a/dom/cache/test/mochitest/test_cache_shrink.html b/dom/cache/test/mochitest/test_cache_shrink.html
index cddaa01147..b528bc0d90 100644
--- a/dom/cache/test/mochitest/test_cache_shrink.html
+++ b/dom/cache/test/mochitest/test_cache_shrink.html
@@ -10,6 +10,18 @@
 </head>
 <body>
 <script class="testbody" type="text/javascript">
+function setupTestIframe() {
+  return new Promise(function(resolve) {
+    var iframe = document.createElement("iframe");
+    iframe.src = "empty.html";
+    iframe.onload = function() {
+      window.caches = iframe.contentWindow.caches;
+      resolve();
+    };
+    document.body.appendChild(iframe);
+  });
+}
+
 function clearStorage() {
   return new Promise(function(resolve, reject) {
     SpecialPowers.clearStorageForDoc(SpecialPowers.wrap(document), resolve);
@@ -47,7 +59,9 @@ SpecialPowers.pushPrefEnv({
   var endUsage = 0;
   // start from a fresh origin directory so other tests do not influence our
   // results
-  clearStorage().then(function() {
+  setupTestIframe().then(function() {
+    return clearStorage();
+  }).then(function() {
     return storageUsage();
   }).then(function(usage) {
     is(0, usage, 'disk usage should be zero to start');
diff --git a/dom/camera/CameraControlListener.h b/dom/camera/CameraControlListener.h
index 232791e937..f0cfc9c5dd 100644
--- a/dom/camera/CameraControlListener.h
+++ b/dom/camera/CameraControlListener.h
@@ -12,11 +12,11 @@ namespace mozilla {
 
 namespace dom {
   class BlobImpl;
-}
+} // namespace dom
 
 namespace layers {
   class Image;
-}
+} // namespace layers
 
 class CameraControlListener
 {
diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp
index cb7c5fd232..09ca635fe8 100644
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -1648,7 +1648,7 @@ nsDOMCameraControl::OnUserError(CameraControlListener::UserContext aContext, nsr
       break;
 
     case CameraControlListener::kInSetConfiguration:
-      if (mSetInitialConfig) {
+      if (mSetInitialConfig && mCameraControl) {
         // If the SetConfiguration() call in the constructor fails, there
         // is nothing we can do except release the camera hardware. This
         // will trigger a hardware state change, and when the flag that
diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
index aafa47249a..280a77391c 100644
--- a/dom/camera/GonkCameraControl.cpp
+++ b/dom/camera/GonkCameraControl.cpp
@@ -2213,17 +2213,6 @@ nsGonkCameraControl::LoadRecorderProfiles()
   return NS_OK;
 }
 
-/* static */ PLDHashOperator
-nsGonkCameraControl::Enumerate(const nsAString& aProfileName,
-                               RecorderProfile* aProfile,
-                               void* aUserArg)
-{
-  nsTArray<nsString>* profiles = static_cast<nsTArray<nsString>*>(aUserArg);
-  MOZ_ASSERT(profiles);
-  profiles->AppendElement(aProfileName);
-  return PL_DHASH_NEXT;
-}
-
 nsresult
 nsGonkCameraControl::GetRecorderProfiles(nsTArray<nsString>& aProfiles)
 {
@@ -2233,7 +2222,9 @@ nsGonkCameraControl::GetRecorderProfiles(nsTArray<nsString>& aProfiles)
   }
 
   aProfiles.Clear();
-  mRecorderProfiles.EnumerateRead(Enumerate, static_cast<void*>(&aProfiles));
+  for (auto iter = mRecorderProfiles.Iter(); !iter.Done(); iter.Next()) {
+    aProfiles.AppendElement(iter.Key());
+  }
   return NS_OK;
 }
 
diff --git a/dom/camera/GonkCameraControl.h b/dom/camera/GonkCameraControl.h
index e3a2e82804..8cb289027c 100644
--- a/dom/camera/GonkCameraControl.h
+++ b/dom/camera/GonkCameraControl.h
@@ -156,9 +156,6 @@ protected:
   void CreatePoster(layers::Image* aImage, uint32_t aWidth, uint32_t aHeight, int32_t aRotation);
 
   nsresult LoadRecorderProfiles();
-  static PLDHashOperator Enumerate(const nsAString& aProfileName,
-                                   RecorderProfile* aProfile,
-                                   void* aUserArg);
 
   friend class SetPictureSize;
   friend class SetThumbnailSize;
diff --git a/dom/camera/GonkCameraHwMgr.cpp b/dom/camera/GonkCameraHwMgr.cpp
index c9ad87e995..abe492527c 100644
--- a/dom/camera/GonkCameraHwMgr.cpp
+++ b/dom/camera/GonkCameraHwMgr.cpp
@@ -28,6 +28,9 @@
 #include "mozilla/layers/TextureClient.h"
 #include "CameraPreferences.h"
 #include "mozilla/RefPtr.h"
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 21
+#include "GonkBufferQueueProducer.h"
+#endif
 #include "GonkCameraControl.h"
 #include "CameraCommon.h"
 
@@ -50,6 +53,7 @@ GonkCameraHardware::GonkCameraHardware(mozilla::nsGonkCameraControl* aTarget, ui
   , mTarget(aTarget)
   , mRawSensorOrientation(0)
   , mSensorOrientation(0)
+  , mEmulated(false)
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p (aTarget=%p)\n", __func__, __LINE__, (void*)this, (void*)aTarget);
 }
@@ -191,6 +195,11 @@ GonkCameraHardware::Init()
   }
   DOM_CAMERA_LOGI("Sensor orientation: base=%d, offset=%d, final=%d\n", info.orientation, offset, mSensorOrientation);
 
+  if (__system_property_get("ro.kernel.qemu", prop) > 0 && atoi(prop)) {
+    DOM_CAMERA_LOGI("Using emulated camera\n");
+    mEmulated = true;
+  }
+
   // Disable shutter sound in android CameraService because gaia camera app will play it
   mCamera->sendCommand(CAMERA_CMD_ENABLE_SHUTTER_SOUND, 0, 0);
 
@@ -198,6 +207,7 @@ GonkCameraHardware::Init()
   sp<IGraphicBufferProducer> producer;
   sp<IGonkGraphicBufferConsumer> consumer;
   GonkBufferQueue::createBufferQueue(&producer, &consumer);
+  static_cast<GonkBufferQueueProducer*>(producer.get())->setSynchronousMode(false);
   mNativeWindow = new GonkNativeWindow(consumer, GonkCameraHardware::MIN_UNDEQUEUED_BUFFERS);
   mCamera->setPreviewTarget(producer);
 #elif ANDROID_VERSION >= 19
@@ -318,10 +328,19 @@ GonkCameraHardware::GetSensorOrientation(uint32_t aType)
   }
 }
 
+bool
+GonkCameraHardware::IsEmulated()
+{
+  return mEmulated;
+}
+
 int
 GonkCameraHardware::AutoFocus()
 {
   DOM_CAMERA_LOGI("%s\n", __func__);
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   return mCamera->autoFocus();
 }
 
@@ -329,6 +348,9 @@ int
 GonkCameraHardware::CancelAutoFocus()
 {
   DOM_CAMERA_LOGI("%s\n", __func__);
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   return mCamera->cancelAutoFocus();
 }
 
@@ -336,8 +358,11 @@ int
 GonkCameraHardware::StartFaceDetection()
 {
   DOM_CAMERA_LOGI("%s\n", __func__);
-  int rv = INVALID_OPERATION;
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
 
+  int rv = INVALID_OPERATION;
 #if ANDROID_VERSION >= 15
   rv = mCamera->sendCommand(CAMERA_CMD_START_FACE_DETECTION, CAMERA_FACE_DETECTION_HW, 0);
 #endif
@@ -352,8 +377,11 @@ int
 GonkCameraHardware::StopFaceDetection()
 {
   DOM_CAMERA_LOGI("%s\n", __func__);
-  int rv = INVALID_OPERATION;
+  if (mClosing) {
+    return DEAD_OBJECT;
+  }
 
+  int rv = INVALID_OPERATION;
 #if ANDROID_VERSION >= 15
   rv = mCamera->sendCommand(CAMERA_CMD_STOP_FACE_DETECTION, 0, 0);
 #endif
@@ -367,6 +395,9 @@ GonkCameraHardware::StopFaceDetection()
 int
 GonkCameraHardware::TakePicture()
 {
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   return mCamera->takePicture(CAMERA_MSG_SHUTTER | CAMERA_MSG_COMPRESSED_IMAGE);
 }
 
@@ -379,6 +410,9 @@ GonkCameraHardware::CancelTakePicture()
 int
 GonkCameraHardware::PushParameters(const GonkCameraParameters& aParams)
 {
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   const String8 s = aParams.Flatten();
   return mCamera->setParameters(s);
 }
@@ -386,6 +420,9 @@ GonkCameraHardware::PushParameters(const GonkCameraParameters& aParams)
 nsresult
 GonkCameraHardware::PullParameters(GonkCameraParameters& aParams)
 {
+  if (NS_WARN_IF(mClosing)) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
   const String8 s = mCamera->getParameters();
   return aParams.Unflatten(s);
 }
@@ -394,6 +431,9 @@ GonkCameraHardware::PullParameters(GonkCameraParameters& aParams)
 int
 GonkCameraHardware::PushParameters(const CameraParameters& aParams)
 {
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   String8 s = aParams.flatten();
   return mCamera->setParameters(s);
 }
@@ -401,8 +441,10 @@ GonkCameraHardware::PushParameters(const CameraParameters& aParams)
 void
 GonkCameraHardware::PullParameters(CameraParameters& aParams)
 {
-  const String8 s = mCamera->getParameters();
-  aParams.unflatten(s);
+  if (!NS_WARN_IF(mClosing)) {
+    const String8 s = mCamera->getParameters();
+    aParams.unflatten(s);
+  }
 }
 #endif
 
@@ -410,6 +452,9 @@ int
 GonkCameraHardware::StartPreview()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   return mCamera->startPreview();
 }
 
@@ -417,16 +462,20 @@ void
 GonkCameraHardware::StopPreview()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
-  mCamera->stopPreview();
+  if (!mClosing) {
+    mCamera->stopPreview();
+  }
 }
 
 int
 GonkCameraHardware::StartRecording()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
-  int rv = OK;
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
 
-  rv = mCamera->startRecording();
+  int rv = mCamera->startRecording();
   if (rv != OK) {
     DOM_CAMERA_LOGE("mHardware->startRecording() failed with status %d", rv);
   }
@@ -437,6 +486,9 @@ int
 GonkCameraHardware::StopRecording()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
+  if (mClosing) {
+    return DEAD_OBJECT;
+  }
   mCamera->stopRecording();
   return OK;
 }
@@ -452,12 +504,17 @@ GonkCameraHardware::SetListener(const sp<GonkCameraListener>& aListener)
 void
 GonkCameraHardware::ReleaseRecordingFrame(const sp<IMemory>& aFrame)
 {
-  mCamera->releaseRecordingFrame(aFrame);
+  if (!NS_WARN_IF(mClosing)) {
+    mCamera->releaseRecordingFrame(aFrame);
+  }
 }
 #endif
 
 int
 GonkCameraHardware::StoreMetaDataInBuffers(bool aEnabled)
 {
+  if (NS_WARN_IF(mClosing)) {
+    return DEAD_OBJECT;
+  }
   return mCamera->storeMetaDataInBuffers(aEnabled);
 }
diff --git a/dom/camera/GonkCameraHwMgr.h b/dom/camera/GonkCameraHwMgr.h
index 1dc3a0b8d6..5736c43aea 100644
--- a/dom/camera/GonkCameraHwMgr.h
+++ b/dom/camera/GonkCameraHwMgr.h
@@ -99,6 +99,8 @@ public:
   };
   virtual int      GetSensorOrientation(uint32_t aType = RAW_SENSOR_ORIENTATION);
 
+  virtual bool     IsEmulated();
+
   /**
    * MIN_UNDEQUEUED_BUFFERS has increased to 4 since Android JB. For FFOS, more
    * than 3 gralloc buffers are necessary between ImageHost and GonkBufferQueue
@@ -140,6 +142,7 @@ protected:
 #endif
   int                           mRawSensorOrientation;
   int                           mSensorOrientation;
+  bool                          mEmulated;
 
 private:
   GonkCameraHardware(const GonkCameraHardware&) = delete;
diff --git a/dom/camera/GonkCameraParameters.cpp b/dom/camera/GonkCameraParameters.cpp
index 3c3f7beedb..ecd58fe070 100644
--- a/dom/camera/GonkCameraParameters.cpp
+++ b/dom/camera/GonkCameraParameters.cpp
@@ -69,27 +69,19 @@ GonkCameraParameters::FindVendorSpecificKey(const char* aPotentialKeys[],
   return nullptr;
 }
 
-/* static */ PLDHashOperator
-GonkCameraParameters::EnumerateFlatten(const nsACString& aKey,
-                                       nsCString* aValue,
-                                       void* aUserArg)
-{
-  nsCString* data = static_cast<nsCString*>(aUserArg);
-  if (!data->IsEmpty()) {
-    data->Append(';');
-  }
-  data->Append(aKey);
-  data->Append('=');
-  data->Append(*aValue);
-  return PL_DHASH_NEXT;
-}
-
 String8
 GonkCameraParameters::Flatten() const
 {
   MutexAutoLock lock(mLock);
   nsCString data;
-  mParams.EnumerateRead(EnumerateFlatten, static_cast<void*>(&data));
+  for (auto iter = mParams.ConstIter(); !iter.Done(); iter.Next()) {
+    if (!data.IsEmpty()) {
+      data.Append(';');
+    }
+    data.Append(iter.Key());
+    data.Append('=');
+    data.Append(*iter.UserData());
+  }
   return String8(data.Data());
 }
 
@@ -106,7 +98,7 @@ GonkCameraParameters::Unflatten(const String8& aFlatParameters)
       break;
     }
 
-    nsAutoCString key(data, pos - data);
+    nsDependentCSubstring key(data, pos - data);
     data = pos + 1;
 
     nsCString* value;
diff --git a/dom/camera/GonkCameraParameters.h b/dom/camera/GonkCameraParameters.h
index 72ddd0d223..830685a96b 100644
--- a/dom/camera/GonkCameraParameters.h
+++ b/dom/camera/GonkCameraParameters.h
@@ -93,18 +93,19 @@ protected:
   nsClassHashtable<nsStringHashKey, nsCString> mIsoModeMap;
   nsClassHashtable<nsCStringHashKey, nsCString> mParams;
 
-  static PLDHashOperator EnumerateFlatten(const nsACString& aKey, nsCString* aValue, void* aUserArg);
-
   nsresult SetImpl(const char* aKey, const char* aValue)
   {
-    nsCString key(aKey);
+    if (!aValue || strchr(aValue, ';') || strchr(aValue, '=')) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    nsDependentCString key(aKey);
     mParams.Put(key, new nsCString(aValue));
     return NS_OK;
   }
 
   nsresult SetImpl(const char* aKey, int aValue)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value = new nsCString();
     value->AppendInt(aValue);
     mParams.Put(key, value);
@@ -113,7 +114,7 @@ protected:
 
   nsresult SetImpl(const char* aKey, double aValue)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value = new nsCString();
     value->AppendFloat(aValue);
     mParams.Put(key, value);
@@ -122,7 +123,7 @@ protected:
 
   nsresult SetImpl(const char* aKey, float aValue)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value = new nsCString();
     value->AppendFloat(aValue);
     mParams.Put(key, value);
@@ -131,14 +132,14 @@ protected:
 
   nsresult SetImpl(const char* aKey, bool aValue)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     mParams.Put(key, new nsCString(aValue ? "true" : "false"));
     return NS_OK;
   }
 
   nsresult GetImpl(const char* aKey, const char*& aRet)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value;
     if (!mParams.Get(key, &value)) {
       aRet = nullptr;
@@ -150,7 +151,7 @@ protected:
 
   nsresult GetImpl(const char* aKey, float& aRet)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value;
     nsresult rv = NS_ERROR_FAILURE;
     if (mParams.Get(key, &value)) {
@@ -163,7 +164,7 @@ protected:
 
   nsresult GetImpl(const char* aKey, double& aRet)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value;
     nsresult rv = NS_ERROR_FAILURE;
     if (mParams.Get(key, &value)) {
@@ -176,7 +177,7 @@ protected:
 
   nsresult GetImpl(const char* aKey, int& aRet)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value;
     nsresult rv = NS_ERROR_FAILURE;
     if (mParams.Get(key, &value)) {
@@ -189,7 +190,7 @@ protected:
 
   nsresult GetImpl(const char* aKey, bool& aRet)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     nsCString* value;
     if (!mParams.Get(key, &value)) {
       aRet = false;
@@ -228,7 +229,7 @@ protected:
   nsresult
   ClearImpl(const char* aKey)
   {
-    nsCString key(aKey);
+    nsDependentCString key(aKey);
     mParams.Remove(key);
     return NS_OK;
   }
diff --git a/dom/camera/GonkRecorder.cpp b/dom/camera/GonkRecorder.cpp
index 4065839d93..89bcb86135 100644
--- a/dom/camera/GonkRecorder.cpp
+++ b/dom/camera/GonkRecorder.cpp
@@ -1561,7 +1561,9 @@ status_t GonkRecorder::setupVideoEncoder(
     // CHECK_EQ causes an abort if the given condition fails.
     CHECK_EQ(client.connect(), (status_t)OK);
 
-    uint32_t encoder_flags = OMXCodec::kHardwareCodecsOnly;
+    uint32_t encoder_flags = mCameraHw->IsEmulated()
+                             ? 0
+                             : OMXCodec::kHardwareCodecsOnly;
     if (mIsMetaDataStoredInVideoBuffers) {
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
         encoder_flags |= OMXCodec::kStoreMetaDataInVideoBuffers;
diff --git a/dom/camera/GonkRecorderProfiles.cpp b/dom/camera/GonkRecorderProfiles.cpp
index 61ed6dc23c..4479d92788 100644
--- a/dom/camera/GonkRecorderProfiles.cpp
+++ b/dom/camera/GonkRecorderProfiles.cpp
@@ -269,18 +269,6 @@ GonkRecorderProfile::GonkRecorderProfile(uint32_t aCameraId,
   mIsValid = isValid && mAudio.IsValid() && mVideo.IsValid();
 }
 
-/* static */ PLDHashOperator
-GonkRecorderProfile::Enumerate(const nsAString& aProfileName,
-                               GonkRecorderProfile* aProfile,
-                               void* aUserArg)
-{
-  nsTArray<RefPtr<ICameraControl::RecorderProfile>>* profiles =
-    static_cast<nsTArray<RefPtr<ICameraControl::RecorderProfile>>*>(aUserArg);
-  MOZ_ASSERT(profiles);
-  profiles->AppendElement(aProfile);
-  return PL_DHASH_NEXT;
-}
-
 /* static */
 already_AddRefed<GonkRecorderProfile>
 GonkRecorderProfile::CreateProfile(uint32_t aCameraId, int aQuality)
@@ -379,7 +367,9 @@ GonkRecorderProfile::GetAll(uint32_t aCameraId,
   }
 
   aProfiles.Clear();
-  profiles->EnumerateRead(Enumerate, static_cast<void*>(&aProfiles));
+  for (auto iter = profiles->Iter(); !iter.Done(); iter.Next()) {
+    aProfiles.AppendElement(iter.UserData());
+  }
 
   return NS_OK;
 }
diff --git a/dom/camera/GonkRecorderProfiles.h b/dom/camera/GonkRecorderProfiles.h
index b6fe8d0e9a..dd2a0869e9 100644
--- a/dom/camera/GonkRecorderProfiles.h
+++ b/dom/camera/GonkRecorderProfiles.h
@@ -142,9 +142,6 @@ protected:
   static already_AddRefed<GonkRecorderProfile> CreateProfile(uint32_t aCameraId,
                                                              int aQuality);
   static ProfileHashtable* GetProfileHashtable(uint32_t aCameraId);
-  static PLDHashOperator Enumerate(const nsAString& aProfileName,
-                                   GonkRecorderProfile* aProfile,
-                                   void* aUserArg);
 
   uint32_t mCameraId;
   int mQuality;
diff --git a/dom/canvas/WebGLContextVertices.cpp b/dom/canvas/WebGLContextVertices.cpp
index 226c9c01ab..940621800a 100644
--- a/dom/canvas/WebGLContextVertices.cpp
+++ b/dom/canvas/WebGLContextVertices.cpp
@@ -357,6 +357,12 @@ WebGLContext::GetVertexAttrib(JSContext* cx, GLuint index, GLenum pname,
 
         return JS::NumberValue(uint32_t(mBoundVertexArray->mAttribs[index].type));
 
+    case LOCAL_GL_VERTEX_ATTRIB_ARRAY_INTEGER:
+        if (IsWebGL2())
+            return JS::BooleanValue(mBoundVertexArray->mAttribs[index].integer);
+
+        break;
+
     case LOCAL_GL_VERTEX_ATTRIB_ARRAY_DIVISOR:
         if (IsWebGL2() ||
             IsExtensionEnabled(WebGLExtensionID::ANGLE_instanced_arrays))
diff --git a/dom/canvas/WebGLExtensionTextureFloat.cpp b/dom/canvas/WebGLExtensionTextureFloat.cpp
index a7a58939ad..4568e994ee 100644
--- a/dom/canvas/WebGLExtensionTextureFloat.cpp
+++ b/dom/canvas/WebGLExtensionTextureFloat.cpp
@@ -32,15 +32,17 @@ WebGLExtensionTextureFloat::WebGLExtensionTextureFloat(WebGLContext* webgl)
         fua->AllowUnsizedTexFormat(pi, usage);
     };
 
-    const bool needSizedInternal = !gl->IsGLES();
-    MOZ_ASSERT_IF(needSizedInternal, gl->IsSupported(gl::GLFeature::texture_swizzle));
+    const bool needsSwizzle = gl->IsCoreProfile();
+    MOZ_ASSERT_IF(needsSwizzle, gl->IsSupported(gl::GLFeature::texture_swizzle));
+
+    const bool needsSizedFormat = !gl->IsGLES();
 
     ////////////////
 
     pi = {LOCAL_GL_RGBA, LOCAL_GL_FLOAT};
     dui = {pi.format, pi.format, pi.type};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSizedFormat) {
         dui.internalFormat = LOCAL_GL_RGBA32F;
     }
     fnAdd(webgl::EffectiveFormat::RGBA32F);
@@ -50,7 +52,7 @@ WebGLExtensionTextureFloat::WebGLExtensionTextureFloat(WebGLContext* webgl)
     pi = {LOCAL_GL_RGB, LOCAL_GL_FLOAT};
     dui = {pi.format, pi.format, pi.type};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSizedFormat) {
         dui.internalFormat = LOCAL_GL_RGB32F;
     }
     fnAdd(webgl::EffectiveFormat::RGB32F);
@@ -60,9 +62,11 @@ WebGLExtensionTextureFloat::WebGLExtensionTextureFloat(WebGLContext* webgl)
     pi = {LOCAL_GL_LUMINANCE, LOCAL_GL_FLOAT};
     dui = {pi.format, pi.format, pi.type};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_R32F, LOCAL_GL_RED, LOCAL_GL_FLOAT};
         swizzle = webgl::FormatUsageInfo::kLuminanceSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_LUMINANCE32F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Luminance32F);
 
@@ -71,9 +75,11 @@ WebGLExtensionTextureFloat::WebGLExtensionTextureFloat(WebGLContext* webgl)
     pi = {LOCAL_GL_ALPHA, LOCAL_GL_FLOAT};
     dui = {pi.format, pi.format, pi.type};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_R32F, LOCAL_GL_RED, LOCAL_GL_FLOAT};
         swizzle = webgl::FormatUsageInfo::kAlphaSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_ALPHA32F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Alpha32F);
 
@@ -82,9 +88,11 @@ WebGLExtensionTextureFloat::WebGLExtensionTextureFloat(WebGLContext* webgl)
     pi = {LOCAL_GL_LUMINANCE_ALPHA, LOCAL_GL_FLOAT};
     dui = {pi.format, pi.format, pi.type};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_RG32F, LOCAL_GL_RG, LOCAL_GL_FLOAT};
         swizzle = webgl::FormatUsageInfo::kLumAlphaSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_LUMINANCE_ALPHA32F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Luminance32FAlpha32F);
 }
@@ -101,10 +109,9 @@ WebGLExtensionTextureFloat::IsSupported(const WebGLContext* webgl)
     if (!gl->IsSupported(gl::GLFeature::texture_float))
         return false;
 
-    const bool needSizedInternal = !gl->IsGLES();
+    const bool needsSwizzle = gl->IsCoreProfile();
     const bool hasSwizzle = gl->IsSupported(gl::GLFeature::texture_swizzle);
-
-    if (needSizedInternal && !hasSwizzle)
+    if (needsSwizzle && !hasSwizzle)
         return false;
 
     return true;
diff --git a/dom/canvas/WebGLExtensionTextureHalfFloat.cpp b/dom/canvas/WebGLExtensionTextureHalfFloat.cpp
index a5770999d6..e59f9b232e 100644
--- a/dom/canvas/WebGLExtensionTextureHalfFloat.cpp
+++ b/dom/canvas/WebGLExtensionTextureHalfFloat.cpp
@@ -30,8 +30,10 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
         fua->AllowUnsizedTexFormat(pi, usage);
     };
 
-    const bool needSizedInternal = !gl->IsGLES();
-    MOZ_ASSERT_IF(needSizedInternal, gl->IsSupported(gl::GLFeature::texture_swizzle));
+    const bool needsSwizzle = gl->IsCoreProfile();
+    MOZ_ASSERT_IF(needsSwizzle, gl->IsSupported(gl::GLFeature::texture_swizzle));
+
+    const bool needsSizedFormat = !gl->IsGLES();
 
     GLenum driverUnpackType = LOCAL_GL_HALF_FLOAT;
     if (!gl->IsSupported(gl::GLFeature::texture_half_float)) {
@@ -44,7 +46,7 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
     pi = {LOCAL_GL_RGBA, LOCAL_GL_HALF_FLOAT_OES};
     dui = {pi.format, pi.format, driverUnpackType};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSizedFormat) {
         dui.internalFormat = LOCAL_GL_RGBA16F;
     }
     fnAdd(webgl::EffectiveFormat::RGBA16F);
@@ -54,7 +56,7 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
     pi = {LOCAL_GL_RGB, LOCAL_GL_HALF_FLOAT_OES};
     dui = {pi.format, pi.format, driverUnpackType};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSizedFormat) {
         dui.internalFormat = LOCAL_GL_RGB16F;
     }
     fnAdd(webgl::EffectiveFormat::RGB16F);
@@ -64,9 +66,11 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
     pi = {LOCAL_GL_LUMINANCE, LOCAL_GL_HALF_FLOAT_OES};
     dui = {pi.format, pi.format, driverUnpackType};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_R16F, LOCAL_GL_RED, driverUnpackType};
         swizzle = webgl::FormatUsageInfo::kLuminanceSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_LUMINANCE16F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Luminance16F);
 
@@ -75,9 +79,11 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
     pi = {LOCAL_GL_ALPHA, LOCAL_GL_HALF_FLOAT_OES};
     dui = {pi.format, pi.format, driverUnpackType};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_R16F, LOCAL_GL_RED, driverUnpackType};
         swizzle = webgl::FormatUsageInfo::kAlphaSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_ALPHA16F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Alpha16F);
 
@@ -86,9 +92,11 @@ WebGLExtensionTextureHalfFloat::WebGLExtensionTextureHalfFloat(WebGLContext* web
     pi = {LOCAL_GL_LUMINANCE_ALPHA, LOCAL_GL_HALF_FLOAT_OES};
     dui = {pi.format, pi.format, driverUnpackType};
     swizzle = nullptr;
-    if (needSizedInternal) {
+    if (needsSwizzle) {
         dui = {LOCAL_GL_RG16F, LOCAL_GL_RG, driverUnpackType};
         swizzle = webgl::FormatUsageInfo::kLumAlphaSwizzleRGBA;
+    } else if (needsSizedFormat) {
+        dui.internalFormat = LOCAL_GL_LUMINANCE_ALPHA16F_ARB;
     }
     fnAdd(webgl::EffectiveFormat::Luminance16FAlpha16F);
 }
@@ -108,10 +116,9 @@ WebGLExtensionTextureHalfFloat::IsSupported(const WebGLContext* webgl)
         return false;
     }
 
-    const bool needSizedInternal = !gl->IsGLES();
+    const bool needsSwizzle = gl->IsCoreProfile();
     const bool hasSwizzle = gl->IsSupported(gl::GLFeature::texture_swizzle);
-
-    if (needSizedInternal && !hasSwizzle)
+    if (needsSwizzle && !hasSwizzle)
         return false;
 
     return true;
diff --git a/dom/canvas/WebGLFormats.cpp b/dom/canvas/WebGLFormats.cpp
index e97124d15a..51ea0ab4b8 100644
--- a/dom/canvas/WebGLFormats.cpp
+++ b/dom/canvas/WebGLFormats.cpp
@@ -560,11 +560,14 @@ FormatUsageAuthority::CreateForWebGL1(gl::GLContext* gl)
     // RGBA8 is made renderable in WebGL 1.0, "Framebuffer Object Attachments"
     //                              render filter
     //                              able   able
-    fnSet(EffectiveFormat::RGBA8  , true , true);
-    fnSet(EffectiveFormat::RGBA4  , true , true);
-    fnSet(EffectiveFormat::RGB5_A1, true , true);
-    fnSet(EffectiveFormat::RGB8   , false, true);
-    fnSet(EffectiveFormat::RGB565 , true , true);
+    fnSet(EffectiveFormat::RGBA8  , true, true);
+    fnSet(EffectiveFormat::RGBA4  , true, true);
+    fnSet(EffectiveFormat::RGB5_A1, true, true);
+    fnSet(EffectiveFormat::RGB565 , true, true);
+
+    // RGB8 is not guaranteed to be renderable, but we should allow it for web-compat.
+    // Min-capability mode should mark this as non-renderable.
+    fnSet(EffectiveFormat::RGB8, true, true);
 
     fnSet(EffectiveFormat::Luminance8Alpha8, false, true);
     fnSet(EffectiveFormat::Luminance8      , false, true);
@@ -803,7 +806,7 @@ FormatUsageAuthority::CreateForWebGL2(gl::GLContext* gl)
 
     // GLES 3.0.4, p147, table 3.19
     // GLES 3.0.4, p286+, $C.1 "ETC Compressed Texture Image Formats"
-
+#if ALLOW_ES3_FORMATS
     // Note that all compressed texture formats are filterable:
     // GLES 3.0.4 p161:
     // "[A] texture is complete unless any of the following conditions hold true:
@@ -823,7 +826,7 @@ FormatUsageAuthority::CreateForWebGL2(gl::GLContext* gl)
     fnAllowES3TexFormat(FOO(COMPRESSED_SIGNED_RG11_EAC               ), false, true);
     fnAllowES3TexFormat(FOO(COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 ), false, true);
     fnAllowES3TexFormat(FOO(COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2), false, true);
-
+#endif
 #undef FOO
 
     // GLES 3.0.4, p206, "Required Renderbuffer Formats":
@@ -840,6 +843,9 @@ FormatUsageAuthority::CreateForWebGL2(gl::GLContext* gl)
     if (!AddUnsizedFormats(ptr, gl))
         return nullptr;
 
+    ptr->AllowRBFormat(LOCAL_GL_DEPTH_STENCIL,
+                       ptr->GetUsage(EffectiveFormat::DEPTH24_STENCIL8));
+
     if (gfxPrefs::WebGL2CompatMode()) {
         AddSimpleUnsized(ptr, LOCAL_GL_RGBA, LOCAL_GL_FLOAT, EffectiveFormat::RGBA32F);
         AddSimpleUnsized(ptr, LOCAL_GL_RGB , LOCAL_GL_FLOAT, EffectiveFormat::RGB32F );
diff --git a/dom/canvas/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp
index c94dd4d14a..3f256bcf3f 100644
--- a/dom/canvas/WebGLProgram.cpp
+++ b/dom/canvas/WebGLProgram.cpp
@@ -172,10 +172,12 @@ QueryProgramInfo(WebGLProgram* prog, gl::GLContext* gl)
 
         // Collect active locations:
         GLint loc = gl->fGetAttribLocation(prog->mGLName, mappedName.BeginReading());
-        if (loc == -1)
-            MOZ_CRASH("Active attrib has no location.");
-
-        info->activeAttribLocs.insert(loc);
+        if (loc == -1) {
+            if (mappedName != "gl_InstanceID")
+                MOZ_CRASH("Active attrib has no location.");
+        } else {
+            info->activeAttribLocs.insert(loc);
+        }
     }
 
     // Uniforms
@@ -599,6 +601,7 @@ WebGLProgram::GetProgramParameter(GLenum pname) const
     if (mContext->IsWebGL2()) {
         switch (pname) {
         case LOCAL_GL_ACTIVE_UNIFORM_BLOCKS:
+        case LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
             return JS::Int32Value(GetProgramiv(gl, mGLName, pname));
 
         case LOCAL_GL_TRANSFORM_FEEDBACK_VARYINGS:
diff --git a/dom/canvas/WebGLShaderValidator.cpp b/dom/canvas/WebGLShaderValidator.cpp
index 8c8774bd3c..a10cf8d645 100644
--- a/dom/canvas/WebGLShaderValidator.cpp
+++ b/dom/canvas/WebGLShaderValidator.cpp
@@ -133,7 +133,13 @@ WebGLContext::CreateShaderValidator(GLenum shaderType) const
         return nullptr;
 
     ShShaderSpec spec = IsWebGL2() ? SH_WEBGL2_SPEC : SH_WEBGL_SPEC;
-    ShShaderOutput outputLanguage = ShaderOutput(gl);
+    ShShaderOutput outputLanguage = gl->IsGLES() ? SH_ESSL_OUTPUT
+                                                 : SH_GLSL_OUTPUT;
+
+    // If we're using WebGL2 we want a more specific version of GLSL
+    if (IsWebGL2())
+        outputLanguage = ShaderOutput(gl);
+
     ShBuiltInResources resources;
     memset(&resources, 0, sizeof(resources));
     ShInitBuiltInResources(&resources);
@@ -147,18 +153,21 @@ WebGLContext::CreateShaderValidator(GLenum shaderType) const
     resources.MaxCombinedTextureImageUnits = mGLMaxTextureUnits;
     resources.MaxTextureImageUnits = mGLMaxTextureImageUnits;
     resources.MaxFragmentUniformVectors = mGLMaxFragmentUniformVectors;
-    resources.MaxDrawBuffers = mGLMaxDrawBuffers;
 
-    if (IsWebGL2() || IsExtensionEnabled(WebGLExtensionID::EXT_frag_depth))
+    const bool hasMRTs = (IsWebGL2() ||
+                          IsExtensionEnabled(WebGLExtensionID::WEBGL_draw_buffers));
+    resources.MaxDrawBuffers = (hasMRTs ? mGLMaxDrawBuffers : 1);
+
+    if (IsExtensionEnabled(WebGLExtensionID::EXT_frag_depth))
         resources.EXT_frag_depth = 1;
 
-    if (IsWebGL2() || IsExtensionEnabled(WebGLExtensionID::OES_standard_derivatives))
+    if (IsExtensionEnabled(WebGLExtensionID::OES_standard_derivatives))
         resources.OES_standard_derivatives = 1;
 
-    if (IsWebGL2() || IsExtensionEnabled(WebGLExtensionID::WEBGL_draw_buffers))
+    if (IsExtensionEnabled(WebGLExtensionID::WEBGL_draw_buffers))
         resources.EXT_draw_buffers = 1;
 
-    if (IsWebGL2() || IsExtensionEnabled(WebGLExtensionID::EXT_shader_texture_lod))
+    if (IsExtensionEnabled(WebGLExtensionID::EXT_shader_texture_lod))
         resources.EXT_shader_texture_lod = 1;
 
     // Tell ANGLE to allow highp in frag shaders. (unless disabled)
@@ -247,6 +256,15 @@ ShaderValidator::CanLinkTo(const ShaderValidator* prev, nsCString* const out_log
         return false;
     }
 
+    if (ShGetShaderVersion(prev->mHandle) != ShGetShaderVersion(mHandle)) {
+        nsPrintfCString error("Vertex shader version %d does not match"
+                              " fragment shader version %d.",
+                              ShGetShaderVersion(prev->mHandle),
+                              ShGetShaderVersion(mHandle));
+        *out_log = error;
+        return false;
+    }
+
     {
         const std::vector<sh::Uniform>* vertPtr = ShGetUniforms(prev->mHandle);
         const std::vector<sh::Uniform>* fragPtr = ShGetUniforms(mHandle);
diff --git a/dom/canvas/WebGLStrongTypes.h b/dom/canvas/WebGLStrongTypes.h
index f26c9fba86..039673a99e 100644
--- a/dom/canvas/WebGLStrongTypes.h
+++ b/dom/canvas/WebGLStrongTypes.h
@@ -275,14 +275,14 @@ STRONG_GLENUM_BEGIN(TexCompareMode)
 STRONG_GLENUM_END(TexCompareMode)
 
 STRONG_GLENUM_BEGIN(TexCompareFunc)
-    STRONG_GLENUM_VALUE(LEQUAL),
-    STRONG_GLENUM_VALUE(GEQUAL),
-    STRONG_GLENUM_VALUE(LESS),
-    STRONG_GLENUM_VALUE(GREATER),
-    STRONG_GLENUM_VALUE(EQUAL),
-    STRONG_GLENUM_VALUE(NOTEQUAL),
-    STRONG_GLENUM_VALUE(ALWAYS),
     STRONG_GLENUM_VALUE(NEVER),
+    STRONG_GLENUM_VALUE(LESS),
+    STRONG_GLENUM_VALUE(EQUAL),
+    STRONG_GLENUM_VALUE(LEQUAL),
+    STRONG_GLENUM_VALUE(GREATER),
+    STRONG_GLENUM_VALUE(NOTEQUAL),
+    STRONG_GLENUM_VALUE(GEQUAL),
+    STRONG_GLENUM_VALUE(ALWAYS),
 STRONG_GLENUM_END(TexCompareFunc)
 
 STRONG_GLENUM_BEGIN(TexFormat)
diff --git a/dom/canvas/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp
index bd89b2fb91..7abc4e0e74 100644
--- a/dom/canvas/WebGLTexture.cpp
+++ b/dom/canvas/WebGLTexture.cpp
@@ -164,9 +164,11 @@ WebGLTexture::MemoryUsage() const
     if (IsDeleted())
         return 0;
 
-    size_t result = 0;
-    MOZ_CRASH("todo");
-    return result;
+    size_t accum = 0;
+    for (const auto& cur : mImageInfoArr) {
+        accum += cur.MemoryUsage();
+    }
+    return accum;
 }
 
 void
@@ -740,6 +742,31 @@ WebGLTexture::GenerateMipmap(TexTarget texTarget)
         return;
     }
 
+    // OpenGL ES 3.0.4 p160:
+    // If the level base array was not specified with an unsized internal format from
+    // table 3.3 or a sized internal format that is both color-renderable and
+    // texture-filterable according to table 3.13, an INVALID_OPERATION error
+    // is generated.
+    const auto usage = baseImageInfo.mFormat;
+    bool canGenerateMipmap = (usage->isRenderable && usage->isFilterable);
+    switch (usage->format->effectiveFormat) {
+    case webgl::EffectiveFormat::Luminance8:
+    case webgl::EffectiveFormat::Alpha8:
+    case webgl::EffectiveFormat::Luminance8Alpha8:
+        // Non-color-renderable formats from Table 3.3.
+        canGenerateMipmap = true;
+        break;
+    default:
+        break;
+    }
+
+    if (!canGenerateMipmap) {
+        mContext->ErrorInvalidOperation("generateMipmap: Texture at base level is not unsized"
+                                        " internal format or is not"
+                                        " color-renderable or texture-filterable.");
+        return;
+    }
+
     // Done with validation. Do the operation.
 
     mContext->MakeContextCurrent();
diff --git a/dom/canvas/WebGLTextureUpload.cpp b/dom/canvas/WebGLTextureUpload.cpp
index d63642c399..b0a019eb2c 100644
--- a/dom/canvas/WebGLTextureUpload.cpp
+++ b/dom/canvas/WebGLTextureUpload.cpp
@@ -1784,7 +1784,8 @@ WebGLTexture::CopyTexImage2D(TexImageTarget target, GLint level, GLenum internal
 
     GLenum error;
     if (rwWidth == uint32_t(width) && rwHeight == uint32_t(height)) {
-        error = DoCopyTexImage2D(gl, target, level, internalFormat, x, y, width, height,
+        MOZ_ASSERT(dstUsage->idealUnpack);
+        error = DoCopyTexImage2D(gl, target, level, dstUsage->idealUnpack->internalFormat, x, y, width, height,
                                  border);
     } else {
         // 1. Zero the texture data.
diff --git a/dom/canvas/WebGLValidateStrings.cpp b/dom/canvas/WebGLValidateStrings.cpp
index 4aa4ad582f..9df3fef709 100644
--- a/dom/canvas/WebGLValidateStrings.cpp
+++ b/dom/canvas/WebGLValidateStrings.cpp
@@ -141,7 +141,7 @@ ValidateGLSLVariableName(const nsAString& name, WebGLContext* webgl, const char*
     if (name.IsEmpty())
         return false;
 
-    const uint32_t maxSize = 256;
+    const uint32_t maxSize = webgl->IsWebGL2() ? 1024 : 256;
     if (name.Length() > maxSize) {
         webgl->ErrorInvalidValue("%s: Identifier is %d characters long, exceeds the"
                                  " maximum allowed length of %d characters.",
diff --git a/dom/canvas/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h
index d2716af26c..94b71bc7cc 100644
--- a/dom/canvas/WebGLVertexAttribData.h
+++ b/dom/canvas/WebGLVertexAttribData.h
@@ -52,12 +52,18 @@ struct WebGLVertexAttribData
         case LOCAL_GL_UNSIGNED_SHORT:
             return sizeof(GLushort);
 
+        case LOCAL_GL_INT:
+            return sizeof(GLint);
+
+        case LOCAL_GL_UNSIGNED_INT:
+            return sizeof(GLuint);
+
         // case LOCAL_GL_FIXED:
         case LOCAL_GL_FLOAT:
             return sizeof(GLfloat);
 
         default:
-            NS_ERROR("Should never get here!");
+            MOZ_ASSERT(false, "Should never get here!");
             return 0;
         }
     }
diff --git a/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html b/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
index a12bd63960..ef8ba96dc9 100644
--- a/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
+++ b/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
@@ -205,11 +205,7 @@ function beginTest() {
   }
 }
 
-var prefs = [
-  [ "canvas.capturestream.enabled", true ],
-];
-SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
-
+beginTest();
 </script>
 </pre>
 </body>
diff --git a/dom/canvas/test/crossorigin/test_video_crossorigin.html b/dom/canvas/test/crossorigin/test_video_crossorigin.html
index 4183d13aa2..0ac69ac1a3 100644
--- a/dom/canvas/test/crossorigin/test_video_crossorigin.html
+++ b/dom/canvas/test/crossorigin/test_video_crossorigin.html
@@ -211,13 +211,8 @@ function beginTest() {
   document.manager.runTests(corsTests, startTest);
 }
 
-var prefs = [
-  [ "canvas.capturestream.enabled", true ],
-];
-
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
-
+beginTest();
 </script>
 </pre>
 </body>
diff --git a/dom/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list
index 1a781a7ffc..6d2f299680 100644
--- a/dom/canvas/test/reftest/reftest.list
+++ b/dom/canvas/test/reftest/reftest.list
@@ -20,7 +20,7 @@ pref(webgl.force-layers-readback,true)  == webgl-clear-test.html?readback wrappe
 == webgl-resize-test.html  wrapper.html?green.png
 
 # Check that captureStream() displays in a local video element
-pref(canvas.capturestream.enabled,true) skip-if(winWidget&&layersGPUAccelerated&&d2d) == webgl-capturestream-test.html?preserve wrapper.html?green.png
+skip-if(winWidget&&layersGPUAccelerated&&d2d) == webgl-capturestream-test.html?preserve wrapper.html?green.png
 
 # Some of the failure conditions are a little crazy. I'm (jgilbert) setting these based on
 # failures encountered when running on Try, and then targetting the Try config by
@@ -157,6 +157,6 @@ pref(canvas.focusring.enabled,true) skip-if(B2G) skip-if(Android&&AndroidVersion
 pref(canvas.customfocusring.enabled,true) skip-if(B2G) skip-if(Android&&AndroidVersion<15,8,500) skip-if(winWidget) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html
 
 # Check that captureStream() displays in a local video element
-pref(canvas.capturestream.enabled,true) skip-if(winWidget&&layersGPUAccelerated&&d2d) == capturestream.html wrapper.html?green.png
+skip-if(winWidget&&layersGPUAccelerated&&d2d) == capturestream.html wrapper.html?green.png
 
 fuzzy-if(Android,3,40) == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds-ref.html
diff --git a/dom/canvas/test/test_capture.html b/dom/canvas/test/test_capture.html
index 513ef4b172..ec2902b3ac 100644
--- a/dom/canvas/test/test_capture.html
+++ b/dom/canvas/test/test_capture.html
@@ -107,9 +107,6 @@ function beginTest() {
 
 SimpleTest.waitForExplicitFinish();
 
-var prefs = [
-  [ "canvas.capturestream.enabled", true ],
-];
-SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+beginTest();
 </script>
 
diff --git a/dom/canvas/test/webgl-mochitest/test_capture.html b/dom/canvas/test/webgl-mochitest/test_capture.html
index fad4ac37a6..489d678723 100644
--- a/dom/canvas/test/webgl-mochitest/test_capture.html
+++ b/dom/canvas/test/webgl-mochitest/test_capture.html
@@ -171,9 +171,6 @@ function beginTest() {
 
 SimpleTest.waitForExplicitFinish();
 
-var prefs = [
-  [ "canvas.capturestream.enabled", true ],
-];
-SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+beginTest();
 </script>
 
diff --git a/dom/downloads/DownloadsAPI.js b/dom/downloads/DownloadsAPI.js
index daf3c95ed0..48e3edcb72 100644
--- a/dom/downloads/DownloadsAPI.js
+++ b/dom/downloads/DownloadsAPI.js
@@ -21,6 +21,12 @@ XPCOMUtils.defineLazyServiceGetter(this, "volumeService",
                                    "@mozilla.org/telephony/volume-service;1",
                                     "nsIVolumeService");
 
+/**
+  * The content process implementations of navigator.mozDownloadManager and its
+  * DOMDownload download objects.  Uses DownloadsIPC.jsm to communicate with
+  * DownloadsAPI.jsm in the parent process.
+  */
+
 function debug(aStr) {
 #ifdef MOZ_DEBUG
   dump("-*- DownloadsAPI.js : " + aStr + "\n");
@@ -40,6 +46,15 @@ DOMDownloadManagerImpl.prototype = {
     this.initDOMRequestHelper(aWindow,
                               ["Downloads:Added",
                                "Downloads:Removed"]);
+
+    // Get the manifest URL if this is an installed app
+    let appsService = Cc["@mozilla.org/AppsService;1"]
+                        .getService(Ci.nsIAppsService);
+    let principal = aWindow.document.nodePrincipal;
+    // This returns the empty string if we're not an installed app.  Coerce to
+    // null.
+    this._manifestURL = appsService.getManifestURLByLocalId(principal.appId) ||
+                          null;
   },
 
   uninit: function() {
@@ -79,23 +94,8 @@ DOMDownloadManagerImpl.prototype = {
 
   clearAllDone: function() {
     debug("clearAllDone()");
-    return this.createPromise(function (aResolve, aReject) {
-      DownloadsIPC.clearAllDone().then(
-        function(aDownloads) {
-          // Turn the list of download objects into DOM objects and
-          // send them.
-          let array = new this._window.Array();
-          for (let id in aDownloads) {
-            let dom = createDOMDownloadObject(this._window, aDownloads[id]);
-            array.push(this._prepareForContent(dom));
-          }
-          aResolve(array);
-        }.bind(this),
-        function() {
-          aReject("ClearAllDoneError");
-        }
-      );
-    }.bind(this));
+    // This is a void function; we just kick it off.  No promises, etc.
+    DownloadsIPC.clearAllDone();
   },
 
   remove: function(aDownload) {
@@ -121,6 +121,67 @@ DOMDownloadManagerImpl.prototype = {
     }.bind(this));
   },
 
+  adoptDownload: function(aAdoptDownloadDict) {
+    // Our AdoptDownloadDict only includes simple types, which WebIDL enforces.
+    // We have no object/any types so we do not need to worry about invoking
+    // JSON.stringify (and it inheriting our security privileges).
+    debug("adoptDownload");
+    return this.createPromise(function (aResolve, aReject) {
+      if (!aAdoptDownloadDict) {
+        debug("Download dictionary is required!");
+        aReject("InvalidDownload");
+        return;
+      }
+      if (!aAdoptDownloadDict.storageName || !aAdoptDownloadDict.storagePath ||
+          !aAdoptDownloadDict.contentType) {
+        debug("Missing one of: storageName, storagePath, contentType");
+        aReject("InvalidDownload");
+        return;
+      }
+
+      // Convert storageName/storagePath to a local filesystem path.
+      let volume;
+      // getVolumeByName throws if you give it something it doesn't like
+      // because XPConnect converts the NS_ERROR_NOT_AVAILABLE to an
+      // exception.  So catch it.
+      try {
+        volume = volumeService.getVolumeByName(aAdoptDownloadDict.storageName);
+      } catch (ex) {}
+      if (!volume) {
+        debug("Invalid storage name: " + aAdoptDownloadDict.storageName);
+        aReject("InvalidDownload");
+        return;
+      }
+      let computedPath = volume.mountPoint + '/' +
+                           aAdoptDownloadDict.storagePath;
+      // We validate that there is actually a file at the given path in the
+      // parent process in DownloadsAPI.js because that's where the file
+      // access would actually occur either way.
+
+      // Create a DownloadsAPI.jsm 'jsonDownload' style representation.
+      let jsonDownload = {
+        url: aAdoptDownloadDict.url,
+        path: computedPath,
+        contentType: aAdoptDownloadDict.contentType,
+        startTime: aAdoptDownloadDict.startTime.valueOf() || Date.now(),
+        sourceAppManifestURL: this._manifestURL
+      };
+
+      DownloadsIPC.adoptDownload(jsonDownload).then(
+        function(aResult) {
+          let domDownload = createDOMDownloadObject(this._window, aResult);
+          aResolve(this._prepareForContent(domDownload));
+        }.bind(this),
+        function(aResult) {
+          // This will be one of: AdoptError (generic catch-all),
+          // AdoptNoSuchFile, AdoptFileIsDirectory
+          aReject(aResult.error);
+        }
+      );
+    }.bind(this));
+  },
+
+
   /**
     * Turns a chrome download object into a content accessible one.
     * When we have __DOM_IMPL__ available we just use that, otherwise
@@ -295,6 +356,11 @@ DOMDownloadImpl.prototype = {
     }
   },
 
+  /**
+    * Initialize a DOMDownload instance for the given window using the
+    * 'jsonDownload' serialized format of the download encoded by
+    * DownloadsAPI.jsm.
+    */
   _init: function(aWindow, aDownload) {
     this._window = aWindow;
     this.id = aDownload.id;
@@ -314,12 +380,13 @@ DOMDownloadImpl.prototype = {
     }
 
     let props = ["totalBytes", "currentBytes", "url", "path", "storageName",
-                 "storagePath", "state", "contentType", "startTime"];
+                 "storagePath", "state", "contentType", "startTime",
+                 "sourceAppManifestURL"];
     let changed = false;
     let changedProps = {};
 
     props.forEach((prop) => {
-      if (aDownload[prop] && (aDownload[prop] != this[prop])) {
+      if (prop in aDownload && (aDownload[prop] != this[prop])) {
         this[prop] = aDownload[prop];
         changedProps[prop] = changed = true;
       }
diff --git a/dom/downloads/DownloadsAPI.jsm b/dom/downloads/DownloadsAPI.jsm
index 41a6db26bd..511ff92c91 100644
--- a/dom/downloads/DownloadsAPI.jsm
+++ b/dom/downloads/DownloadsAPI.jsm
@@ -13,11 +13,19 @@ this.EXPORTED_SYMBOLS = [];
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Downloads.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/osfile.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
                                    "@mozilla.org/parentprocessmessagemanager;1",
                                    "nsIMessageBroadcaster");
 
+/**
+  * Parent process logic that services download API requests from the
+  * DownloadAPI.js instances in content processeses.  The actual work of managing
+  * downloads is done by Toolkit's Downloads.jsm.  This module is loaded by B2G's
+  * shell.js
+  */
+
 function debug(aStr) {
 #ifdef MOZ_DEBUG
   dump("-*- DownloadsAPI.jsm : " + aStr + "\n");
@@ -49,7 +57,8 @@ let DownloadsAPI = {
      "Downloads:ClearAllDone",
      "Downloads:Remove",
      "Downloads:Pause",
-     "Downloads:Resume"].forEach((msgName) => {
+     "Downloads:Resume",
+     "Downloads:Adopt"].forEach((msgName) => {
       ppmm.addMessageListener(msgName, this);
     });
 
@@ -92,7 +101,9 @@ let DownloadsAPI = {
       url: aDownload.source.url,
       path: aDownload.target.path,
       contentType: aDownload.contentType,
-      startTime: aDownload.startTime.getTime()
+      startTime: aDownload.startTime.getTime(),
+      sourceAppManifestURL: aDownload._unknownProperties &&
+                              aDownload._unknownProperties.sourceAppManifestURL
     };
 
     if (aDownload.error) {
@@ -165,6 +176,9 @@ let DownloadsAPI = {
     case "Downloads:Resume":
       this.resume(aMessage.data, aMessage.target);
       break;
+    case "Downloads:Adopt":
+      this.adoptDownload(aMessage.data, aMessage.target);
+      break;
     default:
       debug("Invalid message: " + aMessage.name);
     }
@@ -186,17 +200,9 @@ let DownloadsAPI = {
 
   clearAllDone: function(aData, aMm) {
     debug("clearAllDone called!");
-    let self = this;
     Task.spawn(function () {
       let list = yield Downloads.getList(Downloads.ALL);
-      yield list.removeFinished();
-      list = yield Downloads.getList(Downloads.ALL);
-      let downloads = yield list.getAll();
-      let res = [];
-      downloads.forEach((aDownload) => {
-        res.push(self.jsonDownload(aDownload));
-      });
-      aMm.sendAsyncMessage("Downloads:ClearAllDone:Return", res);
+      list.removeFinished();
     }).then(null, Components.utils.reportError);
   },
 
@@ -262,6 +268,97 @@ let DownloadsAPI = {
                            aData, "ResumeError");
       }
     );
+  },
+
+  /**
+    * Receive a download to adopt in the same representation we produce from
+    * our "jsonDownload" normalizer and add it to the list of downloads.
+    */
+  adoptDownload: function(aData, aMm) {
+    let adoptJsonRep = aData.jsonDownload;
+    debug("adoptDownload " + uneval(adoptJsonRep));
+
+    Task.spawn(function* () {
+      // Verify that the file exists on disk.  This will result in a rejection
+      // if the file does not exist.  We will also use this information for the
+      // file size to avoid weird inconsistencies.  We ignore the filesystem
+      // timestamp in favor of whatever the caller is telling us.
+      let fileInfo = yield OS.File.stat(adoptJsonRep.path);
+
+      // We also require that the file is not a directory.
+      if (fileInfo.isDir) {
+        throw new Error("AdoptFileIsDirectory");
+      }
+
+      // We need to create a Download instance to add to the list.  Create a
+      // serialized representation and then from there the instance.
+      let serializedRep = {
+        // explicit initializations in toSerializable
+        source: {
+          url: adoptJsonRep.url
+          // This is where isPrivate would go if adoption supported private
+          // browsing.
+        },
+        target: {
+          path: adoptJsonRep.path,
+        },
+        startTime: adoptJsonRep.startTime,
+        // kPlainSerializableDownloadProperties propagations
+        succeeded: true, // (all adopted downloads are required to be completed)
+        totalBytes: fileInfo.size,
+        contentType: adoptJsonRep.contentType,
+        // unknown properties added/used by the DownloadsAPI
+        currentBytes: fileInfo.size,
+        sourceAppManifestURL: adoptJsonRep.sourceAppManifestURL
+      };
+
+      let download = yield Downloads.createDownload(serializedRep);
+
+      // The ALL list is a DownloadCombinedList instance that combines the
+      // PUBLIC (persisted to disk) and PRIVATE (ephemeral) download lists..
+      // When we call add on it, it dispatches to the appropriate list based on
+      // the 'isPrivate' field of the source.  (Which we don't initialize and
+      // defaults to false.)
+      let allDownloadList = yield Downloads.getList(Downloads.ALL);
+
+      // This add will automatically notify all views of the added download,
+      // including DownloadsAPI instances and the DownloadAutoSaveView that's
+      // subscribed to the PUBLIC list and will save the download.
+      yield allDownloadList.add(download);
+
+      debug("download adopted");
+      // The notification above occurred synchronously, and so we will have
+      // already dispatched an added notification for our download to the child
+      // process in question.  As such, we only need to relay the download id
+      // since the download will already have been cached.
+      return download;
+    }.bind(this)).then(
+      (download) => {
+        sendPromiseMessage(aMm, "Downloads:Adopt:Return",
+                           {
+                             id: this.downloadId(download),
+                             promiseId: aData.promiseId
+                           });
+      },
+      (ex) => {
+        let reportAs = "AdoptError";
+        // Provide better error codes for expected errors.
+        if (ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
+          reportAs = "AdoptNoSuchFile";
+        } else if (ex.message === "AdoptFileIsDirectory") {
+          reportAs = ex.message;
+        } else {
+          // Anything else is unexpected and should be reported to help track
+          // down what's going wrong.
+          debug("unexpected download error: " + ex);
+          Cu.reportError(ex);
+        }
+        sendPromiseMessage(aMm, "Downloads:Adopt:Return",
+                           {
+                             promiseId: aData.promiseId
+                           },
+                           reportAs);
+    });
   }
 };
 
diff --git a/dom/downloads/DownloadsIPC.jsm b/dom/downloads/DownloadsIPC.jsm
index 723e83de66..0e290abf41 100644
--- a/dom/downloads/DownloadsIPC.jsm
+++ b/dom/downloads/DownloadsIPC.jsm
@@ -36,10 +36,10 @@ const ipcMessages = ["Downloads:Added",
                      "Downloads:Removed",
                      "Downloads:Changed",
                      "Downloads:GetList:Return",
-                     "Downloads:ClearAllDone:Return",
                      "Downloads:Remove:Return",
                      "Downloads:Pause:Return",
-                     "Downloads:Resume:Return"];
+                     "Downloads:Resume:Return",
+                     "Downloads:Adopt:Return"];
 
 this.DownloadsIPC = {
   downloads: {},
@@ -54,7 +54,6 @@ this.DownloadsIPC = {
     // We need to get the list of current downloads.
     this.ready = false;
     this.getListPromises = [];
-    this.clearAllPromises = [];
     this.downloadPromises = {};
     cpmm.sendAsyncMessage("Downloads:GetList", {});
     this._promiseId = 0;
@@ -93,12 +92,6 @@ this.DownloadsIPC = {
         }
         this.ready = true;
         break;
-      case "Downloads:ClearAllDone:Return":
-        this._updateDownloadsArray(download);
-        this.clearAllPromises.forEach(aPromise =>
-                                      aPromise.resolve(this.downloads));
-        this.clearAllPromises.length = 0;
-        break;
       case "Downloads:Added":
         this.downloads[download.id] = download;
         this.notifyChanges(download.id);
@@ -139,6 +132,7 @@ this.DownloadsIPC = {
       case "Downloads:Remove:Return":
       case "Downloads:Pause:Return":
       case "Downloads:Resume:Return":
+      case "Downloads:Adopt:Return":
         if (this.downloadPromises[download.promiseId]) {
           if (!download.error) {
             this.downloadPromises[download.promiseId].resolve(download);
@@ -167,14 +161,11 @@ this.DownloadsIPC = {
   },
 
   /**
-    * Returns a promise that is resolved with the list of current downloads.
-    */
+   * Void function to trigger removal of completed downloads.
+   */
   clearAllDone: function() {
     debug("clearAllDone");
-    let deferred = Promise.defer();
-    this.clearAllPromises.push(deferred);
     cpmm.sendAsyncMessage("Downloads:ClearAllDone", {});
-    return deferred.promise;
   },
 
   promiseId: function() {
@@ -211,6 +202,16 @@ this.DownloadsIPC = {
     return deferred.promise;
   },
 
+  adoptDownload: function(aJsonDownload) {
+    debug("adoptDownload");
+    let deferred = Promise.defer();
+    let pId = this.promiseId();
+    this.downloadPromises[pId] = deferred;
+    cpmm.sendAsyncMessage("Downloads:Adopt",
+                          { jsonDownload: aJsonDownload, promiseId: pId });
+    return deferred.promise;
+  },
+
   observe: function(aSubject, aTopic, aData) {
     if (aTopic == "xpcom-shutdown") {
       ipcMessages.forEach((aMessage) => {
diff --git a/dom/downloads/tests/clear_all_done_helper.js b/dom/downloads/tests/clear_all_done_helper.js
new file mode 100644
index 0000000000..62fa1a2f30
--- /dev/null
+++ b/dom/downloads/tests/clear_all_done_helper.js
@@ -0,0 +1,67 @@
+/**
+ * A helper to clear out the existing downloads known to the mozDownloadManager
+ * / downloads.js.
+ *
+ * It exists because previously mozDownloadManager.clearAllDone() thought that
+ * when it returned that all the completed downloads would be cleared out.  It
+ * was wrong and this led to various intermittent test failurse.  In discussion
+ * on https://bugzil.la/979446#c13 and onwards, it was decided that
+ * clearAllDone() was in the wrong and that the jsdownloads API it depends on
+ * was not going to change to make it be in the right.
+ *
+ * The existing uses of clearAllDone() in tests seemed to be about:
+ * - Exploding if there was somehow still a download in progress
+ * - Clearing out the download list at the start of a test so that calls to
+ *   getDownloads() wouldn't have to worry about existing downloads, etc.
+ *
+ * From discussion, the right way to handle clearing is to wait for the expected
+ * removal events to occur for the existing downloads.  So that's what we do.
+ * We still generate a test failure if there are any in-progress downloads.
+ *
+ * @param {Boolean} [getDownloads=false]
+ *   If true, invoke getDownloads after clearing the download list and return
+ *   its value.
+ */
+function clearAllDoneHelper(getDownloads) {
+  var clearedPromise = new Promise(function(resolve, reject) {
+    function gotDownloads(downloads) {
+      // If there are no downloads, we're already done.
+      if (downloads.length === 0) {
+        resolve();
+        return;
+      }
+
+      // Track the set of expected downloads that will be finalized.
+      var expectedIds = new Set();
+      function changeHandler(evt) {
+        var download = evt.download;
+        if (download.state === "finalized") {
+          expectedIds.delete(download.id);
+          if (expectedIds.size === 0) {
+            resolve();
+          }
+        }
+      }
+      downloads.forEach(function(download) {
+        if (download.state === "downloading") {
+          ok(false, "A download is still active: " + download.path);
+          reject("Active download");
+        }
+        download.onstatechange = changeHandler;
+        expectedIds.add(download.id);
+      });
+      navigator.mozDownloadManager.clearAllDone();
+    }
+    function gotBadNews(err) {
+      ok(false, "Problem clearing all downloads: " + err);
+      reject(err);
+    }
+    navigator.mozDownloadManager.getDownloads().then(gotDownloads, gotBadNews);
+ });
+ if (!getDownloads) {
+   return clearedPromise;
+ }
+ return clearedPromise.then(function() {
+   return navigator.mozDownloadManager.getDownloads();
+ });
+}
diff --git a/dom/downloads/tests/common_app.js b/dom/downloads/tests/common_app.js
new file mode 100644
index 0000000000..f66b154d5e
--- /dev/null
+++ b/dom/downloads/tests/common_app.js
@@ -0,0 +1,19 @@
+function is(a, b, msg) {
+  alert((a === b ? 'OK' : 'KO') + ' ' + a + ' should equal ' + b + ': ' + msg);
+}
+
+function ok(a, msg) {
+  alert((a ? 'OK' : 'KO')+ ' ' + msg);
+}
+
+function info(msg) {
+  alert('INFO ' + msg);
+}
+
+function cbError() {
+  alert('KO error');
+}
+
+function finish() {
+  alert('DONE');
+}
diff --git a/dom/downloads/tests/file_app.sjs b/dom/downloads/tests/file_app.sjs
new file mode 100644
index 0000000000..2ce4f7d694
--- /dev/null
+++ b/dom/downloads/tests/file_app.sjs
@@ -0,0 +1,55 @@
+var gBasePath = "tests/dom/downloads/tests/";
+var gTemplate = "file_app.template.webapp";
+
+function handleRequest(request, response) {
+  var query = getQuery(request);
+
+  var testToken = query.testToken || '';
+  var appType = query.appType || 'web';
+
+  var template = gBasePath + gTemplate;
+  response.setHeader("Content-Type", "application/x-web-app-manifest+json", false);
+  var body = readTemplate(template)
+               .replace(/TESTTOKEN/g, testToken)
+               .replace(/APPTYPE/g, appType);
+  response.write();
+}
+
+// Copy-pasted incantations. There ought to be a better way to synchronously read
+// a file into a string, but I guess we're trying to discourage that.
+function readTemplate(path) {
+  var file = Components.classes["@mozilla.org/file/directory_service;1"].
+                        getService(Components.interfaces.nsIProperties).
+                        get("CurWorkD", Components.interfaces.nsILocalFile);
+  var fis  = Components.classes['@mozilla.org/network/file-input-stream;1'].
+                        createInstance(Components.interfaces.nsIFileInputStream);
+  var cis = Components.classes["@mozilla.org/intl/converter-input-stream;1"].
+                       createInstance(Components.interfaces.nsIConverterInputStream);
+  var split = path.split("/");
+  for(var i = 0; i < split.length; ++i) {
+    file.append(split[i]);
+  }
+  fis.init(file, -1, -1, false);
+  cis.init(fis, "UTF-8", 0, 0);
+
+  var data = "";
+  let (str = {}) {
+    let read = 0;
+    do {
+      read = cis.readString(0xffffffff, str); // read as much as we can and put it in str.value
+      data += str.value;
+    } while (read != 0);
+  }
+  cis.close();
+  return data;
+}
+
+function getQuery(request) {
+  var query = {};
+  request.queryString.split('&').forEach(function (val) {
+    var [name, value] = val.split('=');
+    query[name] = unescape(value);
+  });
+  return query;
+}
+
diff --git a/dom/downloads/tests/file_app.template.webapp b/dom/downloads/tests/file_app.template.webapp
new file mode 100644
index 0000000000..598a9410b2
--- /dev/null
+++ b/dom/downloads/tests/file_app.template.webapp
@@ -0,0 +1,7 @@
+{
+  "name": "Really Rapid Release (hosted)",
+  "description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
+  "type": "APPTYPE",
+  "launch_path": "/tests/dom/downloads/tests/TESTTOKEN",
+  "icons": { "128": "default_icon" }
+}
diff --git a/dom/downloads/tests/mochitest.ini b/dom/downloads/tests/mochitest.ini
index aee62b6394..3c85d28398 100644
--- a/dom/downloads/tests/mochitest.ini
+++ b/dom/downloads/tests/mochitest.ini
@@ -1,12 +1,24 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' # bug 979446, frequent failures
+# The actual requirement for mozDownloadManager is MOZ_GONK because of
+# the nsIVolumeService dependency.  Until https://bugzil.la/1130264 is
+# addressed, there is no way for mulet to run these tests.
+run-if = toolkit == 'gonk'
 support-files =
   serve_file.sjs
+  clear_all_done_helper.js
+  file_app.template.webapp
+  file_app.sjs
+  common_app.js
+  shim_app_as_test.js
+  shim_app_as_test_chrome.js
+  testapp_downloads_adopt_download.html
+  testapp_downloads_adopt_download.js
+  testapp_downloads_adopt_download.manifest
 
 [test_downloads_navigator_object.html]
 [test_downloads_basic.html]
 [test_downloads_large.html]
+[test_downloads_adopt_download.html]
 [test_downloads_bad_file.html]
 [test_downloads_pause_remove.html]
 [test_downloads_pause_resume.html]
-skip-if = toolkit=='gonk' # b2g(bug 947167) b2g-debug(bug 947167)
diff --git a/dom/downloads/tests/shim_app_as_test.js b/dom/downloads/tests/shim_app_as_test.js
new file mode 100644
index 0000000000..18846fa45a
--- /dev/null
+++ b/dom/downloads/tests/shim_app_as_test.js
@@ -0,0 +1,210 @@
+/**
+ * Support logic to run a test file as an installed app.  This file is derived
+ * from dom/requestsync/tests/test_basic_app.html but uses
+ * DOMApplicationRegistry in a chrome script (shim_app_as_test_chrome.js) to
+ * directly install the apps instead of mozApps.install because mozApps.install
+ * can't install privileged/certified apps.  (This is the same mechanism used by
+ * the Firefox OS Gaia email app's backend test runner.)
+ *
+ * You really only want to do this if your test cares about the app's origin
+ * or you REALLY want to double-check AvailableIn and other WebIDL-provided
+ * security mechanisms.
+ *
+ * If you trust WebIDL, your life may be made significantly easier by just
+ * setting the pref "dom.ignore_webidl_scope_checks" to true, which makes
+ * BindingUtils.cpp's IsInPrivilegedApp and IsInCertifiedApp return true no
+ * matter what *on the main thread*.  You are potentially out of luck on
+ * workers since at the time of writing this since the values stored on
+ * WorkerPrivateParent are based on the app status and ignore the pref.
+ *
+ * TO USE THIS:
+ *
+ * Make sure you have the usual header boilerplate:
+ *   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ *   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+ *
+ * You also want to add this file!
+ *   <script type="application/javascript" src="shim_app_as_test.js"></script>
+ *
+ * In your script body, issue a call like so:
+ * runAppTest({
+ *   appFile: 'testapp_downloads_adopt_download.html',
+ *   appManifest: 'testapp_downloads_adopt_download.manifest',
+ *   appType: 'certified',
+ *   extraPrefs: {
+ *     set: [["dom.mozDownloads.enabled", true]]
+ *   }
+ * });
+ *
+ * You shouldn't be adding other stuff to that file.  Instead, you want
+ * everything in your testapp_*.html file.  And you probably just want to copy
+ * and paste from an existing one of those...
+ */
+
+  var gManifestURL;
+  var gApp;
+  var gOptions;
+
+  // Load the chrome script.
+  var gChromeHelper = SpecialPowers.loadChromeScript(
+                        SimpleTest.getTestFileURL('shim_app_as_test_chrome.js'));
+
+  function installApp() {
+    info("installing app");
+    var useOrigin = document.location.origin;
+    gChromeHelper.sendAsyncMessage(
+      'install',
+      {
+        origin: useOrigin,
+        manifestURL: SimpleTest.getTestFileURL(gOptions.appManifest),
+      });
+  }
+
+  function installedApp(appInfo) {
+    gApp = appInfo;
+    ok(!!appInfo, 'installed app');
+    runTests();
+  }
+  gChromeHelper.addMessageListener('installed', installedApp);
+
+  function uninstallApp() {
+    info('uninstalling app');
+    gChromeHelper.sendAsyncMessage('uninstall', gApp);
+  }
+
+  function uninstalledApp(success) {
+    ok(success, 'uninstalled app');
+    runTests();
+  }
+  gChromeHelper.addMessageListener('uninstalled', uninstalledApp);
+
+  function testApp() {
+    var cleanupFrame;
+    var handleTestMessage = function(message) {
+      if (/^OK/.exec(message)) {
+        ok(true, "Message from app: " + message);
+      } else if (/^KO/.exec(message)) {
+        ok(false, "Message from app: " + message);
+      } else if (/^INFO/.exec(message)) {
+        info("Message from app: " + message.substring(5));
+      } else if (/^DONE$/.exec(message)) {
+        ok(true, "Messaging from app complete");
+        cleanupFrame();
+        runTests();
+      }
+    };
+
+    // Bug 1097479 means that embed-webapps does not work if you are already
+    // OOP, as we are for b2g.  So we need to have the chrome script run our
+    // app in a sibling iframe to the one we're living in.  When that bug is
+    // fixed or we are run in a non-b2g context, we can set this value to false
+    // or otherwise conditionalize based on behaviour.
+    var needSiblingIframeHack = true;
+
+    if (needSiblingIframeHack) {
+      gChromeHelper.sendAsyncMessage('run', gApp);
+
+      gChromeHelper.addMessageListener('appMessage', handleTestMessage);
+      gChromeHelper.addMessageListener('appError', function(data) {
+        ok(false, "Error in app frame: " + data.message);
+      });
+
+      cleanupFrame = function() {
+        gChromeHelper.sendAsyncMessage('close', {});
+      };
+    } else {
+      var ifr = document.createElement('iframe');
+      ifr.setAttribute('mozbrowser', 'true');
+      ifr.setAttribute('mozapp', gApp.manifestURL);
+
+      cleanupFrame = function() {
+        ifr.removeEventListener('mozbrowsershowmodalprompt', listener);
+        domParent.removeChild(ifr);
+      };
+
+      // Set us up to listen for messages from the app.
+      var listener = function(e) {
+        var message = e.detail.message; // e.detail.message;
+        handleTestMessage(message);
+      };
+
+      // This event is triggered when the app calls "alert".
+      ifr.addEventListener('mozbrowsershowmodalprompt', listener, false);
+      ifr.addEventListener('mozbrowsererror', function(evt) {
+        ok(false, "Error in app frame: " + evt.detail);
+      });
+
+      ifr.setAttribute('src', gApp.manifest.launch_path);
+      var domParent = document.getElementById('content');
+      if (!domParent) {
+        document.createElement('div');
+        document.body.insertBefore(domParent, document.body.firstChild);
+      }
+      domParent.appendChild(ifr);
+    }
+  }
+
+  var tests = [
+    // Permissions
+    function() {
+      info("pushing permissions");
+      SpecialPowers.pushPermissions(
+        [{ "type": "browser", "allow": 1, "context": document },
+         { "type": "embed-apps", "allow": 1, "context": document },
+         { "type": "webapps-manage", "allow": 1, "context": document }
+        ],
+        runTests);
+    },
+
+    // Preferences
+    function() {
+      info("pushing preferences: " + gOptions.extraPrefs.set);
+      SpecialPowers.pushPrefEnv({
+        "set": gOptions.extraPrefs.set
+      }, runTests);
+    },
+
+    function() {
+      info("enabling use of mozbrowser");
+      //SpecialPowers.setAllAppsLaunchable(true);
+      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
+      runTests();
+    },
+
+    // No confirmation needed when an app is installed
+    function() {
+      SpecialPowers.autoConfirmAppInstall(function() {
+        SpecialPowers.autoConfirmAppUninstall(runTests);
+      });
+    },
+
+    // Installing the app
+    installApp,
+
+    // Run tests in app
+    testApp,
+
+    // Uninstall the app
+    uninstallApp,
+  ];
+
+  function runTests() {
+    if (!tests.length) {
+      ok(true, 'DONE!');
+      SimpleTest.finish();
+      return;
+    }
+
+    var test = tests.shift();
+    test();
+  }
+
+  SimpleTest.waitForExplicitFinish();
+
+  function runAppTest(options) {
+    gOptions = options;
+    var href = document.location.href;
+    gManifestURL = href.substring(0, href.lastIndexOf('/') + 1) +
+      options.appManifest;
+    runTests();
+  }
diff --git a/dom/downloads/tests/shim_app_as_test_chrome.js b/dom/downloads/tests/shim_app_as_test_chrome.js
new file mode 100644
index 0000000000..4d1f5bc9e1
--- /dev/null
+++ b/dom/downloads/tests/shim_app_as_test_chrome.js
@@ -0,0 +1,178 @@
+/**
+ * This is the chrome helper for shim_app_as_test.js.  Its load is triggered by
+ * shim_app_as_test.js by a call to SpecialPowers.loadChromeScript and runs
+ * in the parent process in a sandbox created with the system principal.  (Which
+ * seems like it can never get collected because it's reachable via the
+ * apparently singleton SpecialPowersObserverAPI instance and there's no logic
+ * to support reaping.  Wuh-oh.)
+ *
+ * It exists to help install fake privileged/certified applications.  It needs
+ * to exist because:
+ * - We need to poke at DOMApplicationRegistry directly.
+ * - By using SpecialPowers.loadChromeScript we are able to ensure this file
+ *   is run in the parent process.  This is important because
+ *   DOMApplicationRegistry only lives in the parent process!
+ * - By running entirely in a chrome privileged compartment, we avoid crazy
+ *   wrapper problems that we would otherwise face with our shenanigans of
+ *   directly meddling with DOMApplicationRegistry.  (And hopefully save
+ *   anyone changing DOMApplicationRegistry from frustration/hating us if
+ *   things were just barely working.)
+ * - Bug 1097479 means that embed-webapps doesn't work when the content process
+ *   that is telling us to do things is itself OOP.  So it falls upon us to
+ *   handle the running of the app by creating a sibling mozbrowser/mozapp
+ *   iframe to the one running the mochitests.
+ *
+ * Note that in this file we try to do *only* those things that can't otherwise
+ * be cleanly done using SpecialPowers.
+ *
+ * Want to better understand our execution context?  Check out
+ * SpecialPowersObserverAPI.js and search on SPLoadChromeScript.
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const CC = Components.Constructor;
+
+Cu.import('resource://gre/modules/Webapps.jsm'); // for DOMApplicationRegistry
+Cu.import('resource://gre/modules/AppsUtils.jsm'); // for AppUtils
+Cu.import('resource://gre/modules/Services.jsm'); // for AppUtils
+
+// Yes, you would think there was something like this already exposed easily
+// in a JSM somewhere.  No.
+function fetchManifest(manifestURL) {
+  return new Promise(function(resolve, reject) {
+    let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+                .createInstance(Ci.nsIXMLHttpRequest);
+    xhr.open("GET", manifestURL, true);
+    xhr.responseType = "json";
+
+    xhr.addEventListener("load", function() {
+      if (xhr.status == 200) {
+        resolve(xhr.response);
+      } else {
+        reject();
+      }
+    });
+
+    xhr.addEventListener("error", function() {
+      reject();
+    });
+
+    xhr.send(null);
+  });
+}
+
+/**
+ * Install an app using confirmInstall using pre-chewed data.  This avoids the
+ * check in the normal installApp flow that gets all judgemental about the
+ * installation of privileged and certified apps.
+ */
+function installApp(req) {
+  fetchManifest(req.manifestURL).then(function(manifestObj) {
+    var data = {
+      // cloneAppObj normalizes the representation for us
+      app: AppsUtils.cloneAppObject({
+        installOrigin: req.origin,
+        origin: req.origin,
+        manifestURL: req.manifestURL,
+        appStatus: AppsUtils.getAppManifestStatus(manifestObj),
+        receipts: [],
+        categories: []
+      }),
+
+      from: req.origin, // unused?
+      oid: 0, // unused?
+      requestID: 0, // unused-ish
+      appId: 0, // unused
+      isBrowser: false,
+      isPackage: false, // used
+      // magic to auto-ack... don't think we care about this...
+      forceSuccessAck: false
+      // stuff that probably doesn't matter: 'mm', 'apkInstall',
+    };
+    // cloneAppObject does not propagate the manifest
+    data.app.manifest = manifestObj;
+
+    return DOMApplicationRegistry.confirmInstall(data).then(
+      function() {
+        var appId =
+          DOMApplicationRegistry.getAppLocalIdByManifestURL(req.manifestURL);
+        // act like this is a privileged app having all of its permissions
+        // authorized at first run.
+        DOMApplicationRegistry.updatePermissionsForApp(
+          appId,
+          /* preinstalled */ true,
+          /* system update? */ true);
+
+        sendAsyncMessage(
+          'installed',
+          {
+            appId: appId,
+            manifestURL: req.manifestURL,
+            manifest: manifestObj
+          });
+      },
+      function(err) {
+        sendAsyncMessage('installed', false);
+      });
+  });
+}
+
+function uninstallApp(appInfo) {
+  DOMApplicationRegistry.uninstall(appInfo.manifestURL).then(
+    function() {
+      sendAsyncMessage('uninstalled', true);
+    },
+    function() {
+      sendAsyncMessage('uninstalled', false);
+    });
+}
+
+var activeIframe = null;
+
+/**
+ * Run our app in a sibling mozbrowser/mozapp iframe to the mochitest iframe.
+ * This is needed because we can't nest mozbrowser/mozapp iframes inside our
+ * already-OOP iframe until bug 1097479 is resolved.
+ */
+function runApp(appInfo) {
+  let shellDomWindow = Services.wm.getMostRecentWindow('navigator:browser');
+  let sysAppFrame = shellDomWindow.document.body.querySelector('#systemapp');
+  let sysAppDoc = sysAppFrame.contentDocument;
+
+  let siblingFrame = sysAppDoc.body.querySelector('#test-container');
+
+  let ifr = activeIframe = sysAppDoc.createElement('iframe');
+  ifr.setAttribute('mozbrowser', 'true');
+  ifr.setAttribute('remote', 'true');
+  ifr.setAttribute('mozapp', appInfo.manifestURL);
+
+  ifr.addEventListener('mozbrowsershowmodalprompt', function(evt) {
+    var message = evt.detail.message;
+    // only send the message as long as we haven't been told to clean up.
+    if (activeIframe) {
+      sendAsyncMessage('appMessage', message);
+    }
+  }, false);
+  ifr.addEventListener('mozbrowsererror', function(evt) {
+    if (activeIframe) {
+      sendAsyncMessage('appError', { message: '' + evt.detail });
+    }
+  });
+
+  ifr.setAttribute('src', appInfo.manifest.launch_path);
+  siblingFrame.parentElement.appendChild(ifr);
+}
+
+function closeApp() {
+  if (activeIframe) {
+    activeIframe.parentElement.removeChild(activeIframe);
+    activeIframe = null;
+  }
+}
+
+addMessageListener('install', installApp);
+addMessageListener('uninstall', uninstallApp);
+addMessageListener('run', runApp);
+addMessageListener('close', closeApp);
diff --git a/dom/downloads/tests/test_downloads_adopt_download.html b/dom/downloads/tests/test_downloads_adopt_download.html
new file mode 100644
index 0000000000..07633be16b
--- /dev/null
+++ b/dom/downloads/tests/test_downloads_adopt_download.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=825318
+-->
+<head>
+  <title>Test for Bug 825318 mozDownloadManager.adoptDownload</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="shim_app_as_test.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=825318">Mozilla Bug 825318</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript;version=1.7">
+
+runAppTest({
+  appFile: 'testapp_downloads_adopt_download.html',
+  appManifest: 'testapp_downloads_adopt_download.manifest',
+  appType: 'certified',
+  extraPrefs: {
+    set: [["dom.mozDownloads.enabled", true]]
+  }
+});
+
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/dom/downloads/tests/test_downloads_basic.html b/dom/downloads/tests/test_downloads_basic.html
index 0120c79260..051a1faa1b 100644
--- a/dom/downloads/tests/test_downloads_basic.html
+++ b/dom/downloads/tests/test_downloads_basic.html
@@ -72,6 +72,10 @@ function downloadChange(evt) {
     is(download.currentBytes, 1024, "Download current size is 1024 bytes");
     SimpleTest.finish();
   } else if (download.state === "downloading") {
+    // Note that this case may or may not trigger, depending on whether the
+    // download is initially reported with 0 bytes (we should happen) or with
+    // 1024 bytes (we should not happen).  If we do happen, an additional 8
+    // TEST-PASS events should be logged.
     ok(download.currentBytes > lastKnownCurrentBytes,
        "Download current size is larger than last download change event");
     lastKnownCurrentBytes = download.currentBytes;
@@ -84,7 +88,8 @@ function downloadStart(evt) {
   var download = evt.download;
   checkConsistentDownloadAttributes(download);
 
-  is(download.currentBytes, 0, "Download current size is zero");
+  // We used to check that the currentBytes was 0.  This was incorrect.  It
+  // is very common to first hear about the download already at 1024 bytes.
   is(download.state, "downloading", "Download state is downloading");
 
   download.onstatechange = downloadChange;
diff --git a/dom/downloads/tests/test_downloads_large.html b/dom/downloads/tests/test_downloads_large.html
index 66e491d6e5..9f7f73c199 100644
--- a/dom/downloads/tests/test_downloads_large.html
+++ b/dom/downloads/tests/test_downloads_large.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=938023
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -46,7 +47,7 @@ function error() {
 
 function getDownloads(downloads) {
   ok(downloads.length == 1, "One downloads after getDownloads");
-  navigator.mozDownloadManager.clearAllDone().then(clearAllDone, error);
+  clearAllDoneHelper(true).then(clearAllDone, error);
 }
 
 function clearAllDone(downloads) {
@@ -76,7 +77,7 @@ var steps = [
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff --git a/dom/downloads/tests/test_downloads_pause_remove.html b/dom/downloads/tests/test_downloads_pause_remove.html
index 864f4fc5a2..3b410a6671 100644
--- a/dom/downloads/tests/test_downloads_pause_remove.html
+++ b/dom/downloads/tests/test_downloads_pause_remove.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=938023
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -83,7 +84,7 @@ var steps = [
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff --git a/dom/downloads/tests/test_downloads_pause_resume.html b/dom/downloads/tests/test_downloads_pause_resume.html
index 30ee69d94b..76e249e5ac 100644
--- a/dom/downloads/tests/test_downloads_pause_resume.html
+++ b/dom/downloads/tests/test_downloads_pause_resume.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=938023
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -54,8 +55,7 @@ function checkDownloadList(downloads) {
 
 function checkResumeSucceeded(download) {
   ok(download.state == "succeeded", "Download resumed successfully.");
-  navigator.mozDownloadManager.clearAllDone()
-             .then(checkDownloadList, error);
+  clearAllDoneHelper(true).then(checkDownloadList, error);
 }
 
 function downloadChange(evt) {
@@ -88,7 +88,7 @@ var steps = [
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff --git a/dom/downloads/tests/testapp_downloads_adopt_download.html b/dom/downloads/tests/testapp_downloads_adopt_download.html
new file mode 100644
index 0000000000..f7b32da33b
--- /dev/null
+++ b/dom/downloads/tests/testapp_downloads_adopt_download.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script type="application/javascript" src="common_app.js"></script>
+  <meta charset="utf-8">
+</head>
+<body>
+<div id="blah">initial text</div>
+<pre id="test">
+<!-- because of certified CSP, this code must NOT be inline -->
+<script class="testbody" type="text/javascript;version=1.7" src="testapp_downloads_adopt_download.js"></script>
+</pre>
+</body>
+</html>
diff --git a/dom/downloads/tests/testapp_downloads_adopt_download.js b/dom/downloads/tests/testapp_downloads_adopt_download.js
new file mode 100644
index 0000000000..955a3b047e
--- /dev/null
+++ b/dom/downloads/tests/testapp_downloads_adopt_download.js
@@ -0,0 +1,218 @@
+/**
+ * Test the adoptDownload API.  Specifically, we expect that when we call
+ * adoptDownload with a valid payload that:
+ * - The method will be resolved with a valid, fully populated DOMDownload
+ *   instance, including an id.
+ * - An ondownloadstart notification will be generated and the DOMDownload
+ *   instance it receives will be logically equivalent.
+ *
+ * We also explicitly verify that invalid adoptDownload payloads result in a
+ * rejection and that no download is added.
+ *
+ * This test explicitly does not test that the download is correctly persisted
+ * to the database.  This is done because Downloads.jsm does not provide a means
+ * of safely restarting itself, so Firefox would need to be restarted.  Because
+ * the adoptDownload code is using the Downloads API in a straightforward
+ * manner, it's not considered likely this would regress, and certainly not
+ * considered worth the automated testing overhead of a restart.
+ */
+
+function checkInvalidResult(dict, expectedErr, explanation) {
+  navigator.mozDownloadManager.ondownloadstart = function() {
+    ok(false, "No download should have been added!");
+  };
+  navigator.mozDownloadManager.adoptDownload(dict).then(
+    function() {
+      ok(false, "Invalid adoptDownload did not reject!");
+      runTests();
+    },
+    function(rejectedWith) {
+      is(rejectedWith, expectedErr, explanation + " rejection value");
+      runTests();
+    });
+}
+
+// Pick a date that Date.now() could not possibly return by picking a date in
+// the past.  (We want to make sure the date we provide works.)
+var arbitraryDate = new Date(Date.now() - 60000);
+
+var blobContents = new Uint8Array(256);
+var memBlob = new Blob([blobContents], { type: 'application/octet-stream' });
+var blobStorageName;
+var blobStoragePath = 'blobby.blob';
+
+function checkAdoptedDownload(download, validPayload) {
+  is(download.totalBytes, memBlob.size, 'size');
+  is(download.url, validPayload.url, 'url');
+  // The filesystem path is not practical to check since we can't hard-code it
+  // and the only way to check is to effectively duplicate the logic in
+  // DownloadsAPI.js.  The good news, however, is that the value is
+  // round-tripped from storageName/storagePath to path and back again, and we
+  // also verify the file exists on disk, so we can be reasonably confident this
+  // is correct.  We output it to aid in debugging if things should break,
+  // of course.
+  info('path (not checked): ' + download.path);
+  is(download.storageName, validPayload.storageName, 'storageName');
+  is(download.storagePath, validPayload.storagePath, 'storagePath');
+  is(download.state, 'succeeded', 'state');
+  is(download.contentType, validPayload.contentType, 'contentType');
+  is(download.startTime.valueOf(), arbitraryDate.valueOf(), 'startTime');
+  is(download.sourceAppManifestURL,
+     'http://mochi.test:8888/' +
+       'tests/dom/downloads/tests/testapp_downloads_adopt_download.manifest',
+    'app manifest');
+};
+
+var tests = [
+  function saveBlobToDeviceStorage() {
+    // Only sdcard can handle arbitrary MIME types and is guaranteed to be a
+    // thing.
+    var storage = navigator.getDeviceStorage('sdcard');
+    // We used the non-array helper, so the name we get may be different than
+    // what we asked for.
+    blobStorageName = storage.storageName;
+    ok(!!storage, 'have storage');
+    var req = storage.addNamed(memBlob, blobStoragePath);
+    req.onerror = function() {
+      ok(false, 'problem saving blob to storage: ' + req.error.name);
+    };
+    req.onsuccess = function(evt) {
+      ok(true, 'saved blob: ' + evt.target.result);
+      runTests();
+    };
+  },
+  function addValid() {
+      var validPayload = {
+        // All currently expected consumers are unable to provide a valid URL, and
+        // as a result need to provide an empty string.
+        url: "",
+        storageName: blobStorageName,
+        storagePath: blobStoragePath,
+        contentType: memBlob.type,
+        startTime: arbitraryDate
+      };
+    // Wrap the notification in a check so we can force our logic to be
+    // consistently ordered in the test even if it's not in reality.
+    var notifiedPromise = new Promise(function(resolve, reject) {
+      navigator.mozDownloadManager.ondownloadstart = function(evt) {
+        resolve(evt.download);
+      };
+    });
+
+    // Start the download
+    navigator.mozDownloadManager.adoptDownload(validPayload).then(
+      function(apiDownload) {
+        checkAdoptedDownload(apiDownload, validPayload);
+        ok(!!apiDownload.id, "Need a download id!");
+        notifiedPromise.then(function(notifiedDownload) {
+          checkAdoptedDownload(notifiedDownload, validPayload);
+          is(apiDownload.id, notifiedDownload.id,
+             "Notification should be for the download we adopted");
+          runTests();
+        });
+      },
+      function() {
+        ok(false, "adoptDownload should not have rejected");
+        runTests();
+      });
+  },
+
+  function dictionaryNotProvided() {
+    checkInvalidResult(undefined, "InvalidDownload");
+  },
+  // Missing fields immediately result in rejection with InvalidDownload
+  function missingStorageName() {
+    checkInvalidResult({
+      url: "",
+      // no storageName
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing storage name");
+  },
+  function nullStorageName() {
+    checkInvalidResult({
+      url: "",
+      storageName: null,
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null storage name");
+  },
+  function missingStoragePath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      // no storagePath
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing storage path");
+  },
+  function nullStoragePath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      storagePath: null,
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null storage path");
+  },
+  function missingContentType() {
+    checkInvalidResult({
+      url: "",
+      storageName: "sdcard",
+      storagePath: "relpath/filename.txt",
+      // no contentType
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing content type");
+  },
+  function nullContentType() {
+    checkInvalidResult({
+      url: "",
+      storageName: "sdcard",
+      storagePath: "relpath/filename.txt",
+      contentType: null,
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null content type");
+  },
+  // Incorrect storage names are likewise immediately invalidated
+  function invalidStorageName() {
+    checkInvalidResult({
+      url: "",
+      storageName: "ALMOST CERTAINLY DOES NOT EXIST",
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "invalid storage name");
+  },
+  // The existence of the file is validated in the parent process
+  function legitStorageInvalidPath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      storagePath: "ALMOST CERTAINLY DOES NOT EXIST",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "AdoptNoSuchFile", "invalid path");
+  },
+  function allDone() {
+    // Just in case, make sure no other mochitest could mess with us after we've
+    // finished.
+    navigator.mozDownloadManager.ondownloadstart = null;
+    runTests();
+  }
+];
+
+function runTests() {
+  if (!tests.length) {
+    finish();
+    return;
+  }
+
+  var test = tests.shift();
+  if (test.name) {
+    info('starting test: ' + test.name);
+  }
+  test();
+}
+runTests();
diff --git a/dom/downloads/tests/testapp_downloads_adopt_download.manifest b/dom/downloads/tests/testapp_downloads_adopt_download.manifest
new file mode 100644
index 0000000000..b68e10e286
--- /dev/null
+++ b/dom/downloads/tests/testapp_downloads_adopt_download.manifest
@@ -0,0 +1,10 @@
+{
+  "name": "Downloads certified test fake app",
+  "description": "Test",
+  "launch_path": "http://mochi.test:8888/tests/dom/downloads/tests/testapp_downloads_adopt_download.html",
+  "type": "certified",
+  "permissions": {
+    "device-storage:sdcard":{ "access": "readcreate" },
+    "downloads": {}
+  }
+}
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index f640d90955..27f9b5c28c 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -484,6 +484,30 @@ EventStateManager::TryToFlushPendingNotificationsToIME()
   }
 }
 
+static bool
+IsMessageMouseUserActivity(EventMessage aMessage)
+{
+  return aMessage == eMouseMove ||
+         aMessage == eMouseUp ||
+         aMessage == eMouseDown ||
+         aMessage == eMouseDoubleClick ||
+         aMessage == eMouseClick ||
+         aMessage == eMouseActivate ||
+         aMessage == eMouseLongTap;
+}
+
+static bool
+IsMessageGamepadUserActivity(EventMessage aMessage)
+{
+#ifndef MOZ_GAMEPAD
+  return false;
+#else
+  return aMessage == eGamepadButtonDown ||
+         aMessage == eGamepadButtonUp ||
+         aMessage == eGamepadAxisMove;
+#endif
+}
+
 nsresult
 EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
                                   WidgetEvent* aEvent,
@@ -515,12 +539,12 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
   WidgetMouseEvent* mouseEvent = aEvent->AsMouseEvent();
   if (aEvent->mFlags.mIsTrusted &&
       ((mouseEvent && mouseEvent->IsReal() &&
-        mouseEvent->mMessage != eMouseEnterIntoWidget &&
-        mouseEvent->mMessage != eMouseExitFromWidget) ||
+        IsMessageMouseUserActivity(mouseEvent->mMessage)) ||
        aEvent->mClass == eWheelEventClass ||
        aEvent->mClass == ePointerEventClass ||
        aEvent->mClass == eTouchEventClass ||
-       aEvent->mClass == eKeyboardEventClass)) {
+       aEvent->mClass == eKeyboardEventClass ||
+       IsMessageGamepadUserActivity(aEvent->mMessage))) {
     if (gMouseOrKeyboardEventCounter == 0) {
       nsCOMPtr<nsIObserverService> obs =
         mozilla::services::GetObserverService();
@@ -1992,6 +2016,7 @@ EventStateManager::GetContentViewer(nsIContentViewer** aCv)
 
   nsCOMPtr<nsIDOMWindow> focusedWindow;
   fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+  if (!focusedWindow) return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(focusedWindow);
   if(!ourWindow) return NS_ERROR_FAILURE;
@@ -2577,6 +2602,8 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
     case WidgetWheelEvent::SCROLL_DEFAULT:
       if (isDeltaModePixel) {
         mode = nsIScrollableFrame::NORMAL;
+      } else if (aEvent->mFlags.mHandledByAPZ) {
+        mode = nsIScrollableFrame::SMOOTH_MSD;
       } else {
         mode = nsIScrollableFrame::SMOOTH;
       }
diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
index 6a027627ce..6b907f1300 100644
--- a/dom/events/IMEStateManager.cpp
+++ b/dom/events/IMEStateManager.cpp
@@ -958,7 +958,7 @@ IMEStateManager::SetInputContextForChildProcess(
      GetActionFocusChangeName(aAction.mFocusChange),
      sPresContext, sActiveTabParent.get()));
 
-  if (NS_WARN_IF(aTabParent != sActiveTabParent)) {
+  if (aTabParent != sActiveTabParent) {
     MOZ_LOG(sISMLog, LogLevel::Error,
       ("ISM:    IMEStateManager::SetInputContextForChildProcess(), FAILED, "
        "because non-focused tab parent tries to set input context"));
@@ -1473,8 +1473,19 @@ IMEStateManager::NotifyIME(const IMENotification& aNotification,
       return composition ?
         composition->RequestToCommit(aWidget, true) : NS_OK;
     case NOTIFY_IME_OF_COMPOSITION_UPDATE:
-      return composition && !isSynthesizedForTests ?
-        aWidget->NotifyIME(aNotification) : NS_OK;
+      if (!aOriginIsRemote && (!composition || isSynthesizedForTests)) {
+        MOZ_LOG(sISMLog, LogLevel::Info,
+          ("ISM:   IMEStateManager::NotifyIME(), FAILED, received content "
+           "change notification from this process but there is no compostion"));
+        return NS_OK;
+      }
+      if (!sRemoteHasFocus && aOriginIsRemote) {
+        MOZ_LOG(sISMLog, LogLevel::Info,
+          ("ISM:   IMEStateManager::NotifyIME(), received content change "
+           "notification from the remote but it's already lost focus"));
+        return NS_OK;
+      }
+      return aWidget->NotifyIME(aNotification);
     default:
       MOZ_CRASH("Unsupported notification");
   }
diff --git a/dom/fetch/ChannelInfo.cpp b/dom/fetch/ChannelInfo.cpp
index de31fd6b1b..5ecc7f7624 100644
--- a/dom/fetch/ChannelInfo.cpp
+++ b/dom/fetch/ChannelInfo.cpp
@@ -13,8 +13,6 @@
 #include "nsSerializationHelper.h"
 #include "mozilla/net/HttpBaseChannel.h"
 #include "mozilla/ipc/ChannelInfo.h"
-#include "nsIJARChannel.h"
-#include "nsJARChannel.h"
 #include "nsNetUtil.h"
 
 using namespace mozilla;
@@ -90,32 +88,20 @@ ChannelInfo::ResurrectInfoOnChannel(nsIChannel* aChannel)
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mInited);
 
-  // These pointers may be null at this point.  They must be checked before
-  // being dereferenced.
-  nsCOMPtr<nsIHttpChannel> httpChannel =
-    do_QueryInterface(aChannel);
-  nsCOMPtr<nsIJARChannel> jarChannel =
-    do_QueryInterface(aChannel);
-
   if (!mSecurityInfo.IsEmpty()) {
     nsCOMPtr<nsISupports> infoObj;
     nsresult rv = NS_DeserializeObject(mSecurityInfo, getter_AddRefs(infoObj));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
-    if (httpChannel) {
-      net::HttpBaseChannel* httpBaseChannel =
-        static_cast<net::HttpBaseChannel*>(httpChannel.get());
-      rv = httpBaseChannel->OverrideSecurityInfo(infoObj);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-    } else {
-      if (NS_WARN_IF(!jarChannel)) {
-        return NS_ERROR_FAILURE;
-      }
-      static_cast<nsJARChannel*>(jarChannel.get())->
-        OverrideSecurityInfo(infoObj);
+    nsCOMPtr<nsIHttpChannel> httpChannel =
+      do_QueryInterface(aChannel);
+    MOZ_ASSERT(httpChannel);
+    net::HttpBaseChannel* httpBaseChannel =
+      static_cast<net::HttpBaseChannel*>(httpChannel.get());
+    rv = httpBaseChannel->OverrideSecurityInfo(infoObj);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
     }
   }
 
diff --git a/dom/fetch/FetchDriver.cpp b/dom/fetch/FetchDriver.cpp
index b8f540479b..7a808e364f 100644
--- a/dom/fetch/FetchDriver.cpp
+++ b/dom/fetch/FetchDriver.cpp
@@ -14,7 +14,6 @@
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpHeaderVisitor.h"
-#include "nsIJARChannel.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsIUploadChannel2.h"
@@ -471,7 +470,6 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest,
   RefPtr<InternalResponse> response;
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
   nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
-  nsCOMPtr<nsIJARChannel> jarChannel = do_QueryInterface(aRequest);
 
   // On a successful redirect we perform the following substeps of HTTP Fetch,
   // step 5, "redirect status", step 11.
@@ -516,18 +514,6 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest,
     if (NS_WARN_IF(NS_FAILED(rv))) {
       NS_WARNING("Failed to visit all headers.");
     }
-  } else if (jarChannel) {
-    // We simulate the http protocol for jar/app requests
-    uint32_t responseStatus = 200;
-    nsAutoCString statusText;
-    response = new InternalResponse(responseStatus, NS_LITERAL_CSTRING("OK"));
-    ErrorResult result;
-    nsAutoCString contentType;
-    jarChannel->GetContentType(contentType);
-    response->Headers()->Append(NS_LITERAL_CSTRING("content-type"),
-                                contentType,
-                                result);
-    MOZ_ASSERT(!result.Failed());
   } else {
     response = new InternalResponse(200, NS_LITERAL_CSTRING("OK"));
 
diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp
index 01fe39f8bf..e65d29232d 100644
--- a/dom/fetch/InternalRequest.cpp
+++ b/dom/fetch/InternalRequest.cpp
@@ -306,14 +306,6 @@ InternalRequest::MapChannelToRequestMode(nsIChannel* aChannel)
 
   // TODO: remove following code once securityMode is fully implemented (bug 1189945)
 
-  // We only support app:// protocol interception in non-release builds.
-#ifndef RELEASE_BUILD
-  nsCOMPtr<nsIJARChannel> jarChannel = do_QueryInterface(aChannel);
-  if (jarChannel) {
-    return RequestMode::No_cors;
-  }
-#endif
-
   nsCOMPtr<nsIHttpChannelInternal> httpChannel = do_QueryInterface(aChannel);
 
   uint32_t corsMode;
diff --git a/dom/fetch/InternalRequest.h b/dom/fetch/InternalRequest.h
index df1b8abd2c..644f55b89e 100644
--- a/dom/fetch/InternalRequest.h
+++ b/dom/fetch/InternalRequest.h
@@ -88,7 +88,7 @@ class InternalRequest final
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(InternalRequest)
 
-  explicit InternalRequest()
+  InternalRequest()
     : mMethod("GET")
     , mHeaders(new InternalHeaders(HeadersGuardEnum::None))
     , mContentPolicyType(nsIContentPolicy::TYPE_FETCH)
@@ -113,6 +113,36 @@ public:
   {
   }
 
+  InternalRequest(const nsACString& aURL,
+                  const nsACString& aMethod,
+                  already_AddRefed<InternalHeaders> aHeaders,
+                  RequestMode aMode,
+                  RequestRedirect aRequestRedirect,
+                  RequestCredentials aRequestCredentials,
+                  const nsAString& aReferrer,
+                  nsContentPolicyType aContentPolicyType)
+    : mMethod(aMethod)
+    , mURL(aURL)
+    , mHeaders(aHeaders)
+    , mContentPolicyType(aContentPolicyType)
+    , mReferrer(aReferrer)
+    , mMode(aMode)
+    , mCredentialsMode(aRequestCredentials)
+    , mResponseTainting(LoadTainting::Basic)
+    , mCacheMode(RequestCache::Default)
+    , mRedirectMode(aRequestRedirect)
+    , mAuthenticationFlag(false)
+    , mForceOriginHeader(false)
+    , mPreserveContentCodings(false)
+      // FIXME See the above comment in the default constructor.
+    , mSameOriginDataURL(true)
+    , mSkipServiceWorker(false)
+    , mSynchronous(false)
+    , mUnsafeRequest(false)
+    , mUseURLCredentials(false)
+  {
+  }
+
   already_AddRefed<InternalRequest> Clone();
 
   void
diff --git a/dom/fetch/Response.h b/dom/fetch/Response.h
index 9b237f239c..e623e9e9d2 100644
--- a/dom/fetch/Response.h
+++ b/dom/fetch/Response.h
@@ -50,11 +50,11 @@ public:
   }
 
   void
-  GetUrl(DOMString& aUrl) const
+  GetUrl(nsAString& aUrl) const
   {
     nsCString url;
     mInternalResponse->GetUrl(url);
-    aUrl.AsAString() = NS_ConvertUTF8toUTF16(url);
+    CopyUTF8toUTF16(url, aUrl);
   }
 
   uint16_t
diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build
index 9b3e60ddcc..b0d140ca2b 100644
--- a/dom/fetch/moz.build
+++ b/dom/fetch/moz.build
@@ -36,8 +36,6 @@ IPDL_SOURCES += [
 
 LOCAL_INCLUDES += [
     '../workers',
-    # For nsJARChannel.h
-    '/modules/libjar',
     # For HttpBaseChannel.h dependencies
     '/netwerk/base',
     # For nsDataHandler.h
diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp
index ec02ba3626..25b372cd8f 100644
--- a/dom/filesystem/Directory.cpp
+++ b/dom/filesystem/Directory.cpp
@@ -230,8 +230,7 @@ Directory::GetPath(nsAString& aRetval) const
     // The Directory ctor removes any trailing '/'; this is the root directory.
     aRetval.AssignLiteral(FILESYSTEM_DOM_PATH_SEPARATOR);
   } else {
-    aRetval = Substring(mPath, 0,
-                        mPath.RFindChar(FileSystemUtils::kSeparatorChar) + 1);
+    aRetval = mPath;
   }
 }
 
diff --git a/dom/html/HTMLLinkElement.cpp b/dom/html/HTMLLinkElement.cpp
index 80b2c61ef9..1e13b8d859 100644
--- a/dom/html/HTMLLinkElement.cpp
+++ b/dom/html/HTMLLinkElement.cpp
@@ -21,7 +21,6 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMStyleSheet.h"
 #include "nsINode.h"
-#include "nsIStyleSheet.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsIURL.h"
 #include "nsPIDOMWindow.h"
diff --git a/dom/html/HTMLStyleElement.cpp b/dom/html/HTMLStyleElement.cpp
index 4534aaa88d..ec690fc0b4 100644
--- a/dom/html/HTMLStyleElement.cpp
+++ b/dom/html/HTMLStyleElement.cpp
@@ -8,7 +8,6 @@
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsIDOMStyleSheet.h"
-#include "nsIStyleSheet.h"
 #include "nsIDocument.h"
 #include "nsUnicharUtils.h"
 #include "nsThreadUtils.h"
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index 7b8756001d..291afc23e5 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -2642,12 +2642,12 @@ nsHTMLDocument::TearingDownEditor(nsIEditor *aEditor)
     if (!presShell)
       return;
 
-    nsCOMArray<nsIStyleSheet> agentSheets;
+    nsTArray<RefPtr<CSSStyleSheet>> agentSheets;
     presShell->GetAgentStyleSheets(agentSheets);
 
-    agentSheets.RemoveObject(nsLayoutStylesheetCache::ContentEditableSheet());
+    agentSheets.RemoveElement(nsLayoutStylesheetCache::ContentEditableSheet());
     if (oldState == eDesignMode)
-      agentSheets.RemoveObject(nsLayoutStylesheetCache::DesignModeSheet());
+      agentSheets.RemoveElement(nsLayoutStylesheetCache::DesignModeSheet());
 
     presShell->SetAgentStyleSheets(agentSheets);
 
@@ -2781,18 +2781,15 @@ nsHTMLDocument::EditingStateChanged()
     // Before making this window editable, we need to modify UA style sheet
     // because new style may change whether focused element will be focusable
     // or not.
-    nsCOMArray<nsIStyleSheet> agentSheets;
+    nsTArray<RefPtr<CSSStyleSheet>> agentSheets;
     rv = presShell->GetAgentStyleSheets(agentSheets);
     NS_ENSURE_SUCCESS(rv, rv);
 
     CSSStyleSheet* contentEditableSheet =
       nsLayoutStylesheetCache::ContentEditableSheet();
 
-    bool result;
-
     if (!agentSheets.Contains(contentEditableSheet)) {
-      bool result = agentSheets.AppendObject(contentEditableSheet);
-      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+      agentSheets.AppendElement(contentEditableSheet);
     }
 
     // Should we update the editable state of all the nodes in the document? We
@@ -2803,8 +2800,7 @@ nsHTMLDocument::EditingStateChanged()
       CSSStyleSheet* designModeSheet =
         nsLayoutStylesheetCache::DesignModeSheet();
       if (!agentSheets.Contains(designModeSheet)) {
-        result = agentSheets.AppendObject(designModeSheet);
-        NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+        agentSheets.AppendElement(designModeSheet);
       }
 
       updateState = true;
@@ -2812,7 +2808,7 @@ nsHTMLDocument::EditingStateChanged()
     }
     else if (oldState == eDesignMode) {
       // designMode is being turned off (contentEditable is still on).
-      agentSheets.RemoveObject(nsLayoutStylesheetCache::DesignModeSheet());
+      agentSheets.RemoveElement(nsLayoutStylesheetCache::DesignModeSheet());
       updateState = true;
     }
 
diff --git a/dom/html/test/formData_test.js b/dom/html/test/formData_test.js
index a13b97ba2d..9845029d72 100644
--- a/dom/html/test/formData_test.js
+++ b/dom/html/test/formData_test.js
@@ -83,7 +83,6 @@ function testIterate() {
 
 function testFilename() {
   var f = new FormData();
-  // Spec says if a Blob (which is not a File) is added, the name parameter is set to "blob".
   f.append("blob", new Blob(["hi"]));
   ok(f.get("blob") instanceof Blob, "We should have a blob back.");
 
diff --git a/dom/imptests/failures/html/dom/test_historical.html.json b/dom/imptests/failures/html/dom/test_historical.html.json
index 24c11e708e..72eaaedc37 100644
--- a/dom/imptests/failures/html/dom/test_historical.html.json
+++ b/dom/imptests/failures/html/dom/test_historical.html.json
@@ -7,5 +7,4 @@
   "Historical DOM features must be removed: getAttributeNodeNS": true,
   "Historical DOM features must be removed: setAttributeNode": true,
   "Historical DOM features must be removed: removeAttributeNode": true,
-  "DocumentType member must be nuked: internalSubset": true
 }
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini b/dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini
index 0028d20e06..6777d58162 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini
+++ b/dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini
@@ -3,10 +3,7 @@
 support-files =
 
 
-[test_document.title-03.html.json]
-[test_document.title-04.xhtml.json]
 [test_document.title-06.html.json]
-[test_document.title-07.html.json]
 [test_nameditem-02.html.json]
 [test_nameditem-03.html.json]
 [test_nameditem-04.html.json]
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-03.html.json b/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-03.html.json
deleted file mode 100644
index 7caf21e2b6..0000000000
--- a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-03.html.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  " document.title  and space normalization  ": true
-}
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-04.xhtml.json b/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-04.xhtml.json
deleted file mode 100644
index 7caf21e2b6..0000000000
--- a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-04.xhtml.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  " document.title  and space normalization  ": true
-}
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-07.html.json b/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-07.html.json
deleted file mode 100644
index 2bfb29e756..0000000000
--- a/dom/imptests/failures/html/html/dom/documents/dta/test_document.title-07.html.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "Document.title and DOMImplementation.createHTMLDocument 6": true
-}
diff --git a/dom/imptests/failures/html/html/semantics/forms/the-option-element/mochitest.ini b/dom/imptests/failures/html/html/semantics/forms/the-option-element/mochitest.ini
deleted file mode 100644
index ac6c7f47ba..0000000000
--- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/mochitest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-[DEFAULT]
-support-files =
-
-
-[test_option-text-spaces.html.json]
diff --git a/dom/imptests/failures/html/html/semantics/forms/the-option-element/test_option-text-spaces.html.json b/dom/imptests/failures/html/html/semantics/forms/the-option-element/test_option-text-spaces.html.json
deleted file mode 100644
index 73c6c930cc..0000000000
--- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/test_option-text-spaces.html.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "option.text should strip leading space characters (\"\\f\")": true,
-  "option.text should strip trailing space characters (\"\\f\")": true,
-  "option.text should strip leading and trailing space characters (\"\\f\")": true,
-  "option.text should replace single internal space characters (\"\\f\")": true,
-  "option.text should replace multiple internal space characters (\" \", \"\\f\")": true,
-  "option.text should replace multiple internal space characters (\"\\t\", \"\\f\")": true,
-  "option.text should replace multiple internal space characters (\"\\n\", \"\\f\")": true,
-  "option.text should replace multiple internal space characters (\"\\f\", \" \")": true,
-  "option.text should replace multiple internal space characters (\"\\f\", \"\\t\")": true,
-  "option.text should replace multiple internal space characters (\"\\f\", \"\\n\")": true,
-  "option.text should replace multiple internal space characters (\"\\f\", \"\\f\")": true,
-  "option.text should replace multiple internal space characters (\"\\f\", \"\\r\")": true,
-  "option.text should replace multiple internal space characters (\"\\r\", \"\\f\")": true
-}
diff --git a/dom/imptests/moz.build b/dom/imptests/moz.build
index f205f6a395..a91efd5a04 100644
--- a/dom/imptests/moz.build
+++ b/dom/imptests/moz.build
@@ -23,7 +23,6 @@ MOCHITEST_MANIFESTS += [
     'failures/html/html/dom/documents/dta/doc.gEBN/mochitest.ini',
     'failures/html/html/dom/documents/dta/mochitest.ini',
     'failures/html/html/obsolete/implreq/oeaaa/mochitest.ini',
-    'failures/html/html/semantics/forms/the-option-element/mochitest.ini',
     'failures/html/html/semantics/forms/the-select-element/mochitest.ini',
     'failures/html/html/semantics/scripting-1/the-script-element/mochitest.ini',
     'failures/html/html/semantics/tabular-data/the-table-element/mochitest.ini',
diff --git a/dom/indexedDB/test/test_serviceworker.html b/dom/indexedDB/test/test_serviceworker.html
index 505743802a..c37a70ffa5 100644
--- a/dom/indexedDB/test/test_serviceworker.html
+++ b/dom/indexedDB/test/test_serviceworker.html
@@ -15,13 +15,19 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
+  var regisration;
   function simpleRegister() {
     return navigator.serviceWorker.register("service_worker.js", {
       scope: 'service_worker_client.html'
     });
   }
 
+  function unregister() {
+    return registration.unregister();
+  }
+
   function testIndexedDBAvailable(sw) {
+    registration = sw;
     var p = new Promise(function(resolve, reject) {
       window.onmessage = function(e) {
         if (e.data === "READY") {
@@ -53,6 +59,7 @@
   function runTest() {
     simpleRegister()
       .then(testIndexedDBAvailable)
+      .then(unregister)
       .then(SimpleTest.finish)
       .catch(function(e) {
         ok(false, "Some test failed with error " + e);
diff --git a/dom/inputmethod/Keyboard.jsm b/dom/inputmethod/Keyboard.jsm
index 786a75a9f5..b117b62435 100644
--- a/dom/inputmethod/Keyboard.jsm
+++ b/dom/inputmethod/Keyboard.jsm
@@ -23,7 +23,7 @@ XPCOMUtils.defineLazyGetter(this, "appsService", function() {
   return Cc["@mozilla.org/AppsService;1"].getService(Ci.nsIAppsService);
 });
 
-let Utils = {
+var Utils = {
   getMMFromMessage: function u_getMMFromMessage(msg) {
     let mm;
     try {
@@ -45,17 +45,21 @@ this.Keyboard = {
   _keyboardMM: null,  // The keyboard app message manager.
   _keyboardID: -1,    // The keyboard app's ID number. -1 = invalid
   _nextKeyboardID: 0, // The ID number counter.
-  _systemMessageName: [
-    'SetValue', 'RemoveFocus', 'SetSelectedOption', 'SetSelectedOptions'
+  _systemMMs: [],     // The message managers registered to handle system async
+                      // messages.
+  _supportsSwitchingTypes: [],
+  _systemMessageNames: [
+    'SetValue', 'RemoveFocus', 'SetSelectedOption', 'SetSelectedOptions',
+    'SetSupportsSwitchingTypes', 'RegisterSync', 'Unregister'
   ],
 
   _messageNames: [
     'RemoveFocus',
     'SetSelectionRange', 'ReplaceSurroundingText', 'ShowInputMethodPicker',
     'SwitchToNextInputMethod', 'HideInputMethod',
-    'GetText', 'SendKey', 'GetContext',
+    'SendKey', 'GetContext',
     'SetComposition', 'EndComposition',
-    'Register', 'Unregister'
+    'RegisterSync', 'Unregister'
   ],
 
   get formMM() {
@@ -70,6 +74,12 @@ this.Keyboard = {
   },
 
   sendToForm: function(name, data) {
+    if (!this.formMM) {
+      dump("Keyboard.jsm: Attempt to send message " + name +
+        " to form but no message manager exists.\n");
+
+      return;
+    }
     try {
       this.formMM.sendAsyncMessage(name, data);
     } catch(e) { }
@@ -81,16 +91,31 @@ this.Keyboard = {
     } catch(e) { }
   },
 
+  sendToSystem: function(name, data) {
+    if (!this._systemMMs.length) {
+      dump("Keyboard.jsm: Attempt to send message " + name +
+        " to system but no message manager registered.\n");
+
+      return;
+    }
+
+    this._systemMMs.forEach((mm, i) => {
+      data.inputManageId = i;
+      mm.sendAsyncMessage(name, data);
+    });
+  },
+
   init: function keyboardInit() {
     Services.obs.addObserver(this, 'inprocess-browser-shown', false);
     Services.obs.addObserver(this, 'remote-browser-shown', false);
     Services.obs.addObserver(this, 'oop-frameloader-crashed', false);
+    Services.obs.addObserver(this, 'message-manager-close', false);
 
     for (let name of this._messageNames) {
       ppmm.addMessageListener('Keyboard:' + name, this);
     }
 
-    for (let name of this._systemMessageName) {
+    for (let name of this._systemMessageNames) {
       ppmm.addMessageListener('System:' + name, this);
     }
 
@@ -98,19 +123,31 @@ this.Keyboard = {
   },
 
   observe: function keyboardObserve(subject, topic, data) {
-    let frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
-    let mm = frameLoader.messageManager;
+    let frameLoader = null;
+    let mm = null;
 
-    if (topic == 'oop-frameloader-crashed') {
+    if (topic == 'message-manager-close') {
+      mm = subject;
+    } else {
+      frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
+      mm = frameLoader.messageManager;
+    }
+
+    if (topic == 'oop-frameloader-crashed' ||
+	      topic == 'message-manager-close') {
       if (this.formMM == mm) {
         // The application has been closed unexpectingly. Let's tell the
         // keyboard app that the focus has been lost.
-        this.sendToKeyboard('Keyboard:FocusChange', { 'type': 'blur' });
+        this.sendToKeyboard('Keyboard:Blur', {});
         // Notify system app to hide keyboard.
+        this.sendToSystem('System:Blur', {});
+        // XXX: To be removed when content migrate away from mozChromeEvents.
         SystemAppProxy.dispatchEvent({
           type: 'inputmethod-contextchange',
           inputType: 'blur'
         });
+
+        this.formMM = null;
       }
     } else {
       // Ignore notifications that aren't from a BrowserOrApp
@@ -122,10 +159,9 @@ this.Keyboard = {
   },
 
   initFormsFrameScript: function(mm) {
-    mm.addMessageListener('Forms:Input', this);
+    mm.addMessageListener('Forms:Focus', this);
+    mm.addMessageListener('Forms:Blur', this);
     mm.addMessageListener('Forms:SelectionChange', this);
-    mm.addMessageListener('Forms:GetText:Result:OK', this);
-    mm.addMessageListener('Forms:GetText:Result:Error', this);
     mm.addMessageListener('Forms:SetSelectionRange:Result:OK', this);
     mm.addMessageListener('Forms:SetSelectionRange:Result:Error', this);
     mm.addMessageListener('Forms:ReplaceSurroundingText:Result:OK', this);
@@ -142,28 +178,26 @@ this.Keyboard = {
     // If we get a 'Keyboard:XXX'/'System:XXX' message, check that the sender
     // has the required permission.
     let mm;
-    let isKeyboardRegistration = msg.name == "Keyboard:Register" ||
-                                 msg.name == "Keyboard:Unregister";
-    if (msg.name.indexOf("Keyboard:") === 0 ||
-        msg.name.indexOf("System:") === 0) {
-      if (!this.formMM && !isKeyboardRegistration) {
-        return;
-      }
 
+    // Assert the permission based on the prefix of the message.
+    let permName;
+    if (msg.name.startsWith("Keyboard:")) {
+      permName = "input";
+    } else if (msg.name.startsWith("System:")) {
+      permName = "input-manage";
+    }
+
+    // There is no permission to check (nor we need to get the mm)
+    // for Form: messages.
+    if (permName) {
       mm = Utils.getMMFromMessage(msg);
-
-      // That should never happen.
       if (!mm) {
-        dump("!! No message manager found for " + msg.name);
+        dump("Keyboard.jsm: Message " + msg.name + " has no message manager.");
         return;
       }
-
-      let perm = (msg.name.indexOf("Keyboard:") === 0) ? "input"
-                                                       : "input-manage";
-
-      if (!isKeyboardRegistration && !Utils.checkPermissionForMM(mm, perm)) {
-        dump("Keyboard message " + msg.name +
-        " from a content process with no '" + perm + "' privileges.");
+      if (!Utils.checkPermissionForMM(mm, permName)) {
+        dump("Keyboard.jsm: Message " + msg.name +
+          " from a content process with no '" + permName + "' privileges.\n");
         return;
       }
     }
@@ -177,18 +211,19 @@ this.Keyboard = {
     }
 
     if (0 === msg.name.indexOf('Keyboard:') &&
-        ('Keyboard:Register' !== msg.name && this._keyboardID !== kbID)
+        ('Keyboard:RegisterSync' !== msg.name && this._keyboardID !== kbID)
        ) {
       return;
     }
 
     switch (msg.name) {
-      case 'Forms:Input':
-        this.handleFocusChange(msg);
+      case 'Forms:Focus':
+        this.handleFocus(msg);
+        break;
+      case 'Forms:Blur':
+        this.handleBlur(msg);
         break;
       case 'Forms:SelectionChange':
-      case 'Forms:GetText:Result:OK':
-      case 'Forms:GetText:Result:Error':
       case 'Forms:SetSelectionRange:Result:OK':
       case 'Forms:ReplaceSurroundingText:Result:OK':
       case 'Forms:SendKey:Result:OK':
@@ -209,6 +244,24 @@ this.Keyboard = {
       case 'Keyboard:RemoveFocus':
       case 'System:RemoveFocus':
         this.removeFocus();
+        break;
+      case 'System:RegisterSync': {
+        if (this._systemMMs.length !== 0) {
+          dump('Keyboard.jsm Warning: There are more than one content page ' +
+            'with input-manage permission. There will be undeterministic ' +
+            'responses to addInput()/removeInput() if both content pages are ' +
+            'trying to respond to the same request event.\n');
+        }
+
+        let id = this._systemMMs.length;
+        this._systemMMs.push(mm);
+
+        return id;
+      }
+
+      case 'System:Unregister':
+        this._systemMMs.splice(msg.data.id, 1);
+
         break;
       case 'System:SetSelectedOption':
         this.setSelectedOption(msg);
@@ -216,6 +269,9 @@ this.Keyboard = {
       case 'System:SetSelectedOptions':
         this.setSelectedOption(msg);
         break;
+      case 'System:SetSupportsSwitchingTypes':
+        this.setSupportsSwitchingTypes(msg);
+        break;
       case 'Keyboard:SetSelectionRange':
         this.setSelectionRange(msg);
         break;
@@ -228,9 +284,6 @@ this.Keyboard = {
       case 'Keyboard:ShowInputMethodPicker':
         this.showInputMethodPicker();
         break;
-      case 'Keyboard:GetText':
-        this.getText(msg);
-        break;
       case 'Keyboard:SendKey':
         this.sendKey(msg);
         break;
@@ -243,7 +296,7 @@ this.Keyboard = {
       case 'Keyboard:EndComposition':
         this.endComposition(msg);
         break;
-      case 'Keyboard:Register':
+      case 'Keyboard:RegisterSync':
         this._keyboardMM = mm;
         if (kbID) {
           // keyboard identifies itself, use its kbID
@@ -265,41 +318,23 @@ this.Keyboard = {
     }
   },
 
-  forwardEvent: function keyboardForwardEvent(newEventName, msg) {
+  handleFocus: function keyboardHandleFocus(msg) {
+    // Set the formMM to the new message manager received.
     let mm = msg.target.QueryInterface(Ci.nsIFrameLoaderOwner)
                 .frameLoader.messageManager;
-    if (newEventName === 'Keyboard:FocusChange') {
-      if (msg.data.type !== 'blur') { // Focus on a new input field
-        // Set the formMM to the new message manager so that
-        // message gets to the right form now on.
-        this.formMM = mm;
-      } else { // input is blurred
-        // A blur message can't be sent to the keyboard if the focus has
-        // already been taken away at first place.
-        // This check is here to prevent problem caused by out-of-order
-        // ipc messages from two processes.
-        if (mm !== this.formMM) {
-          return false;
-        }
-      }
-    }
+    this.formMM = mm;
 
-    this.sendToKeyboard(newEventName, msg.data);
-    return true;
-  },
+    // Notify the current active input app to gain focus.
+    this.forwardEvent('Keyboard:Focus', msg);
 
-  handleFocusChange: function keyboardHandleFocusChange(msg) {
-    let isSent = this.forwardEvent('Keyboard:FocusChange', msg);
+    // Notify System app, used also to render value selectors for now;
+    // that's why we need the info about choices / min / max here as well...
+    this.sendToSystem('System:Focus', msg.data);
 
-    if (!isSent) {
-      return;
-    }
-
-    // Chrome event, used also to render value selectors; that's why we need
-    // the info about choices / min / max here as well...
+    // XXX: To be removed when content migrate away from mozChromeEvents.
     SystemAppProxy.dispatchEvent({
       type: 'inputmethod-contextchange',
-      inputType: msg.data.type,
+      inputType: msg.data.inputType,
       value: msg.data.value,
       choices: JSON.stringify(msg.data.choices),
       min: msg.data.min,
@@ -307,6 +342,34 @@ this.Keyboard = {
     });
   },
 
+  handleBlur: function keyboardHandleBlur(msg) {
+    let mm = msg.target.QueryInterface(Ci.nsIFrameLoaderOwner)
+                .frameLoader.messageManager;
+    // A blur message can't be sent to the keyboard if the focus has
+    // already been taken away at first place.
+    // This check is here to prevent problem caused by out-of-order
+    // ipc messages from two processes.
+    if (mm !== this.formMM) {
+      return;
+    }
+
+    // unset formMM
+    this.formMM = null;
+
+    this.forwardEvent('Keyboard:Blur', msg);
+    this.sendToSystem('System:Blur', {});
+
+    // XXX: To be removed when content migrate away from mozChromeEvents.
+    SystemAppProxy.dispatchEvent({
+      type: 'inputmethod-contextchange',
+      inputType: 'blur'
+    });
+  },
+
+  forwardEvent: function keyboardForwardEvent(newEventName, msg) {
+    this.sendToKeyboard(newEventName, msg.data);
+  },
+
   setSelectedOption: function keyboardSetSelectedOption(msg) {
     this.sendToForm('Forms:Select:Choice', msg.data);
   },
@@ -324,6 +387,10 @@ this.Keyboard = {
   },
 
   removeFocus: function keyboardRemoveFocus() {
+    if (!this.formMM) {
+      return;
+    }
+
     this.sendToForm('Forms:Select:Blur', {});
   },
 
@@ -332,30 +399,36 @@ this.Keyboard = {
   },
 
   showInputMethodPicker: function keyboardShowInputMethodPicker() {
+    this.sendToSystem('System:ShowAll', {});
+
+    // XXX: To be removed with mozContentEvent support from shell.js
     SystemAppProxy.dispatchEvent({
       type: "inputmethod-showall"
     });
   },
 
   switchToNextInputMethod: function keyboardSwitchToNextInputMethod() {
+    this.sendToSystem('System:Next', {});
+
+    // XXX: To be removed with mozContentEvent support from shell.js
     SystemAppProxy.dispatchEvent({
       type: "inputmethod-next"
     });
   },
 
-  getText: function keyboardGetText(msg) {
-    this.sendToForm('Forms:GetText', msg.data);
-  },
-
   sendKey: function keyboardSendKey(msg) {
     this.sendToForm('Forms:Input:SendKey', msg.data);
   },
 
   getContext: function keyboardGetContext(msg) {
-    if (this._layouts) {
-      this.sendToKeyboard('Keyboard:LayoutsChange', this._layouts);
+    if (!this.formMM) {
+      return;
     }
 
+    this.sendToKeyboard('Keyboard:SupportsSwitchingTypesChange', {
+      types: this._supportsSwitchingTypes
+    });
+
     this.sendToForm('Forms:GetContext', msg.data);
   },
 
@@ -367,17 +440,28 @@ this.Keyboard = {
     this.sendToForm('Forms:EndComposition', msg.data);
   },
 
-  /**
-   * Get the number of keyboard layouts active from keyboard_manager
-   */
-  _layouts: null,
-  setLayouts: function keyboardSetLayoutCount(layouts) {
+  setSupportsSwitchingTypes: function setSupportsSwitchingTypes(msg) {
+    this._supportsSwitchingTypes = msg.data.types;
+    this.sendToKeyboard('Keyboard:SupportsSwitchingTypesChange', msg.data);
+  },
+  // XXX: To be removed with mozContentEvent support from shell.js
+  setLayouts: function keyboardSetLayouts(layouts) {
     // The input method plugins may not have loaded yet,
     // cache the layouts so on init we can respond immediately instead
     // of going back and forth between keyboard_manager
-    this._layouts = layouts;
+    var types = [];
 
-    this.sendToKeyboard('Keyboard:LayoutsChange', layouts);
+    Object.keys(layouts).forEach((type) => {
+      if (layouts[type] > 1) {
+        types.push(type);
+      }
+    });
+
+    this._supportsSwitchingTypes = types;
+
+    this.sendToKeyboard('Keyboard:SupportsSwitchingTypesChange', {
+      types: types
+    });
   }
 };
 
@@ -387,14 +471,17 @@ function InputRegistryGlue() {
 
   ppmm.addMessageListener('InputRegistry:Add', this);
   ppmm.addMessageListener('InputRegistry:Remove', this);
+  ppmm.addMessageListener('System:InputRegistry:Add:Done', this);
+  ppmm.addMessageListener('System:InputRegistry:Remove:Done', this);
 };
 
 InputRegistryGlue.prototype.receiveMessage = function(msg) {
   let mm = Utils.getMMFromMessage(msg);
 
-  if (!Utils.checkPermissionForMM(mm, 'input')) {
+  let permName = msg.name.startsWith("System:") ? "input-mgmt" : "input";
+  if (!Utils.checkPermissionForMM(mm, permName)) {
     dump("InputRegistryGlue message " + msg.name +
-      " from a content process with no 'input' privileges.");
+      " from a content process with no " + permName + " privileges.");
     return;
   }
 
@@ -407,6 +494,12 @@ InputRegistryGlue.prototype.receiveMessage = function(msg) {
     case 'InputRegistry:Remove':
       this.removeInput(msg, mm);
 
+      break;
+
+    case 'System:InputRegistry:Add:Done':
+    case 'System:InputRegistry:Remove:Done':
+      this.returnMessage(msg.data);
+
       break;
   }
 };
@@ -420,6 +513,14 @@ InputRegistryGlue.prototype.addInput = function(msg, mm) {
 
   let manifestURL = appsService.getManifestURLByLocalId(msg.data.appId);
 
+  Keyboard.sendToSystem('System:InputRegistry:Add', {
+    id: msgId,
+    manifestURL: manifestURL,
+    inputId: msg.data.inputId,
+    inputManifest: msg.data.inputManifest
+  });
+
+  // XXX: To be removed when content migrate away from mozChromeEvents.
   SystemAppProxy.dispatchEvent({
     type: 'inputregistry-add',
     id: msgId,
@@ -438,6 +539,13 @@ InputRegistryGlue.prototype.removeInput = function(msg, mm) {
 
   let manifestURL = appsService.getManifestURLByLocalId(msg.data.appId);
 
+  Keyboard.sendToSystem('System:InputRegistry:Remove', {
+    id: msgId,
+    manifestURL: manifestURL,
+    inputId: msg.data.inputId
+  });
+
+  // XXX: To be removed when content migrate away from mozChromeEvents.
   SystemAppProxy.dispatchEvent({
     type: 'inputregistry-remove',
     id: msgId,
@@ -448,6 +556,8 @@ InputRegistryGlue.prototype.removeInput = function(msg, mm) {
 
 InputRegistryGlue.prototype.returnMessage = function(detail) {
   if (!this._msgMap.has(detail.id)) {
+    dump('InputRegistryGlue: Ignoring already handled message response. ' +
+         'id=' + detail.id + '\n');
     return;
   }
 
@@ -455,6 +565,7 @@ InputRegistryGlue.prototype.returnMessage = function(detail) {
   this._msgMap.delete(detail.id);
 
   if (Cu.isDeadWrapper(mm)) {
+    dump('InputRegistryGlue: Message manager has already died.\n');
     return;
   }
 
diff --git a/dom/inputmethod/MozKeyboard.js b/dom/inputmethod/MozKeyboard.js
index be0f83f184..71030c638d 100644
--- a/dom/inputmethod/MozKeyboard.js
+++ b/dom/inputmethod/MozKeyboard.js
@@ -7,6 +7,7 @@
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
+const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -136,13 +137,61 @@ function MozInputMethodManager(win) {
 }
 
 MozInputMethodManager.prototype = {
-  _supportsSwitching: false,
+  supportsSwitchingForCurrentInputContext: false,
   _window: null,
 
   classID: Components.ID("{7e9d7280-ef86-11e2-b778-0800200c9a66}"),
 
   QueryInterface: XPCOMUtils.generateQI([]),
 
+  set oninputcontextfocus(handler) {
+    this.__DOM_IMPL__.setEventHandler("oninputcontextfocus", handler);
+  },
+
+  get oninputcontextfocus() {
+    return this.__DOM_IMPL__.getEventHandler("oninputcontextfocus");
+  },
+
+  set oninputcontextblur(handler) {
+    this.__DOM_IMPL__.setEventHandler("oninputcontextblur", handler);
+  },
+
+  get oninputcontextblur() {
+    return this.__DOM_IMPL__.getEventHandler("oninputcontextblur");
+  },
+
+  set onshowallrequest(handler) {
+    this.__DOM_IMPL__.setEventHandler("onshowallrequest", handler);
+  },
+
+  get onshowallrequest() {
+    return this.__DOM_IMPL__.getEventHandler("onshowallrequest");
+  },
+
+  set onnextrequest(handler) {
+    this.__DOM_IMPL__.setEventHandler("onnextrequest", handler);
+  },
+
+  get onnextrequest() {
+    return this.__DOM_IMPL__.getEventHandler("onnextrequest");
+  },
+
+  set onaddinputrequest(handler) {
+    this.__DOM_IMPL__.setEventHandler("onaddinputrequest", handler);
+  },
+
+  get onaddinputrequest() {
+    return this.__DOM_IMPL__.getEventHandler("onaddinputrequest");
+  },
+
+  set onremoveinputrequest(handler) {
+    this.__DOM_IMPL__.setEventHandler("onremoveinputrequest", handler);
+  },
+
+  get onremoveinputrequest() {
+    return this.__DOM_IMPL__.getEventHandler("onremoveinputrequest");
+  },
+
   showAll: function() {
     if (!WindowMap.isActive(this._window)) {
       return;
@@ -161,7 +210,7 @@ MozInputMethodManager.prototype = {
     if (!WindowMap.isActive(this._window)) {
       return false;
     }
-    return this._supportsSwitching;
+    return this.supportsSwitchingForCurrentInputContext;
   },
 
   hide: function() {
@@ -169,6 +218,175 @@ MozInputMethodManager.prototype = {
       return;
     }
     cpmmSendAsyncMessageWithKbID(this, 'Keyboard:RemoveFocus', {});
+  },
+
+  setSupportsSwitchingTypes: function(types) {
+    cpmm.sendAsyncMessage('System:SetSupportsSwitchingTypes', {
+      types: types
+    });
+  },
+
+  handleFocus: function(data) {
+    let detail = new MozInputContextFocusEventDetail(this._window, data);
+    let wrappedDetail =
+      this._window.MozInputContextFocusEventDetail._create(this._window, detail);
+    let event = new this._window.CustomEvent('inputcontextfocus',
+      { cancelable: true, detail: wrappedDetail });
+
+    let handled = !this.__DOM_IMPL__.dispatchEvent(event);
+
+    // A gentle warning if the event is not preventDefault() by the content.
+    if (!handled) {
+      dump('MozKeyboard.js: A frame with input-manage permission did not' +
+        ' handle the inputcontextfocus event dispatched.\n');
+    }
+  },
+
+  handleBlur: function(data) {
+    let event =
+      new this._window.Event('inputcontextblur', { cancelable: true });
+
+    let handled = !this.__DOM_IMPL__.dispatchEvent(event);
+
+    // A gentle warning if the event is not preventDefault() by the content.
+    if (!handled) {
+      dump('MozKeyboard.js: A frame with input-manage permission did not' +
+        ' handle the inputcontextblur event dispatched.\n');
+    }
+  },
+
+  dispatchShowAllRequestEvent: function() {
+    this._fireSimpleEvent('showallrequest');
+  },
+
+  dispatchNextRequestEvent: function() {
+    this._fireSimpleEvent('nextrequest');
+  },
+
+  _fireSimpleEvent: function(eventType) {
+    let event = new this._window.Event(eventType);
+    let handled = !this.__DOM_IMPL__.dispatchEvent(event, { cancelable: true });
+
+    // A gentle warning if the event is not preventDefault() by the content.
+    if (!handled) {
+      dump('MozKeyboard.js: A frame with input-manage permission did not' +
+        ' handle the ' + eventType + ' event dispatched.\n');
+    }
+  },
+
+  handleAddInput: function(data) {
+    let p = this._fireInputRegistryEvent('addinputrequest', data);
+    if (!p) {
+      return;
+    }
+
+    p.then(() => {
+      cpmm.sendAsyncMessage('System:InputRegistry:Add:Done', {
+        id: data.id
+      });
+    }, (error) => {
+      cpmm.sendAsyncMessage('System:InputRegistry:Add:Done', {
+        id: data.id,
+        error: error || 'Unknown Error'
+      });
+    });
+  },
+
+  handleRemoveInput: function(data) {
+    let p = this._fireInputRegistryEvent('removeinputrequest', data);
+    if (!p) {
+      return;
+    }
+
+    p.then(() => {
+      cpmm.sendAsyncMessage('System:InputRegistry:Remove:Done', {
+        id: data.id
+      });
+    }, (error) => {
+      cpmm.sendAsyncMessage('System:InputRegistry:Remove:Done', {
+        id: data.id,
+        error: error || 'Unknown Error'
+      });
+    });
+  },
+
+  _fireInputRegistryEvent: function(eventType, data) {
+    let detail = new MozInputRegistryEventDetail(this._window, data);
+    let wrappedDetail =
+      this._window.MozInputRegistryEventDetail._create(this._window, detail);
+    let event = new this._window.CustomEvent(eventType,
+      { cancelable: true, detail: wrappedDetail });
+    let handled = !this.__DOM_IMPL__.dispatchEvent(event);
+
+    // A gentle warning if the event is not preventDefault() by the content.
+    if (!handled) {
+      dump('MozKeyboard.js: A frame with input-manage permission did not' +
+        ' handle the ' + eventType + ' event dispatched.\n');
+
+      return null;
+    }
+    return detail.takeChainedPromise();
+  }
+};
+
+function MozInputContextFocusEventDetail(win, data) {
+  this.type = data.type;
+  this.inputType = data.inputType;
+  this.value = data.value;
+  // Exposed as MozInputContextChoicesInfo dictionary defined in WebIDL
+  this.choices = data.choices;
+  this.min = data.min;
+  this.max = data.max;
+}
+MozInputContextFocusEventDetail.prototype = {
+  classID: Components.ID("{e0794208-ac50-40e8-b22e-6ee0b4c4e6e8}"),
+  QueryInterface: XPCOMUtils.generateQI([]),
+
+  type: undefined,
+  inputType: undefined,
+  value: '',
+  choices: null,
+  min: undefined,
+  max: undefined
+};
+
+function MozInputRegistryEventDetail(win, data) {
+  this._window = win;
+
+  this.manifestURL = data.manifestURL;
+  this.inputId = data.inputId;
+  // Exposed as MozInputMethodInputManifest dictionary defined in WebIDL
+  this.inputManifest = data.inputManifest;
+
+  this._chainedPromise = Promise.resolve();
+}
+MozInputRegistryEventDetail.prototype = {
+  classID: Components.ID("{02130070-9b3e-4f38-bbd9-f0013aa36717}"),
+  QueryInterface: XPCOMUtils.generateQI([]),
+
+  _window: null,
+
+  manifestURL: undefined,
+  inputId: undefined,
+  inputManifest: null,
+
+  waitUntil: function(p) {
+    // Need an extra protection here since waitUntil will be an no-op
+    // when chainedPromise is already returned.
+    if (!this._chainedPromise) {
+      throw new this._window.DOMException(
+        'Must call waitUntil() within the event handling loop.',
+        'InvalidStateError');
+    }
+
+    this._chainedPromise = this._chainedPromise
+      .then(function() { return p; });
+  },
+
+  takeChainedPromise: function() {
+    var p = this._chainedPromise;
+    this._chainedPromise = null;
+    return p;
   }
 };
 
@@ -182,12 +400,13 @@ function MozInputMethod() { }
 MozInputMethod.prototype = {
   __proto__: DOMRequestIpcHelper.prototype,
 
+  _window: null,
   _inputcontext: null,
   _wrappedInputContext: null,
-  _layouts: {},
-  _window: null,
-  _isSystem: false,
-  _isKeyboard: true,
+  _mgmt: null,
+  _wrappedMgmt: null,
+  _supportsSwitchingTypes: [],
+  _inputManageId: undefined,
 
   classID: Components.ID("{4607330d-e7d2-40a4-9eb8-43967eae0142}"),
 
@@ -200,69 +419,83 @@ MozInputMethod.prototype = {
   init: function mozInputMethodInit(win) {
     this._window = win;
     this._mgmt = new MozInputMethodManager(win);
+    this._wrappedMgmt = win.MozInputMethodManager._create(win, this._mgmt);
     this.innerWindowID = win.QueryInterface(Ci.nsIInterfaceRequestor)
                             .getInterface(Ci.nsIDOMWindowUtils)
                             .currentInnerWindowID;
 
     Services.obs.addObserver(this, "inner-window-destroyed", false);
 
-    let principal = win.document.nodePrincipal;
-    let perm = Services.perms.testExactPermissionFromPrincipal(principal,
-                                                               "input-manage");
-    if (perm === Ci.nsIPermissionManager.ALLOW_ACTION) {
-      this._isSystem = true;
-    }
-
-    perm = Services.perms.testExactPermissionFromPrincipal(principal, "input");
-    if (perm !== Ci.nsIPermissionManager.ALLOW_ACTION) {
-      this._isKeyboard = false;
-      return;
-    }
-
-    cpmm.addWeakMessageListener('Keyboard:FocusChange', this);
+    cpmm.addWeakMessageListener('Keyboard:Focus', this);
+    cpmm.addWeakMessageListener('Keyboard:Blur', this);
     cpmm.addWeakMessageListener('Keyboard:SelectionChange', this);
     cpmm.addWeakMessageListener('Keyboard:GetContext:Result:OK', this);
-    cpmm.addWeakMessageListener('Keyboard:LayoutsChange', this);
+    cpmm.addWeakMessageListener('Keyboard:SupportsSwitchingTypesChange', this);
     cpmm.addWeakMessageListener('InputRegistry:Result:OK', this);
     cpmm.addWeakMessageListener('InputRegistry:Result:Error', this);
+
+    if (this._hasInputManagePerm(win)) {
+      this._inputManageId = cpmm.sendSyncMessage('System:RegisterSync', {})[0];
+      cpmm.addWeakMessageListener('System:Focus', this);
+      cpmm.addWeakMessageListener('System:Blur', this);
+      cpmm.addWeakMessageListener('System:ShowAll', this);
+      cpmm.addWeakMessageListener('System:Next', this);
+      cpmm.addWeakMessageListener('System:InputRegistry:Add', this);
+      cpmm.addWeakMessageListener('System:InputRegistry:Remove', this);
+    }
   },
 
   uninit: function mozInputMethodUninit() {
     this._window = null;
     this._mgmt = null;
-    Services.obs.removeObserver(this, "inner-window-destroyed");
-    if (!this._isKeyboard) {
-      return;
-    }
+    this._wrappedMgmt = null;
 
-    cpmm.removeWeakMessageListener('Keyboard:FocusChange', this);
+    cpmm.removeWeakMessageListener('Keyboard:Focus', this);
+    cpmm.removeWeakMessageListener('Keyboard:Blur', this);
     cpmm.removeWeakMessageListener('Keyboard:SelectionChange', this);
     cpmm.removeWeakMessageListener('Keyboard:GetContext:Result:OK', this);
-    cpmm.removeWeakMessageListener('Keyboard:LayoutsChange', this);
+    cpmm.removeWeakMessageListener('Keyboard:SupportsSwitchingTypesChange', this);
     cpmm.removeWeakMessageListener('InputRegistry:Result:OK', this);
     cpmm.removeWeakMessageListener('InputRegistry:Result:Error', this);
     this.setActive(false);
+
+    if (typeof this._inputManageId === 'number') {
+      cpmm.sendAsyncMessage('System:Unregister', {
+        'id': this._inputManageId
+      });
+      cpmm.removeWeakMessageListener('System:Focus', this);
+      cpmm.removeWeakMessageListener('System:Blur', this);
+      cpmm.removeWeakMessageListener('System:ShowAll', this);
+      cpmm.removeWeakMessageListener('System:Next', this);
+      cpmm.removeWeakMessageListener('System:InputRegistry:Add', this);
+      cpmm.removeWeakMessageListener('System:InputRegistry:Remove', this);
+    }
   },
 
   receiveMessage: function mozInputMethodReceiveMsg(msg) {
-    if (!msg.name.startsWith('InputRegistry') &&
+    if (msg.name.startsWith('Keyboard') &&
         !WindowMap.isActive(this._window)) {
       return;
     }
 
     let data = msg.data;
+
+    if (msg.name.startsWith('System') &&
+      this._inputManageId !== data.inputManageId) {
+      return;
+    }
+    delete data.inputManageId;
+
     let resolver = ('requestId' in data) ?
       this.takePromiseResolver(data.requestId) : null;
 
     switch(msg.name) {
-      case 'Keyboard:FocusChange':
-        if (data.type !== 'blur') {
-          // XXX Bug 904339 could receive 'text' event twice
-          this.setInputContext(data);
-        }
-        else {
-          this.setInputContext(null);
-        }
+      case 'Keyboard:Focus':
+        // XXX Bug 904339 could receive 'text' event twice
+        this.setInputContext(data);
+        break;
+      case 'Keyboard:Blur':
+        this.setInputContext(null);
         break;
       case 'Keyboard:SelectionChange':
         if (this.inputcontext) {
@@ -272,8 +505,8 @@ MozInputMethod.prototype = {
       case 'Keyboard:GetContext:Result:OK':
         this.setInputContext(data);
         break;
-      case 'Keyboard:LayoutsChange':
-        this._layouts = data;
+      case 'Keyboard:SupportsSwitchingTypesChange':
+        this._supportsSwitchingTypes = data.types;
         break;
 
       case 'InputRegistry:Result:OK':
@@ -285,6 +518,30 @@ MozInputMethod.prototype = {
         resolver.reject(data.error);
 
         break;
+
+      case 'System:Focus':
+        this._mgmt.handleFocus(data);
+        break;
+
+      case 'System:Blur':
+        this._mgmt.handleBlur(data);
+        break;
+
+      case 'System:ShowAll':
+        this._mgmt.dispatchShowAllRequestEvent();
+        break;
+
+      case 'System:Next':
+        this._mgmt.dispatchNextRequestEvent();
+        break;
+
+      case 'System:InputRegistry:Add':
+        this._mgmt.handleAddInput(data);
+        break;
+
+      case 'System:InputRegistry:Remove':
+        this._mgmt.handleRemoveInput(data);
+        break;
     }
   },
 
@@ -295,7 +552,7 @@ MozInputMethod.prototype = {
   },
 
   get mgmt() {
-    return this._mgmt;
+    return this._wrappedMgmt;
   },
 
   get inputcontext() {
@@ -318,13 +575,12 @@ MozInputMethod.prototype = {
       this._inputcontext.destroy();
       this._inputcontext = null;
       this._wrappedInputContext = null;
-      this._mgmt._supportsSwitching = false;
+      this._mgmt.supportsSwitchingForCurrentInputContext = false;
     }
 
     if (data) {
-      this._mgmt._supportsSwitching = this._layouts[data.type] ?
-        this._layouts[data.type] > 1 :
-        false;
+      this._mgmt.supportsSwitchingForCurrentInputContext =
+        (this._supportsSwitchingTypes.indexOf(data.inputType) !== -1);
 
       this._inputcontext = new MozInputContext(data);
       this._inputcontext.init(this._window);
@@ -334,8 +590,7 @@ MozInputMethod.prototype = {
         this._window.MozInputContext._create(this._window, this._inputcontext);
     }
 
-    let event = new this._window.Event("inputcontextchange",
-                                       Cu.cloneInto({}, this._window));
+    let event = new this._window.Event("inputcontextchange");
     this.__DOM_IMPL__.dispatchEvent(event);
   },
 
@@ -358,9 +613,9 @@ MozInputMethod.prototype = {
       // we have to use a synchronous message
       var kbID = WindowMap.getKbID(this._window);
       if (kbID) {
-        cpmmSendAsyncMessageWithKbID(this, 'Keyboard:Register', {});
+        cpmmSendAsyncMessageWithKbID(this, 'Keyboard:RegisterSync', {});
       } else {
-        let res = cpmm.sendSyncMessage('Keyboard:Register', {});
+        let res = cpmm.sendSyncMessage('Keyboard:RegisterSync', {});
         WindowMap.setKbID(this._window, res[0]);
       }
 
@@ -400,35 +655,32 @@ MozInputMethod.prototype = {
   },
 
   setValue: function(value) {
-    this._ensureIsSystem();
     cpmm.sendAsyncMessage('System:SetValue', {
       'value': value
     });
   },
 
   setSelectedOption: function(index) {
-    this._ensureIsSystem();
     cpmm.sendAsyncMessage('System:SetSelectedOption', {
       'index': index
     });
   },
 
   setSelectedOptions: function(indexes) {
-    this._ensureIsSystem();
     cpmm.sendAsyncMessage('System:SetSelectedOptions', {
       'indexes': indexes
     });
   },
 
   removeFocus: function() {
-    this._ensureIsSystem();
     cpmm.sendAsyncMessage('System:RemoveFocus', {});
   },
 
-  _ensureIsSystem: function() {
-    if (!this._isSystem) {
-      throw new this._window.Error("Should have 'input-manage' permssion.");
-    }
+  _hasInputManagePerm: function(win) {
+    let principal = win.document.nodePrincipal;
+    let perm = Services.perms.testExactPermissionFromPrincipal(principal,
+                                                               "input-manage");
+    return (perm === Ci.nsIPermissionManager.ALLOW_ACTION);
   }
 };
 
@@ -487,26 +739,67 @@ InputContextDOMRequestIpcHelper.prototype = {
   }
 };
 
+function MozInputContextSelectionChangeEventDetail(ctx, ownAction) {
+  this._ctx = ctx;
+  this.ownAction = ownAction;
+}
+
+MozInputContextSelectionChangeEventDetail.prototype = {
+  classID: Components.ID("ef35443e-a400-4ae3-9170-c2f4e05f7aed"),
+  QueryInterface: XPCOMUtils.generateQI([]),
+
+  ownAction: false,
+
+  get selectionStart() {
+    return this._ctx.selectionStart;
+  },
+
+  get selectionEnd() {
+    return this._ctx.selectionEnd;
+  }
+};
+
+function MozInputContextSurroundingTextChangeEventDetail(ctx, ownAction) {
+  this._ctx = ctx;
+  this.ownAction = ownAction;
+}
+
+MozInputContextSurroundingTextChangeEventDetail.prototype = {
+  classID: Components.ID("1c50fdaf-74af-4b2e-814f-792caf65a168"),
+  QueryInterface: XPCOMUtils.generateQI([]),
+
+  ownAction: false,
+
+  get text() {
+    return this._ctx.text;
+  },
+
+  get textBeforeCursor() {
+    return this._ctx.textBeforeCursor;
+  },
+
+  get textAfterCursor() {
+    return this._ctx.textAfterCursor;
+  }
+};
+
  /**
  * ==============================================
  * InputContext
  * ==============================================
  */
-function MozInputContext(ctx) {
+function MozInputContext(data) {
   this._context = {
-    inputtype: ctx.type,
-    inputmode: ctx.inputmode,
-    lang: ctx.lang,
-    type: ["textarea", "contenteditable"].indexOf(ctx.type) > -1 ?
-              ctx.type :
-              "text",
-    selectionStart: ctx.selectionStart,
-    selectionEnd: ctx.selectionEnd,
-    textBeforeCursor: ctx.textBeforeCursor,
-    textAfterCursor: ctx.textAfterCursor
+    type: data.type,
+    inputType: data.inputType,
+    inputMode: data.inputMode,
+    lang: data.lang,
+    selectionStart: data.selectionStart,
+    selectionEnd: data.selectionEnd,
+    text: data.value
   };
 
-  this._contextId = ctx.contextId;
+  this._contextId = data.contextId;
 }
 
 MozInputContext.prototype = {
@@ -599,48 +892,45 @@ MozInputContext.prototype = {
     }
   },
 
-  updateSelectionContext: function ic_updateSelectionContext(ctx, ownAction) {
+  updateSelectionContext: function ic_updateSelectionContext(data, ownAction) {
     if (!this._context) {
       return;
     }
 
-    let selectionDirty = this._context.selectionStart !== ctx.selectionStart ||
-          this._context.selectionEnd !== ctx.selectionEnd;
-    let surroundDirty = this._context.textBeforeCursor !== ctx.textBeforeCursor ||
-          this._context.textAfterCursor !== ctx.textAfterCursor;
+    let selectionDirty =
+      this._context.selectionStart !== data.selectionStart ||
+      this._context.selectionEnd !== data.selectionEnd;
+    let surroundDirty = selectionDirty || data.text !== this._contextId.text;
 
-    this._context.selectionStart = ctx.selectionStart;
-    this._context.selectionEnd = ctx.selectionEnd;
-    this._context.textBeforeCursor = ctx.textBeforeCursor;
-    this._context.textAfterCursor = ctx.textAfterCursor;
+    this._context.text = data.text;
+    this._context.selectionStart = data.selectionStart;
+    this._context.selectionEnd = data.selectionEnd;
 
     if (selectionDirty) {
-      this._fireEvent("selectionchange", {
-        selectionStart: ctx.selectionStart,
-        selectionEnd: ctx.selectionEnd,
-        ownAction: ownAction
-      });
+      let selectionChangeDetail =
+        new MozInputContextSelectionChangeEventDetail(this, ownAction);
+      let wrappedSelectionChangeDetail =
+        this._window.MozInputContextSelectionChangeEventDetail
+          ._create(this._window, selectionChangeDetail);
+      let selectionChangeEvent = new this._window.CustomEvent("selectionchange",
+        { cancelable: false, detail: wrappedSelectionChangeDetail });
+
+      this.__DOM_IMPL__.dispatchEvent(selectionChangeEvent);
     }
 
     if (surroundDirty) {
-      this._fireEvent("surroundingtextchange", {
-        beforeString: ctx.textBeforeCursor,
-        afterString: ctx.textAfterCursor,
-        ownAction: ownAction
-      });
+      let surroundingTextChangeDetail =
+        new MozInputContextSurroundingTextChangeEventDetail(this, ownAction);
+      let wrappedSurroundingTextChangeDetail =
+        this._window.MozInputContextSurroundingTextChangeEventDetail
+          ._create(this._window, surroundingTextChangeDetail);
+      let selectionChangeEvent = new this._window.CustomEvent("surroundingtextchange",
+        { cancelable: false, detail: wrappedSurroundingTextChangeDetail });
+
+      this.__DOM_IMPL__.dispatchEvent(selectionChangeEvent);
     }
   },
 
-  _fireEvent: function ic_fireEvent(eventName, aDetail) {
-    let detail = {
-      detail: aDetail
-    };
-
-    let event = new this._window.CustomEvent(eventName,
-                                             Cu.cloneInto(detail, this._window));
-    this.__DOM_IMPL__.dispatchEvent(event);
-  },
-
   // tag name of the input field
   get type() {
     return this._context.type;
@@ -648,11 +938,11 @@ MozInputContext.prototype = {
 
   // type of the input field
   get inputType() {
-    return this._context.inputtype;
+    return this._context.inputType;
   },
 
   get inputMode() {
-    return this._context.inputmode;
+    return this._context.inputMode;
   },
 
   get lang() {
@@ -660,15 +950,16 @@ MozInputContext.prototype = {
   },
 
   getText: function ic_getText(offset, length) {
-    let self = this;
-    return this._sendPromise(function(resolverId) {
-      cpmmSendAsyncMessageWithKbID(self, 'Keyboard:GetText', {
-        contextId: self._contextId,
-        requestId: resolverId,
-        offset: offset,
-        length: length
-      });
-    });
+    let text;
+    if (offset && length) {
+      text = this._context.text.substr(offset, length);
+    } else if (offset) {
+      text = this._context.text.substr(offset);
+    } else {
+      text = this._context.text;
+    }
+
+    return this._window.Promise.resolve(text);
   },
 
   get selectionStart() {
@@ -679,12 +970,23 @@ MozInputContext.prototype = {
     return this._context.selectionEnd;
   },
 
+  get text() {
+    return this._context.text;
+  },
+
   get textBeforeCursor() {
-    return this._context.textBeforeCursor;
+    let text = this._context.text;
+    let start = this._context.selectionStart;
+    return (start < 100) ?
+      text.substr(0, start) :
+      text.substr(start - 100, 100);
   },
 
   get textAfterCursor() {
-    return this._context.textAfterCursor;
+    let text = this._context.text;
+    let start = this._context.selectionStart;
+    let end = this._context.selectionEnd;
+    return text.substr(start, end - start + 100);
   },
 
   setSelectionRange: function ic_setSelectionRange(start, length) {
diff --git a/dom/inputmethod/forms.js b/dom/inputmethod/forms.js
index c7bbf7674c..dacfcc8e1a 100644
--- a/dom/inputmethod/forms.js
+++ b/dom/inputmethod/forms.js
@@ -421,7 +421,6 @@ var FormAssistant = {
     addMessageListener("Forms:Select:Blur", this);
     addMessageListener("Forms:SetSelectionRange", this);
     addMessageListener("Forms:ReplaceSurroundingText", this);
-    addMessageListener("Forms:GetText", this);
     addMessageListener("Forms:Input:SendKey", this);
     addMessageListener("Forms:GetContext", this);
     addMessageListener("Forms:SetComposition", this);
@@ -436,8 +435,8 @@ var FormAssistant = {
   isHandlingFocus: false,
   selectionStart: -1,
   selectionEnd: -1,
-  textBeforeCursor: "",
-  textAfterCursor: "",
+  text: "",
+
   scrollIntoViewTimeout: null,
   _focusedElement: null,
   _focusCounter: 0, // up one for every time we focus a new element
@@ -522,8 +521,6 @@ var FormAssistant = {
         });
         if (del && element === self.focusedElement) {
           self.unhandleFocus();
-          self.selectionStart = -1;
-          self.selectionEnd = -1;
         }
       });
 
@@ -624,8 +621,6 @@ var FormAssistant = {
       case "blur":
         if (this.focusedElement) {
           this.unhandleFocus();
-          this.selectionStart = -1;
-          this.selectionEnd = -1;
         }
         break;
 
@@ -694,14 +689,6 @@ var FormAssistant = {
     }
 
     if (!target) {
-      switch (msg.name) {
-      case "Forms:GetText":
-        sendAsyncMessage("Forms:GetText:Result:Error", {
-          requestId: json.requestId,
-          error: "No focused element"
-        });
-        break;
-      }
       return;
     }
 
@@ -933,24 +920,6 @@ var FormAssistant = {
         break;
       }
 
-      case "Forms:GetText": {
-        let value = isContentEditable(target) ? getContentEditableText(target)
-                                              : target.value;
-
-        if (json.offset && json.length) {
-          value = value.substr(json.offset, json.length);
-        }
-        else if (json.offset) {
-          value = value.substr(json.offset);
-        }
-
-        sendAsyncMessage("Forms:GetText:Result:OK", {
-          requestId: json.requestId,
-          text: value
-        });
-        break;
-      }
-
       case "Forms:GetContext": {
         let obj = getJSON(target, this._focusCounter);
         sendAsyncMessage("Forms:GetContext:Result:OK", obj);
@@ -995,7 +964,10 @@ var FormAssistant = {
   unhandleFocus: function fa_unhandleFocus() {
     this.setFocusedElement(null);
     this.isHandlingFocus = false;
-    sendAsyncMessage("Forms:Input", { "type": "blur" });
+    this.selectionStart = -1;
+    this.selectionEnd = -1;
+    this.text = "";
+    sendAsyncMessage("Forms:Blur", {});
   },
 
   isFocusableElement: function fa_isFocusableElement(element) {
@@ -1024,7 +996,7 @@ var FormAssistant = {
   },
 
   sendInputState: function(element) {
-    sendAsyncMessage("Forms:Input", getJSON(element, this._focusCounter));
+    sendAsyncMessage("Forms:Focus", getJSON(element, this._focusCounter));
   },
 
   getSelectionInfo: function fa_getSelectionInfo() {
@@ -1034,23 +1006,18 @@ var FormAssistant = {
     let text = isContentEditable(element) ? getContentEditableText(element)
                                           : element.value;
 
-    let textAround = getTextAroundCursor(text, range);
-
     let changed = this.selectionStart !== range[0] ||
       this.selectionEnd !== range[1] ||
-      this.textBeforeCursor !== textAround.before ||
-      this.textAfterCursor !== textAround.after;
+      this.text !== text;
 
     this.selectionStart = range[0];
     this.selectionEnd = range[1];
-    this.textBeforeCursor = textAround.before;
-    this.textAfterCursor = textAround.after;
+    this.text = text;
 
     return {
       selectionStart: range[0],
       selectionEnd: range[1],
-      textBeforeCursor: textAround.before,
-      textAfterCursor: textAround.after,
+      text: text,
       changed: changed
     };
   },
@@ -1111,28 +1078,32 @@ function getJSON(element, focusCounter) {
   // need it's number control here in order to get the correct 'type' etc.:
   element = element.ownerNumberControl || element;
 
-  let type = element.type || "";
+  let type = element.tagName.toLowerCase();
+  let inputType = (element.type || "").toLowerCase();
   let value = element.value || "";
   let max = element.max || "";
   let min = element.min || "";
 
-  // Treat contenteditble element as a special text area field
+  // Treat contenteditable element as a special text area field
   if (isContentEditable(element)) {
-    type = "textarea";
+    type = "contenteditable";
+    inputType = "textarea";
     value = getContentEditableText(element);
   }
 
   // Until the input type=date/datetime/range have been implemented
   // let's return their real type even if the platform returns 'text'
-  let attributeType = element.getAttribute("type") || "";
+  let attributeInputType = element.getAttribute("type") || "";
 
-  if (attributeType) {
-    var typeLowerCase = attributeType.toLowerCase();
-    switch (typeLowerCase) {
+  if (attributeInputType) {
+    let inputTypeLowerCase = attributeInputType.toLowerCase();
+    switch (inputTypeLowerCase) {
       case "datetime":
       case "datetime-local":
+      case "month":
+      case "week":
       case "range":
-        type = typeLowerCase;
+        inputType = inputTypeLowerCase;
         break;
     }
   }
@@ -1143,45 +1114,29 @@ function getJSON(element, focusCounter) {
   // inputmode for fields. This shouldn't be used outside of pre-installed
   // apps because the attribute is going to disappear as soon as a definitive
   // solution will be find.
-  let inputmode = element.getAttribute('x-inputmode');
-  if (inputmode) {
-    inputmode = inputmode.toLowerCase();
+  let inputMode = element.getAttribute('x-inputmode');
+  if (inputMode) {
+    inputMode = inputMode.toLowerCase();
   } else {
-    inputmode = '';
+    inputMode = '';
   }
 
   let range = getSelectionRange(element);
-  let textAround = getTextAroundCursor(value, range);
 
   return {
     "contextId": focusCounter,
 
-    "type": type.toLowerCase(),
+    "type": type,
+    "inputType": inputType,
+    "inputMode": inputMode,
+
     "choices": getListForElement(element),
     "value": value,
-    "inputmode": inputmode,
     "selectionStart": range[0],
     "selectionEnd": range[1],
     "max": max,
     "min": min,
-    "lang": element.lang || "",
-    "textBeforeCursor": textAround.before,
-    "textAfterCursor": textAround.after
-  };
-}
-
-function getTextAroundCursor(value, range) {
-  let textBeforeCursor = range[0] < 100 ?
-    value.substr(0, range[0]) :
-    value.substr(range[0] - 100, 100);
-
-  let textAfterCursor = range[1] + 100 > value.length ?
-    value.substr(range[0], value.length) :
-    value.substr(range[0], range[1] - range[0] + 100);
-
-  return {
-    before: textBeforeCursor,
-    after: textAfterCursor
+    "lang": element.lang || ""
   };
 }
 
diff --git a/dom/inputmethod/mochitest/file_inputmethod_1043828.html b/dom/inputmethod/mochitest/file_blank.html
similarity index 100%
rename from dom/inputmethod/mochitest/file_inputmethod_1043828.html
rename to dom/inputmethod/mochitest/file_blank.html
diff --git a/dom/inputmethod/mochitest/mochitest.ini b/dom/inputmethod/mochitest/mochitest.ini
index ab39bfdeb7..2b7652e602 100644
--- a/dom/inputmethod/mochitest/mochitest.ini
+++ b/dom/inputmethod/mochitest/mochitest.ini
@@ -4,7 +4,7 @@ skip-if = (toolkit == 'android' || toolkit == 'gonk') || e10s
 support-files =
   inputmethod_common.js
   file_inputmethod.html
-  file_inputmethod_1043828.html
+  file_blank.html
   file_test_app.html
   file_test_sendkey_cancel.html
   file_test_sms_app.html
@@ -21,9 +21,13 @@ support-files =
 [test_bug1059163.html]
 [test_bug1066515.html]
 [test_bug1175399.html]
+[test_bug1137557.html]
+[test_focus_blur_manage_events.html]
+[test_input_registry_events.html]
 [test_sendkey_cancel.html]
+[test_setSupportsSwitching.html]
+[test_simple_manage_events.html]
 [test_sync_edit.html]
 [test_two_inputs.html]
 [test_two_selects.html]
 [test_unload.html]
-[test_bug1137557.html]
diff --git a/dom/inputmethod/mochitest/test_basic.html b/dom/inputmethod/mochitest/test_basic.html
index fd9c699fcf..6fabc24b0d 100644
--- a/dom/inputmethod/mochitest/test_basic.html
+++ b/dom/inputmethod/mochitest/test_basic.html
@@ -38,10 +38,11 @@ function runTest() {
       return;
     }
 
-    todo_is(gContext.type, 'input', 'The input context type should match.');
+    is(gContext.type, 'input', 'The input context type should match.');
     is(gContext.inputType, 'text', 'The inputType should match.');
-    is(gContext.inputMode, 'verbatim', 'The input mode should match.');
+    is(gContext.inputMode, 'verbatim', 'The inputMode should match.');
     is(gContext.lang, 'zh', 'The language should match.');
+    is(gContext.text, 'Yuan', 'Should get the text.');
     is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
        'Should get the text around the cursor.');
 
@@ -65,6 +66,7 @@ function test_setSelectionRange() {
     test_sendKey();
   }, function(e) {
     ok(false, 'setSelectionRange failed:' + e.name);
+    console.error(e);
     inputmethod_cleanup();
   });
 }
@@ -72,6 +74,8 @@ function test_setSelectionRange() {
 function test_sendKey() {
   // Add '-' to current cursor posistion and move the cursor position to 3.
   gContext.sendKey(0, '-'.charCodeAt(0), 0).then(function() {
+    is(gContext.text, 'Yu-an',
+       'sendKey should changed the input field correctly.');
     is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yu-an',
        'sendKey should changed the input field correctly.');
     test_deleteSurroundingText();
@@ -86,6 +90,8 @@ function test_deleteSurroundingText() {
   // position back to 2.
   gContext.deleteSurroundingText(-1, 1).then(function() {
     ok(true, 'deleteSurroundingText finished');
+    is(gContext.text, 'Yuan',
+       'deleteSurroundingText should changed the input field correctly.');
     is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
        'deleteSurroundingText should changed the input field correctly.');
     test_replaceSurroundingText();
@@ -99,6 +105,8 @@ function test_replaceSurroundingText() {
   // Replace 'Yuan' with 'Xulei'.
   gContext.replaceSurroundingText('Xulei', -2, 4).then(function() {
     ok(true, 'replaceSurroundingText finished');
+    is(gContext.text, 'Xulei',
+       'replaceSurroundingText changed the input field correctly.');
     is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei',
        'replaceSurroundingText changed the input field correctly.');
     test_setComposition();
@@ -120,6 +128,8 @@ function test_setComposition() {
 
 function test_endComposition() {
   gContext.endComposition('2013').then(function() {
+    is(gContext.text, 'Xulei2013',
+       'endComposition changed the input field correctly.');
     is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei2013',
        'endComposition changed the input field correctly.');
     test_onSelectionChange();
@@ -181,8 +191,9 @@ function test_onSurroundingTextChange() {
 
   gContext.onsurroundingtextchange = function(evt) {
     ok(true, 'onsurroundingtextchange fired');
-    is(evt.detail.beforeString, 'Xulei2013jj');
-    is(evt.detail.afterString, '');
+    is(evt.detail.text, 'Xulei2013jj');
+    is(evt.detail.textBeforeCursor, 'Xulei2013jj');
+    is(evt.detail.textAfterCursor, '');
     ok(evt.detail.ownAction);
   };
 
diff --git a/dom/inputmethod/mochitest/test_bug1043828.html b/dom/inputmethod/mochitest/test_bug1043828.html
index 17b374f711..a55f83bd0e 100644
--- a/dom/inputmethod/mochitest/test_bug1043828.html
+++ b/dom/inputmethod/mochitest/test_bug1043828.html
@@ -84,7 +84,7 @@ function runTest() {
     document.body.appendChild(keyboardB);
 
     // simulate two different keyboard apps
-    let imeUrl = basePath + '/file_inputmethod_1043828.html';
+    let imeUrl = basePath + '/file_blank.html';
 
     SpecialPowers.pushPermissions([{
       type: 'input',
diff --git a/dom/inputmethod/mochitest/test_bug1059163.html b/dom/inputmethod/mochitest/test_bug1059163.html
index 79da5d973e..12b1173e23 100644
--- a/dom/inputmethod/mochitest/test_bug1059163.html
+++ b/dom/inputmethod/mochitest/test_bug1059163.html
@@ -54,6 +54,9 @@ function runTest() {
     mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
 
     im.oninputcontextchange = function() {
+      is(im.inputcontext.type, 'contenteditable', 'type');
+      is(im.inputcontext.inputType, 'textarea', 'inputType');
+
       if (im.inputcontext) {
         im.oninputcontextchange = null;
         register();
diff --git a/dom/inputmethod/mochitest/test_focus_blur_manage_events.html b/dom/inputmethod/mochitest/test_focus_blur_manage_events.html
new file mode 100644
index 0000000000..9bea186fbd
--- /dev/null
+++ b/dom/inputmethod/mochitest/test_focus_blur_manage_events.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1201407
+-->
+<head>
+  <title>Test inputcontextfocus and inputcontextblur event</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1201407">Mozilla Bug 1201407</a>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+let contentFrameMM;
+
+function setupTestRunner() {
+  info('setupTestRunner');
+  let im = navigator.mozInputMethod;
+
+  let expectedEventDetails = [
+    { type: 'input', inputType: 'text' },
+    { type: 'input', inputType: 'search' },
+    { type: 'textarea', inputType: 'textarea' },
+    { type: 'contenteditable', inputType: 'textarea' },
+    { type: 'input', inputType: 'number' },
+    { type: 'input', inputType: 'tel' },
+    { type: 'input', inputType: 'url' },
+    { type: 'input', inputType: 'email' },
+    { type: 'input', inputType: 'password' },
+    { type: 'input', inputType: 'datetime' },
+    { type: 'input', inputType: 'date',
+      value: '2015-08-03', min: '1990-01-01', max: '2020-01-01' },
+    { type: 'input', inputType: 'month' },
+    { type: 'input', inputType: 'week' },
+    { type: 'input', inputType: 'time' },
+    { type: 'input', inputType: 'datetime-local' },
+    { type: 'input', inputType: 'color' },
+    { type: 'select', inputType: 'select-one',
+      choices: {
+        multiple: false,
+        choices: [
+          { group: false, inGroup: false, text: 'foo',
+            disabled: false, selected: true, optionIndex: 0 },
+          { group: false, inGroup: false, text: 'bar',
+            disabled: true, selected: false, optionIndex: 1 },
+          { group: true, text: 'group', disabled: false },
+          { group: false, inGroup: true, text: 'baz',
+            disabled: false, selected: false, optionIndex: 2 } ] }
+    },
+    { type: 'select', inputType: 'select-multiple',
+      choices: {
+        multiple: true,
+        choices: [
+          { group: false, inGroup: false, text: 'foo',
+            disabled: false, selected: true, optionIndex: 0 },
+          { group: false, inGroup: false, text: 'bar',
+            disabled: true, selected: false, optionIndex: 1 },
+          { group: true, text: 'group', disabled: false },
+          { group: false, inGroup: true, text: 'baz',
+            disabled: false, selected: false, optionIndex: 2 } ] }
+    }
+  ];
+
+  let expectBlur = false;
+
+  function deepAssertObject(obj, expectedObj, desc) {
+    for (let prop in expectedObj) {
+      if (typeof expectedObj[prop] === 'object') {
+        deepAssertObject(obj[prop], expectedObj[prop], desc + '.' + prop);
+      } else {
+        is(obj[prop], expectedObj[prop], desc + '.' + prop);
+      }
+    }
+  }
+
+  im.mgmt.oninputcontextfocus =
+  im.mgmt.oninputcontextblur = function(evt) {
+    if (expectBlur) {
+      is(evt.type, 'inputcontextblur', 'evt.type');
+      evt.preventDefault();
+      expectBlur = false;
+
+      return;
+    }
+
+    let expectedEventDetail = expectedEventDetails.shift();
+
+    if (!expectedEventDetail) {
+        ok(false, 'Receving extra events');
+        inputmethod_cleanup();
+
+      return;
+    }
+
+    is(evt.type, 'inputcontextfocus', 'evt.type');
+    evt.preventDefault();
+    expectBlur = true;
+
+    let detail = evt.detail;
+    deepAssertObject(detail, expectedEventDetail, 'detail');
+
+    if (expectedEventDetails.length) {
+      contentFrameMM.sendAsyncMessage('test:next');
+    } else {
+      im.mgmt.oninputcontextfocus = im.mgmt.oninputcontextblur = null;
+      inputmethod_cleanup();
+    }
+  };
+}
+
+function setupInputAppFrame() {
+  info('setupInputAppFrame');
+  return new Promise((resolve, reject) => {
+    let appFrameScript = function appFrameScript() {
+      let im = content.navigator.mozInputMethod;
+
+      im.mgmt.oninputcontextfocus =
+      im.mgmt.oninputcontextblur = function(evt) {
+        sendAsyncMessage('text:appEvent', { type: evt.type });
+      };
+
+      content.document.body.textContent = 'I am a input app';
+    };
+
+    let path = location.pathname;
+    let basePath = location.protocol + '//' + location.host +
+                 path.substring(0, path.lastIndexOf('/'));
+    let imeUrl = basePath + '/file_blank.html';
+
+    let inputAppFrame = document.createElement('iframe');
+    inputAppFrame.setAttribute('mozbrowser', true);
+    inputAppFrame.src = imeUrl;
+    document.body.appendChild(inputAppFrame);
+
+    SpecialPowers.pushPermissions([{
+      type: 'input',
+      allow: true,
+      context: {
+        url: imeUrl,
+        appId: SpecialPowers.Ci.nsIScriptSecurityManager.NO_APP_ID,
+        isInBrowserElement: true
+      }
+    }], function() {
+      let mm = SpecialPowers.getBrowserFrameMessageManager(inputAppFrame);
+      inputAppFrame.addEventListener('mozbrowserloadend', function() {
+        mm.addMessageListener('text:appEvent', function(msg) {
+          ok(false, 'Input app should not receive ' + msg.data.type + ' event.');
+        });
+        mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+
+        // Set the input app frame to be active
+        let req = inputAppFrame.setInputMethodActive(true);
+        resolve(req);
+      });
+    });
+  });
+}
+
+function setupContentFrame() {
+  info('setupContentFrame');
+  return new Promise((resolve, reject) => {
+    let contentFrameScript = function contentFrameScript() {
+      let input = content.document.body.firstElementChild;
+
+      let i = 0;
+
+      input.focus();
+
+      addMessageListener('test:next', function() {
+        content.document.body.children[++i].focus();
+      });
+    };
+
+    let iframe = document.createElement('iframe');
+    iframe.src = 'data:text/html,<html><body>' +
+      '<input type="text">' +
+      '<input type="search">' +
+      '<textarea></textarea>' +
+      '<p contenteditable></p>' +
+      '<input type="number">' +
+      '<input type="tel">' +
+      '<input type="url">' +
+      '<input type="email">' +
+      '<input type="password">' +
+      '<input type="datetime">' +
+      '<input type="date" value="2015-08-03" min="1990-01-01" max="2020-01-01">' +
+      '<input type="month">' +
+      '<input type="week">' +
+      '<input type="time">' +
+      '<input type="datetime-local">' +
+      '<input type="color">' +
+      '<select><option selected>foo</option><option disabled>bar</option>' +
+        '<optgroup label="group"><option>baz</option></optgroup></select>' +
+      '<select multiple><option selected>foo</option><option disabled>bar</option>' +
+        '<optgroup label="group"><option>baz</option></optgroup></select>' +
+      '</body></html>';
+    iframe.setAttribute('mozbrowser', true);
+    document.body.appendChild(iframe);
+
+    let mm = contentFrameMM =
+      SpecialPowers.getBrowserFrameMessageManager(iframe);
+
+    iframe.addEventListener('mozbrowserloadend', function() {
+      mm.loadFrameScript('data:,(' + encodeURIComponent(contentFrameScript.toString()) + ')();', false);
+
+      resolve();
+    });
+  });
+}
+
+inputmethod_setup(function() {
+  Promise.resolve()
+    .then(() => setupTestRunner())
+    .then(() => setupContentFrame())
+    .then(() => setupInputAppFrame())
+    .catch((e) => {
+      ok(false, 'Error' + e.toString());
+      console.error(e);
+    });
+});
+
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/dom/inputmethod/mochitest/test_input_registry_events.html b/dom/inputmethod/mochitest/test_input_registry_events.html
new file mode 100644
index 0000000000..bd93ae8b37
--- /dev/null
+++ b/dom/inputmethod/mochitest/test_input_registry_events.html
@@ -0,0 +1,259 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1201407
+-->
+<head>
+  <title>Test addinputrequest and removeinputrequest event</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1201407">Mozilla Bug 1201407</a>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+let appFrameMM;
+let nextStep;
+
+function setupInputAppFrame() {
+  info('setupInputAppFrame');
+  return new Promise((resolve, reject) => {
+    let appFrameScript = function appFrameScript() {
+      let im = content.navigator.mozInputMethod;
+
+      addMessageListener('test:callAddInput', function() {
+        im.addInput('foo', {
+            launch_path: 'bar.html',
+            name: 'Foo',
+            description: 'foobar',
+            types: ['text', 'password']
+          })
+          .then((r) => {
+              sendAsyncMessage('test:resolved', { resolved: true, result: r });
+            }, (e) => {
+              sendAsyncMessage('test:rejected', { rejected: true, error: e });
+            });
+      });
+
+      addMessageListener('test:callRemoveInput', function() {
+        im.removeInput('foo')
+          .then((r) => {
+              sendAsyncMessage('test:resolved', { resolved: true, result: r });
+            }, (e) => {
+              sendAsyncMessage('test:rejected', { rejected: true, error: e });
+            });
+      });
+
+      im.mgmt.onaddinputrequest =
+      im.mgmt.onremoveinputrequest = function(evt) {
+        sendAsyncMessage('test:appEvent', { type: evt.type });
+      };
+
+      content.document.body.textContent = 'I am a input app';
+    };
+
+    let path = location.pathname;
+    let basePath = location.protocol + '//' + location.host +
+                 path.substring(0, path.lastIndexOf('/'));
+    let imeUrl = basePath + '/file_blank.html';
+
+    let inputAppFrame = document.createElement('iframe');
+    inputAppFrame.setAttribute('mozbrowser', true);
+    inputAppFrame.src = imeUrl;
+    document.body.appendChild(inputAppFrame);
+
+    SpecialPowers.pushPermissions([{
+      type: 'input',
+      allow: true,
+      context: {
+        url: imeUrl,
+        appId: SpecialPowers.Ci.nsIScriptSecurityManager.NO_APP_ID,
+        isInBrowserElement: true
+      }
+    }], function() {
+      let mm = appFrameMM =
+        SpecialPowers.getBrowserFrameMessageManager(inputAppFrame);
+
+      inputAppFrame.addEventListener('mozbrowserloadend', function() {
+        mm.addMessageListener('test:appEvent', function(msg) {
+          ok(false, 'Input app should not receive ' + msg.data.type + ' event.');
+        });
+        mm.addMessageListener('test:resolved', function(msg) {
+          nextStep && nextStep(msg.data);
+        });
+        mm.addMessageListener('test:rejected', function(msg) {
+          nextStep && nextStep(msg.data);
+        });
+        mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+
+        resolve();
+      });
+    });
+  });
+}
+
+function Deferred() {
+  this.promise = new Promise((res, rej) => {
+    this.resolve = res;
+    this.reject = rej;
+  });
+  return this;
+}
+
+function deepAssertObject(obj, expectedObj, desc) {
+  for (let prop in expectedObj) {
+    if (typeof expectedObj[prop] === 'object') {
+      deepAssertObject(obj[prop], expectedObj[prop], desc + '.' + prop);
+    } else {
+      is(obj[prop], expectedObj[prop], desc + '.' + prop);
+    }
+  }
+}
+
+function setupTestRunner() {
+  let im = navigator.mozInputMethod;
+  let d;
+
+  let i = -1;
+  nextStep = function next(evt) {
+    i++;
+    info('Step ' + i);
+
+    switch (i) {
+      case 0:
+        appFrameMM.sendAsyncMessage('test:callAddInput');
+
+        break;
+
+      case 1:
+        is(evt.type, 'addinputrequest', 'evt.type');
+        deepAssertObject(evt.detail, {
+          inputId: 'foo',
+          manifestURL: null, // todo
+          inputManifest: {
+            launch_path: 'bar.html',
+            name: 'Foo',
+            description: 'foobar',
+            types: ['text', 'password']
+          }
+        }, 'detail');
+
+        d = new Deferred();
+        evt.detail.waitUntil(d.promise);
+        evt.preventDefault();
+
+        Promise.resolve().then(next);
+        break;
+
+      case 2:
+        d.resolve();
+        d = null;
+        break;
+
+      case 3:
+        ok(evt.resolved, 'resolved');
+        appFrameMM.sendAsyncMessage('test:callAddInput');
+
+        break;
+
+      case 4:
+        is(evt.type, 'addinputrequest', 'evt.type');
+
+        d = new Deferred();
+        evt.detail.waitUntil(d.promise);
+        evt.preventDefault();
+
+        Promise.resolve().then(next);
+        break;
+
+      case 5:
+        d.reject('Foo Error');
+        d = null;
+        break;
+
+      case 6:
+        ok(evt.rejected, 'rejected');
+        is(evt.error, 'Foo Error', 'rejected');
+
+
+        appFrameMM.sendAsyncMessage('test:callRemoveInput');
+
+        break;
+
+      case 7:
+        is(evt.type, 'removeinputrequest', 'evt.type');
+        deepAssertObject(evt.detail, {
+          inputId: 'foo',
+          manifestURL: null // todo
+        }, 'detail');
+
+        d = new Deferred();
+        evt.detail.waitUntil(d.promise);
+        evt.preventDefault();
+
+        Promise.resolve().then(next);
+        break;
+
+      case 8:
+        d.resolve();
+        d = null;
+        break;
+
+      case 9:
+        ok(evt.resolved, 'resolved');
+        appFrameMM.sendAsyncMessage('test:callRemoveInput');
+
+        break;
+
+      case 10:
+        is(evt.type, 'removeinputrequest', 'evt.type');
+
+        d = new Deferred();
+        evt.detail.waitUntil(d.promise);
+        evt.preventDefault();
+
+        Promise.resolve().then(next);
+        break;
+
+      case 11:
+        d.reject('Foo Error');
+        d = null;
+        break;
+
+      case 12:
+        ok(evt.rejected, 'rejected');
+        is(evt.error, 'Foo Error', 'rejected');
+        inputmethod_cleanup();
+
+        break;
+
+      default:
+        ok(false, 'received extra call.');
+        inputmethod_cleanup();
+
+        break;
+    }
+  }
+
+  im.mgmt.onaddinputrequest =
+  im.mgmt.onremoveinputrequest = nextStep;
+}
+
+inputmethod_setup(function() {
+  Promise.resolve()
+    .then(() => setupTestRunner())
+    .then(() => setupInputAppFrame())
+    .then(() => nextStep())
+    .catch((e) => {
+      ok(false, 'Error' + e.toString());
+      console.error(e);
+    });
+});
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/inputmethod/mochitest/test_setSupportsSwitching.html b/dom/inputmethod/mochitest/test_setSupportsSwitching.html
new file mode 100644
index 0000000000..b03e88fefb
--- /dev/null
+++ b/dom/inputmethod/mochitest/test_setSupportsSwitching.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1197682
+-->
+<head>
+  <title>Test inputcontext#inputType and MozInputMethodManager#supportsSwitching()</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1197682">Mozilla Bug 1197682</a>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+inputmethod_setup(function() {
+  runTest();
+});
+
+let appFrameScript = function appFrameScript() {
+  let input = content.document.body.firstElementChild;
+
+  let i = 1;
+
+  input.focus();
+
+  addMessageListener('test:next', function() {
+    i++;
+    switch (i) {
+      case 2:
+        content.document.body.children[1].focus();
+        i++; // keep the same count with the parent frame.
+
+        break;
+
+      case 4:
+        content.document.body.lastElementChild.focus();
+        i++; // keep the same count with the parent frame.
+
+        break;
+
+      case 6:
+        content.document.body.lastElementChild.blur();
+
+        break;
+    }
+  });
+};
+
+function runTest() {
+  let im = navigator.mozInputMethod;
+
+  let i = 0;
+  im.oninputcontextchange = function(evt) {
+    var inputcontext = navigator.mozInputMethod.inputcontext;
+
+    i++;
+    switch (i) {
+      case 1:
+        ok(!!inputcontext, '1) Receving the input context');
+        is(inputcontext.inputType, 'text', '1) input type');
+        is(im.mgmt.supportsSwitching(), true, '1) supports switching');
+
+        mm.sendAsyncMessage('test:next');
+        break;
+
+      case 2:
+        is(inputcontext, null, '2) Receving null inputcontext');
+
+        break;
+
+      case 3:
+        ok(!!inputcontext, '3) Receving the input context');
+        is(inputcontext.inputType, 'number', '3) input type');
+        is(im.mgmt.supportsSwitching(), false, '3) supports switching');
+
+        mm.sendAsyncMessage('test:next');
+        break;
+
+      case 4:
+        is(inputcontext, null, '4) Receving null inputcontext');
+
+        break;
+
+      case 5:
+        ok(!!inputcontext, '5) Receving the input context');
+        is(inputcontext.inputType, 'password', '5) input type');
+        is(im.mgmt.supportsSwitching(), true, '5) supports switching');
+
+        mm.sendAsyncMessage('test:next');
+        break;
+
+      case 6:
+        is(inputcontext, null, '6) Receving null inputcontext');
+        is(im.mgmt.supportsSwitching(), false, '6) supports switching');
+
+        inputmethod_cleanup();
+        break;
+
+      default:
+        ok(false, 'Receving extra inputcontextchange calls');
+        inputmethod_cleanup();
+
+        break;
+    }
+  };
+
+  // Set current page as an input method.
+  SpecialPowers.wrap(im).setActive(true);
+  // Set text and password inputs as supports switching (and not supported for number type)
+  im.mgmt.setSupportsSwitchingTypes(['text', 'password']);
+
+  let iframe = document.createElement('iframe');
+  iframe.src = 'data:text/html,<html><body>' +
+    '<input type="text">' +
+    '<input type="number">' +
+    '<input type="password">' +
+    '</body></html>';
+  iframe.setAttribute('mozbrowser', true);
+  document.body.appendChild(iframe);
+
+  let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
+
+  iframe.addEventListener('mozbrowserloadend', function() {
+    mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+  });
+}
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/inputmethod/mochitest/test_simple_manage_events.html b/dom/inputmethod/mochitest/test_simple_manage_events.html
new file mode 100644
index 0000000000..88bd344e8d
--- /dev/null
+++ b/dom/inputmethod/mochitest/test_simple_manage_events.html
@@ -0,0 +1,164 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1201407
+-->
+<head>
+  <title>Test simple manage notification events on MozInputMethodManager</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1201407">Mozilla Bug 1201407</a>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+let appFrameMM;
+let nextStep;
+
+function setupTestRunner() {
+  info('setupTestRunner');
+  let im = navigator.mozInputMethod;
+
+  let i = 0;
+  im.mgmt.onshowallrequest =
+  im.mgmt.onnextrequest = nextStep = function(evt) {
+    i++;
+    switch (i) {
+      case 1:
+        is(evt.type, 'inputcontextchange', '1) inputcontextchange event');
+        appFrameMM.sendAsyncMessage('test:callShowAll');
+
+        break;
+
+      case 2:
+        is(evt.type, 'showallrequest', '2) showallrequest event');
+        ok(evt.target, im.mgmt, '2) evt.target');
+        evt.preventDefault();
+
+        appFrameMM.sendAsyncMessage('test:callNext');
+
+        break;
+
+      case 3:
+        is(evt.type, 'nextrequest', '3) nextrequest event');
+        ok(evt.target, im.mgmt, '3) evt.target');
+        evt.preventDefault();
+
+        im.mgmt.onshowallrequest =
+        im.mgmt.onnextrequest = nextStep = null;
+
+        inputmethod_cleanup();
+        break;
+
+      default:
+        ok(false, 'Receving extra events');
+        inputmethod_cleanup();
+
+        break;
+    }
+  };
+}
+
+function setupInputAppFrame() {
+  info('setupInputAppFrame');
+  return new Promise((resolve, reject) => {
+    let appFrameScript = function appFrameScript() {
+      let im = content.navigator.mozInputMethod;
+
+      addMessageListener('test:callShowAll', function() {
+        im.mgmt.showAll();
+      });
+
+      addMessageListener('test:callNext', function() {
+        im.mgmt.next();
+      });
+
+      im.mgmt.onshowallrequest =
+      im.mgmt.onnextrequest = function(evt) {
+        sendAsyncMessage('test:appEvent', { type: evt.type });
+      };
+
+      im.oninputcontextchange = function(evt) {
+        sendAsyncMessage('test:inputcontextchange', {});
+      };
+
+      content.document.body.textContent = 'I am a input app';
+    };
+
+    let path = location.pathname;
+    let basePath = location.protocol + '//' + location.host +
+                 path.substring(0, path.lastIndexOf('/'));
+    let imeUrl = basePath + '/file_blank.html';
+
+    let inputAppFrame = document.createElement('iframe');
+    inputAppFrame.setAttribute('mozbrowser', true);
+    inputAppFrame.src = imeUrl;
+    document.body.appendChild(inputAppFrame);
+
+    SpecialPowers.pushPermissions([{
+      type: 'input',
+      allow: true,
+      context: {
+        url: imeUrl,
+        appId: SpecialPowers.Ci.nsIScriptSecurityManager.NO_APP_ID,
+        isInBrowserElement: true
+      }
+    }], function() {
+      let mm = appFrameMM =
+        SpecialPowers.getBrowserFrameMessageManager(inputAppFrame);
+
+      inputAppFrame.addEventListener('mozbrowserloadend', function() {
+        mm.addMessageListener('test:appEvent', function(msg) {
+          ok(false, 'Input app should not receive ' + msg.data.type + ' event.');
+        });
+        mm.addMessageListener('test:inputcontextchange', function(msg) {
+          nextStep && nextStep({ type: 'inputcontextchange' });
+        });
+        mm.loadFrameScript('data:,(' + encodeURIComponent(appFrameScript.toString()) + ')();', false);
+
+        // Set the input app frame to be active
+        let req = inputAppFrame.setInputMethodActive(true);
+        resolve(req);
+      });
+    });
+  });
+}
+
+function setupContentFrame() {
+  let contentFrameScript = function contentFrameScript() {
+    let input = content.document.body.firstElementChild;
+
+    input.focus();
+  };
+
+  let iframe = document.createElement('iframe');
+  iframe.src = 'data:text/html,<html><body><input type="text"></body></html>';
+  iframe.setAttribute('mozbrowser', true);
+  document.body.appendChild(iframe);
+
+  let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
+
+  iframe.addEventListener('mozbrowserloadend', function() {
+    mm.loadFrameScript('data:,(' + encodeURIComponent(contentFrameScript.toString()) + ')();', false);
+  });
+}
+
+inputmethod_setup(function() {
+  Promise.resolve()
+    .then(() => setupTestRunner())
+    .then(() => setupContentFrame())
+    .then(() => setupInputAppFrame())
+    .catch((e) => {
+      ok(false, 'Error' + e.toString());
+      console.error(e);
+    });
+});
+
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index cd358a0136..3c249e0c2b 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -37,6 +37,7 @@
 #include "imgIContainer.h"
 #include "mozIApplication.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/CSSStyleSheet.h"
 #include "mozilla/DataStorage.h"
 #include "mozilla/devtools/HeapSnapshotTempFileHelperParent.h"
 #include "mozilla/docshell/OfflineCacheUpdateParent.h"
@@ -141,7 +142,6 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsISiteSecurityService.h"
 #include "nsISpellChecker.h"
-#include "nsIStyleSheet.h"
 #include "nsISupportsPrimitives.h"
 #include "nsISystemMessagesInternal.h"
 #include "nsITimer.h"
@@ -2697,24 +2697,21 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority,
     // This looks like a lot of work, but in a normal browser session we just
     // send two loads.
 
-    nsCOMArray<nsIStyleSheet>& agentSheets = *sheetService->AgentStyleSheets();
-    for (uint32_t i = 0; i < agentSheets.Length(); i++) {
+        for (CSSStyleSheet* sheet : *sheetService->AgentStyleSheets()) {
       URIParams uri;
-      SerializeURI(agentSheets[i]->GetSheetURI(), uri);
+            SerializeURI(sheet->GetSheetURI(), uri);
       Unused << SendLoadAndRegisterSheet(uri, nsIStyleSheetService::AGENT_SHEET);
     }
 
-    nsCOMArray<nsIStyleSheet>& userSheets = *sheetService->UserStyleSheets();
-    for (uint32_t i = 0; i < userSheets.Length(); i++) {
+        for (CSSStyleSheet* sheet : *sheetService->UserStyleSheets()) {
       URIParams uri;
-      SerializeURI(userSheets[i]->GetSheetURI(), uri);
+            SerializeURI(sheet->GetSheetURI(), uri);
       Unused << SendLoadAndRegisterSheet(uri, nsIStyleSheetService::USER_SHEET);
     }
 
-    nsCOMArray<nsIStyleSheet>& authorSheets = *sheetService->AuthorStyleSheets();
-    for (uint32_t i = 0; i < authorSheets.Length(); i++) {
+        for (CSSStyleSheet* sheet : *sheetService->AuthorStyleSheets()) {
       URIParams uri;
-      SerializeURI(authorSheets[i]->GetSheetURI(), uri);
+            SerializeURI(sheet->GetSheetURI(), uri);
       Unused << SendLoadAndRegisterSheet(uri, nsIStyleSheetService::AUTHOR_SHEET);
     }
   }
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index b8e18ec3c8..46aed0e121 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -386,7 +386,9 @@ public:
   {
     MOZ_ASSERT(NS_IsMainThread());
 
-    mEncodedBufferCache = new EncodedBufferCache(MAX_ALLOW_MEMORY_BUFFER);
+    uint32_t maxMem = Preferences::GetUint("media.recorder.max_memory",
+                                           MAX_ALLOW_MEMORY_BUFFER);
+    mEncodedBufferCache = new EncodedBufferCache(maxMem);
     mLastBlobTimeStamp = TimeStamp::Now();
   }
 
diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index 6a26468bbc..7286e89207 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -2,6 +2,26 @@
 // be ignored. To make sure tests respect that, we include a file of type
 // "bogus/duh" in each list.
 
+// Make sure to not touch navigator in here, since we want to push prefs that
+// will affect the APIs it exposes, but the set of exposed APIs is determined
+// when Navigator.prototype is created.  So if we touch navigator before pushing
+// the prefs, the APIs it exposes will not take those prefs into account.  We
+// work around this by using a navigator object from a different global for our
+// UA string testing.
+var gManifestNavigatorSource = document.documentElement.appendChild(document.createElement("iframe"));
+gManifestNavigatorSource.style.display = "none";
+function manifestNavigator() {
+  return gManifestNavigatorSource.contentWindow.navigator;
+}
+
+// Similarly, use a <video> element from a different global for canPlayType or
+// other feature testing.  If we used one from our global and did so before our
+// prefs are pushed, then we'd instantiate HTMLMediaElement.prototype before the
+// prefs are pushed and APIs we expect to be on that object would not be there.
+function manifestVideo() {
+  return gManifestNavigatorSource.contentDocument.createElement('video');
+}
+
 // These are small test files, good for just seeing if something loads. We
 // really only need one test file per backend here.
 var gSmallTests = [
@@ -350,7 +370,7 @@ var gOggTrackInfoResults = {
 // we've specified.
 function fileUriToSrc(path, mustExist) {
   // android mochitest doesn't support file://
-  if (navigator.appVersion.indexOf("Android") != -1 || SpecialPowers.Services.appinfo.name == "B2G")
+  if (manifestNavigator().appVersion.indexOf("Android") != -1 || SpecialPowers.Services.appinfo.name == "B2G")
     return path;
 
   const Ci = SpecialPowers.Ci;
@@ -474,7 +494,7 @@ var gFastSeekTests = [
 
 function IsWindows8OrLater() {
   var re = /Windows NT (\d.\d)/;
-  var winver = navigator.userAgent.match(re);
+  var winver = manifestNavigator().userAgent.match(re);
   return winver && winver.length == 2 && parseFloat(winver[1]) >= 6.2;
 }
 
@@ -484,12 +504,26 @@ var gUnseekableTests = [
   { name:"no-cues.webm", type:"video/webm" },
   { name:"bogus.duh", type:"bogus/duh"}
 ];
-// Android supports fragmented MP4 playback from 4.3.
-var androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
-                                  .getService(SpecialPowers.Ci.nsIPropertyBag2)
-                                  .getProperty('version');
-// Fragmented MP4.
-if (navigator.userAgent.indexOf("Mobile") != -1 && androidVersion >= 18) {
+
+var androidVersion = -1; // non-Android platforms
+if (manifestNavigator().userAgent.indexOf("Mobile") != -1 ||
+    manifestNavigator().userAgent.indexOf("Tablet") != -1) {
+  // See nsSystemInfo.cpp, the getProperty('version') returns different value
+  // on each platforms, so we need to distinguish the android and B2G platform.
+  var versionString = manifestNavigator().userAgent.indexOf("Android") != -1 ?
+                      'version' : 'sdk_version';
+  androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
+                                .getService(SpecialPowers.Ci.nsIPropertyBag2)
+                                .getProperty(versionString);
+}
+
+function getAndroidVersion() {
+  return androidVersion;
+}
+
+//Android supports fragmented MP4 playback from 4.3.
+//Fragmented MP4.
+if (getAndroidVersion() >= 18) {
   gUnseekableTests = gUnseekableTests.concat([
     { name:"street.mp4", type:"video/mp4" }
   ]);
@@ -722,6 +756,19 @@ function removeNodeAndSource(n) {
   }
 }
 
+function once(target, name, cb) {
+  var p = new Promise(function(resolve, reject) {
+    target.addEventListener(name, function onceEvent() {
+      target.removeEventListener(name, onceEvent);
+      resolve();
+    });
+  });
+  if (cb) {
+    p.then(cb);
+  }
+  return p;
+}
+
 function TimeStamp(token) {
   function pad(x) {
     return (x < 10) ? "0" + x : x;
@@ -742,22 +789,17 @@ function Log(token, msg) {
   info(TimeStamp(token) + " " + msg);
 }
 
-function once(target, name, cb) {
-  var p = new Promise(function(resolve, reject) {
-    target.addEventListener(name, function() {
-      target.removeEventListener(name, cb);
-      resolve();
-    });
-  });
-  if (cb) {
-    p.then(cb);
-  }
-  return p;
-}
-
 // Number of tests to run in parallel.
 var PARALLEL_TESTS = 2;
 
+// Prefs to set before running tests.  Use this to improve coverage of
+// conditions that might not otherwise be encountered on the test data.
+var gTestPrefs = [
+  ['media.recorder.max_memory', 1024],
+  ["media.preload.default", 2], // default preload = metadata
+  ["media.preload.auto", 3] // auto preload = enough
+];
+
 // When true, we'll loop forever on whatever test we run. Use this to debug
 // intermittent test failures.
 const DEBUG_TEST_LOOP_FOREVER = false;
@@ -796,27 +838,36 @@ function MediaTestManager() {
     this.tokens = [];
     this.isShutdown = false;
     this.numTestsRunning = 0;
+    this.handlers = {};
+
     // Always wait for explicit finish.
     SimpleTest.waitForExplicitFinish();
-    this.nextTest();
+    SpecialPowers.pushPrefEnv({'set': gTestPrefs}, (function() {
+      this.nextTest();
+    }).bind(this));
+
+    SimpleTest.registerCleanupFunction(function() {
+      if (this.tokens.length > 0) {
+        info("Test timed out. Remaining tests=" + this.tokens);
+      }
+      for (var token of this.tokens) {
+        var handler = this.handlers[token];
+        if (handler && handler.ontimeout) {
+          handler.ontimeout();
+        }
+      }
+    }.bind(this));
   }
 
   // Registers that the test corresponding to 'token' has been started.
   // Don't call more than once per token.
-  this.started = function(token) {
+  this.started = function(token, handler) {
     this.tokens.push(token);
     this.numTestsRunning++;
+    this.handlers[token] = handler;
     is(this.numTestsRunning, this.tokens.length, "[started " + token + "] Length of array should match number of running tests");
   }
 
-  this.watchdog = null;
-
-  this.watchdogFn = function() {
-    if (this.tokens.length > 0) {
-      info("Watchdog remaining tests= " + this.tokens);
-    }
-  }
-
   // Registers that the test corresponding to 'token' has finished. Call when
   // you've finished your test. If all tests are complete this will finish the
   // run, otherwise it may start up the next run. It's ok to call multiple times
@@ -828,17 +879,11 @@ function MediaTestManager() {
       this.tokens.splice(i, 1);
     }
 
-    if (this.watchdog) {
-      clearTimeout(this.watchdog);
-      this.watchdog = null;
-    }
-
     info("[finished " + token + "] remaining= " + this.tokens);
     this.numTestsRunning--;
     is(this.numTestsRunning, this.tokens.length, "[finished " + token + "] Length of array should match number of running tests");
     if (this.tokens.length < PARALLEL_TESTS) {
       this.nextTest();
-      this.watchdog = setTimeout(this.watchdogFn.bind(this), 10000);
     }
   }
 
@@ -897,52 +942,24 @@ function mediaTestCleanup(callback) {
       removeNodeAndSource(A[i]);
       A[i] = null;
     }
-    var cb = function() {
-      if (callback) {
-        callback();
-      }
-    }
-    SpecialPowers.exactGC(window, cb);
+    SpecialPowers.exactGC(window, callback);
+}
+
+function setMediaTestsPrefs(callback, extraPrefs) {
+  var prefs = gTestPrefs;
+  if (extraPrefs) {
+    prefs = prefs.concat(extraPrefs);
+  }
+  SpecialPowers.pushPrefEnv({"set": prefs}, callback);
 }
 
 // B2G emulator and Android 2.3 are condidered slow platforms
 function isSlowPlatform() {
-  return SpecialPowers.Services.appinfo.name == "B2G" ||
-         navigator.userAgent.indexOf("Mobile") != -1 && androidVersion == 10;
+  return SpecialPowers.Services.appinfo.name == "B2G" || getAndroidVersion() == 10;
 }
 
-(function() {
+// Could be undefined in a page opened by the parent test page
+// like file_access_controls.html.
+if ("SimpleTest" in window) {
   SimpleTest.requestFlakyTimeout("untriaged");
-
-  // Ensure that preload preferences are comsistent
-  var prefService = SpecialPowers.wrap(SpecialPowers.Components)
-                                 .classes["@mozilla.org/preferences-service;1"]
-                                 .getService(SpecialPowers.Ci.nsIPrefService);
-  var branch = prefService.getBranch("media.");
-  var oldDefault = 2;
-  var oldAuto = 3;
-  var oldAppleMedia = undefined;
-  var oldOpus = undefined;
-
-  try { oldAppleMedia = SpecialPowers.getBoolPref("media.apple.mp3.enabled"); } catch(ex) { }
-  try { oldDefault   = SpecialPowers.getIntPref("media.preload.default"); } catch(ex) { }
-  try { oldAuto      = SpecialPowers.getIntPref("media.preload.auto"); } catch(ex) { }
-  try { oldOpus      = SpecialPowers.getBoolPref("media.opus.enabled"); } catch(ex) { }
-
-  SpecialPowers.setIntPref("media.preload.default", 2); // preload_metadata
-  SpecialPowers.setIntPref("media.preload.auto", 3); // preload_enough
-  // test opus playback iff the pref exists
-  if (oldOpus !== undefined)
-    SpecialPowers.setBoolPref("media.opus.enabled", true);
-  if (oldAppleMedia !== undefined)
-    SpecialPowers.setBoolPref("media.apple.mp3.enabled", true);
-
-  window.addEventListener("unload", function() {
-    if (oldAppleMedia !== undefined)
-      SpecialPowers.setBoolPref("media.apple.mp3.enabled", oldAppleMedia);
-    SpecialPowers.setIntPref("media.preload.default", oldDefault);
-    SpecialPowers.setIntPref("media.preload.auto", oldAuto);
-    if (oldOpus !== undefined)
-      SpecialPowers.setBoolPref("media.opus.enabled", oldOpus);
-  }, false);
- })();
+}
diff --git a/dom/media/test/test_access_control.html b/dom/media/test/test_access_control.html
index 57bfeb97b5..8cb82803b3 100644
--- a/dom/media/test/test_access_control.html
+++ b/dom/media/test/test_access_control.html
@@ -28,7 +28,9 @@ function done() {
   SimpleTest.finish();
 }
 
-addLoadEvent(run);
+addLoadEvent(function() {
+  setMediaTestsPrefs(run);
+});
 SimpleTest.waitForExplicitFinish();
 
 
diff --git a/dom/media/test/test_error_on_404.html b/dom/media/test/test_error_on_404.html
index c16d0b4f85..e49f03e227 100644
--- a/dom/media/test/test_error_on_404.html
+++ b/dom/media/test/test_error_on_404.html
@@ -57,7 +57,7 @@ function loadStart(evt) {
 // Create all video objects.
 for (var i=0; i<g404Tests.length; ++i) {
   var v = document.createElement("video");
-  v.preload = "auto";
+  v.preload = "metadata";
   var test = g404Tests[i];
   if (!v.canPlayType(test.type)) {
     continue;
diff --git a/dom/media/test/test_load.html b/dom/media/test/test_load.html
index 4874097e2a..145c34affe 100644
--- a/dom/media/test/test_load.html
+++ b/dom/media/test/test_load.html
@@ -62,7 +62,7 @@ var gMedia = null;
 
 function createMedia(tag) {
   gMedia = document.createElement(tag);
-  gMedia.preload = "auto";
+  gMedia.preload = "metadata";
   for (var i=0; i<gEventTypes.length; i++) {
     gMedia.addEventListener(gEventTypes[i], listener, false);
   }
diff --git a/dom/media/test/test_no_load_event.html b/dom/media/test/test_no_load_event.html
index b2937167c9..1e6e825249 100644
--- a/dom/media/test/test_no_load_event.html
+++ b/dom/media/test/test_no_load_event.html
@@ -14,7 +14,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715469
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=715469">Mozilla Bug 715469</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
 </div>
 <pre id="test">
 
@@ -32,18 +31,14 @@ function start() {
     SimpleTest.waitForExplicitFinish();
     var v = document.createElement("video");
     v.src = resource.name;
-    v.addEventListener("loadeddata", function(){v.play();}, false);
-    v.controls = "true";
-    
-    v.addEventListener("load",
-      function(){
-        gotLoadEvent = true;
-      },
-      false);
-      
+
+    v.addEventListener("load", function() {
+      gotLoadEvent = true;
+    }, false);
+
     v.addEventListener("ended", finished, false);
-    
     document.body.appendChild(v);
+    v.play();
   }
 }
 
@@ -52,7 +47,6 @@ function finished() {
   SimpleTest.finish();
 }
 
-
 </script>
 </pre>
 </body>
diff --git a/dom/media/test/test_playback.html b/dom/media/test/test_playback.html
index b38db0e98d..60ffae3033 100644
--- a/dom/media/test/test_playback.html
+++ b/dom/media/test/test_playback.html
@@ -23,7 +23,15 @@ function startTest(test, token) {
   v.preload = "metadata";
   v.token = token;
   v.prevTime = 0;
-  manager.started(token);
+  v.seenEnded = false;
+  v.seenSuspend = false;
+
+  var handler = {
+    "ontimeout": function() {
+      Log(token, "timed out: ended=" + v.seenEnded + ", suspend=" + v.seenSuspend);
+    }
+  };
+  manager.started(token, handler);
 
   v.src = test.name;
   v.name = test.name;
@@ -37,17 +45,7 @@ function startTest(test, token) {
     ok(false, test.name + " should not fire 'load' event");
   }}(test, v);
 
-  // Used to cancel timer callback.
-  var timer = null;
-
-  var cancelTimer = function() {
-    if (timer) {
-      clearTimeout(timer);
-    }
-  }
-
   var finish = function() {
-    cancelTimer();
     v.finished = true;
     v.removeEventListener("timeupdate", timeUpdate, false);
     removeNodeAndSource(v);
@@ -61,18 +59,6 @@ function startTest(test, token) {
     }
   }
 
-  var onTimeout = function() {
-    ok(v.seenEnded, v.name + " timed out, should get 'ended'");
-    ok(v.seenSuspend, v.name + " timed out, should get 'suspend'");
-    finish();
-  }
-
-  // Check if we time out in waiting for some events.
-  var registerTimer = function() {
-    cancelTimer();
-    timer = setTimeout(onTimeout, 30000);
-  }
-
   var checkEnded = function(test, v) { return function() {
     is(test.name, v.name, test.name + ": Name should match #2");
     checkMetadata(test.name, v, test);
@@ -83,7 +69,6 @@ function startTest(test, token) {
     ok(!v.seenEnded, test.name + " shouldn't be ended");
 
     v.seenEnded = true;
-    registerTimer();
     mayFinish();
   }}(test, v);
 
@@ -94,7 +79,6 @@ function startTest(test, token) {
     is(test.name, v.name, test.name + ": Name should match #3");
 
     v.seenSuspend = true;
-    registerTimer();
     mayFinish();
   }}(test, v);
 
@@ -104,7 +88,6 @@ function startTest(test, token) {
                 v.prevTime + " c=" + v.currentTime);
     }
     v.prevTime = v.currentTime;
-    registerTimer();
   }}(test, v);
 
   v.addEventListener("load", noLoad, false);
diff --git a/dom/media/tests/mochitest/head.js b/dom/media/tests/mochitest/head.js
index 9050bf499e..8ed2449b64 100644
--- a/dom/media/tests/mochitest/head.js
+++ b/dom/media/tests/mochitest/head.js
@@ -235,7 +235,6 @@ function setupEnvironment() {
   window.finish = () => SimpleTest.finish();
   SpecialPowers.pushPrefEnv({
     'set': [
-      ['canvas.capturestream.enabled', true],
       ['media.peerconnection.enabled', true],
       ['media.peerconnection.identity.enabled', true],
       ['media.peerconnection.identity.timeout', 12000],
diff --git a/dom/tests/mochitest/dom-level2-core/exclusions.js b/dom/tests/mochitest/dom-level2-core/exclusions.js
index 818db99a1a..cc5a0da12f 100644
--- a/dom/tests/mochitest/dom-level2-core/exclusions.js
+++ b/dom/tests/mochitest/dom-level2-core/exclusions.js
@@ -13,7 +13,7 @@ dtdTests = ["attrgetownerelement01", "documentimportnode03",
             "getNamedItemNS03", "getNamedItemNS04", "hasAttribute02",
             "hasAttributeNS04", "importNode07", "importNode09",
             "importNode10", "importNode11", "importNode12", "importNode13",
-            "internalSubset01", "localName02", "namednodemapgetnameditemns01",
+            "localName02", "namednodemapgetnameditemns01",
             "namednodemapremovenameditemns02",
             "namednodemapremovenameditemns05", "namednodemapsetnameditemns05",
             "namednodemapsetnameditemns09", "namednodemapsetnameditemns10",
diff --git a/dom/tests/mochitest/dom-level2-core/mochitest.ini b/dom/tests/mochitest/dom-level2-core/mochitest.ini
index 421dba8c12..120f395040 100644
--- a/dom/tests/mochitest/dom-level2-core/mochitest.ini
+++ b/dom/tests/mochitest/dom-level2-core/mochitest.ini
@@ -93,7 +93,6 @@ support-files =
 [test_documentimportnode20.html]
 [test_documentimportnode21.html]
 [test_documentimportnode22.html]
-[test_documenttypeinternalSubset01.html]
 [test_documenttypepublicid01.html]
 [test_documenttypesystemid01.html]
 [test_domimplementationcreatedocument03.html]
@@ -192,7 +191,6 @@ support-files =
 [test_importNode15.html]
 [test_importNode16.html]
 [test_importNode17.html]
-[test_internalSubset01.html]
 [test_localName01.html]
 [test_localName02.html]
 [test_localName03.html]
diff --git a/dom/tests/mochitest/dom-level2-core/test_documenttypeinternalSubset01.html b/dom/tests/mochitest/dom-level2-core/test_documenttypeinternalSubset01.html
deleted file mode 100644
index 0935f8487a..0000000000
--- a/dom/tests/mochitest/dom-level2-core/test_documenttypeinternalSubset01.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypeinternalSubset01</title>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript" src="DOMTestCase.js"></script>
-<script type="text/javascript" src="exclusions.js"></script>
-<script type="text/javascript">
-// expose test function names
-function exposeTestFunctionNames()
-{
-return ['documenttypeinternalSubset01'];
-}
-
-var docsLoaded = -1000000;
-var builder = null;
-
-//
-//   This function is called by the testing framework before
-//      running the test suite.
-//
-//   If there are no configuration exceptions, asynchronous
-//        document loading is started.  Otherwise, the status
-//        is set to complete and the exception is immediately
-//        raised when entering the body of the test.
-//
-function setUpPage() {
-   setUpPageStatus = 'running';
-   try {
-     //
-     //   creates test document builder, may throw exception
-     //
-     builder = createConfiguredBuilder();
-
-      docsLoaded = 0;
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      docsLoaded += preload(docRef, "doc", "staffNS");
-        
-       if (docsLoaded == 1) {
-          setUpPage = 'complete';
-       }
-    } catch(ex) {
-    	catchInitializationError(builder, ex);
-        setUpPage = 'complete';
-    }
-}
-
-//
-//   This method is called on the completion of 
-//      each asychronous load started in setUpTests.
-//
-//   When every synchronous loaded document has completed,
-//      the page status is changed which allows the
-//      body of the test to be executed.
-function loadComplete() {
-  if (++docsLoaded == 1) {
-    setUpPageStatus = 'complete';
-    runJSUnitTests();
-    markTodos();
-    SimpleTest.finish();
-  }
-}
-
-var docName = 'documenttypeinternalSubset01';
-
-
-/**
-* 
-    The method getInternalSubset() returns the internal subset as a string. 
-  
-    Create a new DocumentType node with null values for publicId and systemId.
-    Verify that its internal subset is null.
-
-* @author IBM
-* @author Neil Delima
-* @see http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset
-* @see http://www.w3.org/Bugs/Public/show_bug.cgi?id=259
-*/
-function documenttypeinternalSubset01() {
-   var success;
-    if(checkInitialization(builder, "documenttypeinternalSubset01") != null) return;
-    var doc;
-      var docType;
-      var domImpl;
-      var internal;
-      var nullNS = null;
-
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      doc = load(docRef, "doc", "staffNS");
-      domImpl = doc.implementation;
-docType = domImpl.createDocumentType("l2:root",nullNS,nullNS);
-      internal = docType.internalSubset;
-
-      assertNull("internalSubsetNull",internal);
-    
-}
-
-</script>
-</head>
-<body>
-<h2>Test http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypeinternalSubset01</h2>
-<p></p>
-<p>
-Copyright (c) 2001-2004 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, European Research Consortium 
-for Informatics and Mathematics, Keio University). All 
-Rights Reserved. This work is distributed under the <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">W3C(r) Software License</a> in the 
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-</p>
-</body>
-</html>
diff --git a/dom/tests/mochitest/dom-level2-core/test_internalSubset01.html b/dom/tests/mochitest/dom-level2-core/test_internalSubset01.html
deleted file mode 100644
index 5cec3532cf..0000000000
--- a/dom/tests/mochitest/dom-level2-core/test_internalSubset01.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>http://www.w3.org/2001/DOM-Test-Suite/level2/core/internalSubset01</title>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript" src="DOMTestCase.js"></script>
-<script type="text/javascript" src="exclusions.js"></script>
-<script type="text/javascript">
-// expose test function names
-function exposeTestFunctionNames()
-{
-return ['internalSubset01'];
-}
-
-var docsLoaded = -1000000;
-var builder = null;
-
-//
-//   This function is called by the testing framework before
-//      running the test suite.
-//
-//   If there are no configuration exceptions, asynchronous
-//        document loading is started.  Otherwise, the status
-//        is set to complete and the exception is immediately
-//        raised when entering the body of the test.
-//
-function setUpPage() {
-   setUpPageStatus = 'running';
-   try {
-     //
-     //   creates test document builder, may throw exception
-     //
-     builder = createConfiguredBuilder();
-
-      docsLoaded = 0;
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      docsLoaded += preload(docRef, "doc", "staff2");
-        
-       if (docsLoaded == 1) {
-          setUpPage = 'complete';
-       }
-    } catch(ex) {
-    	catchInitializationError(builder, ex);
-        setUpPage = 'complete';
-    }
-}
-
-//
-//   This method is called on the completion of 
-//      each asychronous load started in setUpTests.
-//
-//   When every synchronous loaded document has completed,
-//      the page status is changed which allows the
-//      body of the test to be executed.
-function loadComplete() {
-  if (++docsLoaded == 1) {
-    setUpPageStatus = 'complete';
-    runJSUnitTests();
-    markTodos();
-    SimpleTest.finish();
-  }
-}
-
-var docName = 'internalSubset01';
-
-
-/**
-* 
-    The "getInternalSubset()" method returns 
-   the internal subset as a string or null if there is none.
-   This does not contain the delimiting brackets.
-   
-   Retrieve the documenttype.
-   Apply the "getInternalSubset()" method.  Null is returned since there 
-   is not an internal subset.
-
-* @author NIST
-* @author Mary Brady
-* @see http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset
-*/
-function internalSubset01() {
-   var success;
-    if(checkInitialization(builder, "internalSubset01") != null) return;
-    var doc;
-      var docType;
-      var internal;
-      
-      var docRef = null;
-      if (typeof(this.doc) != 'undefined') {
-        docRef = this.doc;
-      }
-      doc = load(docRef, "doc", "staff2");
-      docType = doc.doctype;
-
-      internal = docType.internalSubset;
-
-      assertNull("internalSubsetNull",internal);
-    
-}
-
-</script>
-</head>
-<body>
-<h2>Test http://www.w3.org/2001/DOM-Test-Suite/level2/core/internalSubset01</h2>
-<p></p>
-<p>
-Copyright (c) 2001-2004 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, European Research Consortium 
-for Informatics and Mathematics, Keio University). All 
-Rights Reserved. This work is distributed under the <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">W3C(r) Software License</a> in the 
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-</p>
-</body>
-</html>
diff --git a/dom/tests/mochitest/fetch/test_fetch_basic_http.js b/dom/tests/mochitest/fetch/test_fetch_basic_http.js
index f874241f73..b84445c69a 100644
--- a/dom/tests/mochitest/fetch/test_fetch_basic_http.js
+++ b/dom/tests/mochitest/fetch/test_fetch_basic_http.js
@@ -135,6 +135,60 @@ function testBlob() {
   });
 }
 
+// This test is a copy of dom/html/test/formData_test.js testSend() modified to
+// use the fetch API. Please change this if you change that.
+function testFormDataSend() {
+  var file, blob = new Blob(['hey'], {type: 'text/plain'});
+
+  var fd = new FormData();
+  fd.append("string", "hey");
+  fd.append("empty", blob);
+  fd.append("explicit", blob, "explicit-file-name");
+  fd.append("explicit-empty", blob, "");
+  file = new File([blob], 'testname',  {type: 'text/plain'});
+  fd.append("file-name", file);
+  file = new File([blob], '',  {type: 'text/plain'});
+  fd.append("empty-file-name", file);
+  file = new File([blob], 'testname',  {type: 'text/plain'});
+  fd.append("file-name-overwrite", file, "overwrite");
+
+  var req = new Request("/tests/dom/html/test/form_submit_server.sjs", {
+                          method: 'POST',
+                          body: fd,
+                        });
+
+  return fetch(req).then((r) => {
+    ok(r.status, 200, "status should match");
+    return r.json().then((response) => {
+      for (var entry of response) {
+        if (entry.headers['Content-Disposition'] != 'form-data; name="string"') {
+          is(entry.headers['Content-Type'], 'text/plain');
+        }
+
+        is(entry.body, 'hey');
+      }
+
+      is(response[1].headers['Content-Disposition'],
+          'form-data; name="empty"; filename="blob"');
+
+      is(response[2].headers['Content-Disposition'],
+          'form-data; name="explicit"; filename="explicit-file-name"');
+
+      is(response[3].headers['Content-Disposition'],
+          'form-data; name="explicit-empty"; filename=""');
+
+      is(response[4].headers['Content-Disposition'],
+          'form-data; name="file-name"; filename="testname"');
+
+      is(response[5].headers['Content-Disposition'],
+          'form-data; name="empty-file-name"; filename=""');
+
+      is(response[6].headers['Content-Disposition'],
+          'form-data; name="file-name-overwrite"; filename="overwrite"');
+    });
+  });
+}
+
 function runTest() {
   return Promise.resolve()
     .then(testURL)
@@ -142,5 +196,6 @@ function runTest() {
     .then(testRequestGET)
     .then(testResponses)
     .then(testBlob)
+    .then(testFormDataSend)
     // Put more promise based tests here.
 }
diff --git a/dom/tests/mochitest/fetch/test_request.js b/dom/tests/mochitest/fetch/test_request.js
index 33c56e1a1e..7940f44c9e 100644
--- a/dom/tests/mochitest/fetch/test_request.js
+++ b/dom/tests/mochitest/fetch/test_request.js
@@ -344,6 +344,7 @@ function testFormDataBodyCreation() {
     ok(fd.has("more"), "more should exist.");
 
     var b = fd.get("blob");
+    ok(b.name, "blob", "blob entry should be a Blob.");
     ok(b instanceof Blob, "blob entry should be a Blob.");
 
     return readAsText(b).then(function(output) {
@@ -418,6 +419,7 @@ function testFormDataBodyExtraction() {
     var entries = fd.getAll("blob");
     is(entries.length, 1, "getAll returns all items.");
     is(entries[0].name, "blob", "Filename should be blob.");
+    ok(entries[0] instanceof Blob, "getAll returns blobs.");
   });
 
   var ws = "\r\n\r\n\r\n\r\n";
@@ -429,6 +431,7 @@ function testFormDataBodyExtraction() {
     var entries = fd.getAll("blob");
     is(entries.length, 1, "getAll returns all items.");
     is(entries[0].name, "blob", "Filename should be blob.");
+    ok(entries[0] instanceof Blob, "getAll returns blobs.");
 
     ok(fd.has("key"), "Has entry 'key'.");
     var f = fd.get("key");
diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index 3a078c2ec1..8911c86b27 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -133,7 +133,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "AnimationEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "AnimationPlaybackEvent",
+    {name: "AnimationPlaybackEvent", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "AnimationTimeline", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -284,7 +284,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "CameraStateChangeEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "CanvasCaptureMediaStream", disabled: true},
+    {name: "CanvasCaptureMediaStream"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CanvasGradient",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -516,7 +516,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "HDMIInputPort", b2g: true, permission: ["inputport"]},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "HMDVRDevice", disabled: true},
+    {name: "HMDVRDevice", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLAllCollection",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -744,19 +744,19 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaError",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeyError", pref: "media.eme.apiVisible"},
+    {name: "MediaKeyError", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaEncryptedEvent", pref: "media.eme.apiVisible"},
+    {name: "MediaEncryptedEvent", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeys", pref: "media.eme.apiVisible"},
+    {name: "MediaKeys", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeySession", pref: "media.eme.apiVisible"},
+    {name: "MediaKeySession", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeySystemAccess", pref: "media.eme.apiVisible"},
+    {name: "MediaKeySystemAccess", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeyMessageEvent", pref: "media.eme.apiVisible"},
+    {name: "MediaKeyMessageEvent", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaKeyStatusMap", pref: "media.eme.apiVisible"},
+    {name: "MediaKeyStatusMap", android: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaList",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -808,9 +808,9 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozEmergencyCbModeEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozInputContext", b2g: true},
+    {name: "MozInputContext", b2g: true, permission: ["input"]},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozInputMethodManager", b2g: true},
+    {name: "MozInputMethodManager", b2g: true, permission: ["input"]},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozMobileCellInfo", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -944,7 +944,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "PopupBoxObject", xbl: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PositionSensorVRDevice", disabled: true},
+    {name: "PositionSensorVRDevice", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "PresentationDeviceInfoManager",
      disabled: true,
@@ -1016,17 +1016,17 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Selection",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorker", b2g: false, android: false},
+    {name: "ServiceWorker", b2g: false, releaseAndroid: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorkerContainer", b2g: false, android: false},
+    {name: "ServiceWorkerContainer", b2g: false, releaseAndroid: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorkerRegistration", b2g: false, android: false},
+    {name: "ServiceWorkerRegistration", b2g: false, releaseAndroid: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "SettingsLock",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "SettingsManager",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ShadowRoot", pref: "dom.webcomponents.enabled"},
+    "ShadowRoot", // Bogus, but the test harness forces it on.  See bug 1159768.
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "SharedWorker",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1396,13 +1396,15 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "VideoStreamTrack",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VRDevice", disabled: true},
+    {name: "VRDevice", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VRPositionState", disabled: true},
+    {name: "VRPositionState", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VRFieldOfView", disabled: true},
+    {name: "VREyeParameters", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VRFieldOfViewReadOnly", disabled: true},
+    {name: "VRFieldOfView", release: false},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "VRFieldOfViewReadOnly", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "VTTCue",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1500,7 +1502,6 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change the list above without review from a DOM peer!
 
 function createInterfaceMap(isXBLScope) {
-  var prefs = SpecialPowers.Services.prefs;
   var version = SpecialPowers.Cc["@mozilla.org/xre/app-info;1"].getService(SpecialPowers.Ci.nsIXULAppInfo).version;
   var isNightly = version.endsWith("a1");
   var isRelease = !version.includes("a");
@@ -1533,6 +1534,7 @@ function createInterfaceMap(isXBLScope) {
             (entry.linux === !isLinux) ||
             (entry.android === !isAndroid) ||
             (entry.release === !isRelease) ||
+            (entry.releaseAndroid === !(isAndroid && isRelease)) ||
             (entry.permission && !hasPermission(entry.permission)) ||
             entry.disabled) {
           interfaceMap[entry.name] = false;
diff --git a/dom/tv/TVSimulatorService.js b/dom/tv/TVSimulatorService.js
index 8b641e055f..1dbacda0cd 100644
--- a/dom/tv/TVSimulatorService.js
+++ b/dom/tv/TVSimulatorService.js
@@ -17,7 +17,6 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 const TV_SIMULATOR_DUMMY_DIRECTORY   = "dummy";
 const TV_SIMULATOR_DUMMY_FILE        = "settings.json";
-const TV_SIMULATOR_MOCK_DATA         = Services.prefs.getCharPref("dom.testing.tv_mock_data");
 
 // 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",
@@ -51,16 +50,19 @@ TVSimulatorService.prototype = {
       return;
     }
 
+    // I try to load the testing mock data if related preference are already set.
+    // Otherwise, use to the simulation data from prefences.
+    // See /dom/tv/test/mochitest/head.js for more details.
     let settingStr = "";
     try {
-      if (TV_SIMULATOR_MOCK_DATA) {
-        settingStr = TV_SIMULATOR_MOCK_DATA;
-      } else {
-        settingStr = this._getDummyData();
-      }
+      settingStr = Services.prefs.getCharPref("dom.testing.tv_mock_data");
     } catch(e) {
-      debug("Error occurred : " + e );
-      return;
+      try {
+        settingStr = this._getDummyData();
+      } catch(e) {
+        debug("TV Simulator service failed to load simulation data: " + e);
+        return;
+      }
     }
 
     let settingsObj;
@@ -178,7 +180,7 @@ TVSimulatorService.prototype = {
           }
 
           // Sort the program according to the startTime
-	  wrapChannelData.programs.sort(function(a, b) {
+          wrapChannelData.programs.sort(function(a, b) {
             return a.startTime - b.startTime;
           });
           wrapTunerData.channels.set(channel.number, wrapChannelData);
@@ -252,8 +254,8 @@ TVSimulatorService.prototype = {
 
     this._scanCompleteTimer = Cc["@mozilla.org/timer;1"]
                                 .createInstance(Ci.nsITimer);
-    rv = this._scanCompleteTimer.initWithCallback(this, 10,
-                                                  Ci.nsITimer.TYPE_ONE_SHOT);
+    let rv = this._scanCompleteTimer.initWithCallback(this, 10,
+                                                      Ci.nsITimer.TYPE_ONE_SHOT);
     return Cr.NS_OK;
   },
 
diff --git a/dom/webidl/BluetoothAdapter.webidl b/dom/webidl/BluetoothAdapter.webidl
index 0305e660e9..6b9555a3e6 100644
--- a/dom/webidl/BluetoothAdapter.webidl
+++ b/dom/webidl/BluetoothAdapter.webidl
@@ -43,7 +43,7 @@ interface BluetoothAdapter : EventTarget {
   readonly attribute BluetoothGattServer?   gattServer;
 
   [AvailableIn=CertifiedApps]
-  readonly attribute BluetoothPairingListener pairingReqs;
+  readonly attribute BluetoothPairingListener? pairingReqs;
 
   // Fired when attribute(s) of BluetoothAdapter changed
            attribute EventHandler   onattributechanged;
diff --git a/dom/webidl/BrowserElementAudioChannel.webidl b/dom/webidl/BrowserElementAudioChannel.webidl
index 1b0ffa7058..ccb6ad2c15 100644
--- a/dom/webidl/BrowserElementAudioChannel.webidl
+++ b/dom/webidl/BrowserElementAudioChannel.webidl
@@ -37,4 +37,44 @@ partial interface BrowserElementPrivileged {
    Pref="dom.mozBrowserFramesEnabled",
    CheckAnyPermissions="browser"]
   readonly attribute sequence<BrowserElementAudioChannel> allowedAudioChannels;
+
+  /**
+   * Mutes all audio in this browser.
+   */
+  [Throws,
+   Pref="dom.mozBrowserFramesEnabled",
+   CheckAnyPermissions="browser"]
+  void mute();
+
+  /**
+   * Unmutes all audio in this browser.
+   */
+  [Throws,
+   Pref="dom.mozBrowserFramesEnabled",
+   CheckAnyPermissions="browser"]
+  void unmute();
+
+  /**
+   * Obtains whether or not the browser is muted.
+   */
+  [Throws,
+   Pref="dom.mozBrowserFramesEnabled",
+   CheckAnyPermissions="browser"]
+  DOMRequest getMuted();
+
+  /**
+   * Sets the volume for the browser.
+   */
+  [Throws,
+   Pref="dom.mozBrowserFramesEnabled",
+   CheckAnyPermissions="browser"]
+  void setVolume(float volume);
+
+  /**
+   * Gets the volume for the browser.
+   */
+  [Throws,
+   Pref="dom.mozBrowserFramesEnabled",
+   CheckAnyPermissions="browser"]
+  DOMRequest getVolume();
 };
diff --git a/dom/webidl/Clients.webidl b/dom/webidl/Clients.webidl
index b207221306..c59ba467a5 100644
--- a/dom/webidl/Clients.webidl
+++ b/dom/webidl/Clients.webidl
@@ -14,10 +14,10 @@ interface Clients {
   [NewObject]
   Promise<any> get(DOMString id);
   [NewObject]
-  Promise<sequence<Client>?> matchAll(optional ClientQueryOptions options);
+  Promise<sequence<Client>> matchAll(optional ClientQueryOptions options);
   [NewObject,
    Func="mozilla::dom::workers::ServiceWorkerGlobalScope::OpenWindowEnabled"]
-  Promise<WindowClient> openWindow(USVString url);
+  Promise<WindowClient?> openWindow(USVString url);
   [NewObject]
   Promise<void> claim();
 };
diff --git a/dom/webidl/Console.webidl b/dom/webidl/Console.webidl
index 219d669a9d..205e832c83 100644
--- a/dom/webidl/Console.webidl
+++ b/dom/webidl/Console.webidl
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 [ChromeOnly,
- Exposed=(Window,Worker, WorkerDebugger)]
+ Exposed=(Window,Worker,WorkerDebugger)]
 interface Console {
   void log(any... data);
   void info(any... data);
diff --git a/dom/webidl/DOMException.webidl b/dom/webidl/DOMException.webidl
index a00f13a329..e91e20cca9 100644
--- a/dom/webidl/DOMException.webidl
+++ b/dom/webidl/DOMException.webidl
@@ -50,10 +50,11 @@ interface ExceptionMembers
 
   // A stack trace, if available.  nsIStackFrame does not have classinfo so
   // this was only ever usefully available to chrome JS.
-  [ChromeOnly]
+  [ChromeOnly, Exposed=Window]
   readonly attribute StackFrame?             location;
 
   // Arbitary data for the implementation.
+  [Exposed=Window]
   readonly attribute nsISupports?            data;
 
   // Formatted exception stack
@@ -61,7 +62,7 @@ interface ExceptionMembers
   readonly attribute DOMString               stack;
 };
 
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface Exception {
   // A generic formatter - make it suitable to print, etc.
   stringifier;
diff --git a/dom/webidl/Directory.webidl b/dom/webidl/Directory.webidl
index 1bcd1a2e77..7ea8e02693 100644
--- a/dom/webidl/Directory.webidl
+++ b/dom/webidl/Directory.webidl
@@ -99,7 +99,11 @@ partial interface Directory {
   //readonly attribute DOMString name;
 
   /*
-   * The base name of the directory (a relative path excluding the leaf name).
+   * The path of the Directory (includes both its basename and leafname).
+   * The path begins with the name of the ancestor Directory that was
+   * originally exposed to content (say via a directory picker) and traversed
+   * to obtain this Directory.  Full filesystem paths are not exposed to
+   * unprivilaged content.
    */
   readonly attribute DOMString path;
 
diff --git a/dom/webidl/DocumentType.webidl b/dom/webidl/DocumentType.webidl
index bcc5099273..89190266fd 100644
--- a/dom/webidl/DocumentType.webidl
+++ b/dom/webidl/DocumentType.webidl
@@ -14,9 +14,6 @@ interface DocumentType : Node {
   readonly attribute DOMString name;
   readonly attribute DOMString publicId;
   readonly attribute DOMString systemId;
-
-  // Mozilla extension
-  readonly attribute DOMString? internalSubset;
 };
 
 DocumentType implements ChildNode;
diff --git a/dom/webidl/DominatorTree.webidl b/dom/webidl/DominatorTree.webidl
index 32bed41101..7eac4a8be2 100644
--- a/dom/webidl/DominatorTree.webidl
+++ b/dom/webidl/DominatorTree.webidl
@@ -61,4 +61,10 @@ interface DominatorTree {
    */
   [Throws]
   sequence<NodeId>? getImmediatelyDominated(NodeId node);
+
+  /**
+   * Get the immediate dominator of the node with the given id. Returns null if
+   * given an invalid id, or the id of the root node.
+   */
+  NodeId? getImmediateDominator(NodeId node);
 };
diff --git a/dom/webidl/Downloads.webidl b/dom/webidl/Downloads.webidl
index 76509ccad2..75692ce7fe 100644
--- a/dom/webidl/Downloads.webidl
+++ b/dom/webidl/Downloads.webidl
@@ -36,10 +36,32 @@ interface DOMDownloadManager : EventTarget {
   [UnsafeInPrerendering]
   Promise<DOMDownload> remove(DOMDownload download);
 
-  // Removes all the completed downloads from the set.  Returns an
-  // array of the completed downloads that were removed.
+  // Removes all completed downloads.  This kicks off an asynchronous process
+  // that will eventually complete, but will not have completed by the time this
+  // method returns.  If you care about the side-effects of this method, know
+  // that each existing download will have its onstatechange method invoked and
+  // will have a new state of "finalized".  (After the download is finalized, no
+  // further events will be generated on it.)
   [UnsafeInPrerendering]
-  Promise<sequence<DOMDownload>> clearAllDone();
+  void clearAllDone();
+
+  // Add completed downloads from applications that must perform the download
+  // process themselves. For example, email.  The method is resolved with a
+  // fully populated DOMDownload instance on success, or rejected in the
+  // event all required options were not provided.
+  //
+  // The adopted download will also be reported via the ondownloadstart event
+  // handler.
+  //
+  // Applications must currently be certified to use this, but it could be
+  // widened at a later time.
+  //
+  // Note that "download" is not actually optional, but WebIDL requires that it
+  // be marked as such because it is not followed by a required argument.  The
+  // promise will be rejected if the dictionary is omitted or the specified
+  // file does not exist on disk.
+  [AvailableIn=CertifiedApps]
+  Promise<DOMDownload> adoptDownload(optional AdoptDownloadDict download);
 
   // Fires when a new download starts.
   attribute EventHandler ondownloadstart;
@@ -59,7 +81,9 @@ interface DOMDownload : EventTarget {
   readonly attribute DOMString url;
 
   // The full path in local storage where the file will end up once the download
-  // is complete.
+  // is complete. This is equivalent to the concatenation of the 'storagePath'
+  // to the 'mountPoint' of the nsIVolume associated with the 'storageName'
+  // (with delimiter).
   readonly attribute DOMString path;
 
   // The DeviceStorage volume name on which the file is being downloaded.
@@ -69,7 +93,10 @@ interface DOMDownload : EventTarget {
   // downloaded.
   readonly attribute DOMString storagePath;
 
-  // The state of the download.
+  // The state of the download.  One of: downloading, stopped, succeeded, or
+  // finalized.  A finalized download is a download that has been removed /
+  // cleared and is no longer tracked by the download manager and will not
+  // receive any further onstatechange updates.
   readonly attribute DownloadState state;
 
   // The mime type for this resource.
@@ -82,6 +109,10 @@ interface DOMDownload : EventTarget {
   // download (eg. in different windows) will have the same id.
   readonly attribute DOMString id;
 
+  // The manifestURL of the application that added this download. Only used for
+  // downloads added via the adoptDownload API call.
+  readonly attribute DOMString? sourceAppManifestURL;
+
   // A DOM error object, that will be not null when a download is stopped
   // because something failed.
   readonly attribute DOMError? error;
@@ -100,3 +131,41 @@ interface DOMDownload : EventTarget {
   // - when the state and/or error attributes change.
   attribute EventHandler onstatechange;
 };
+
+// Used to initialize the DOMDownload object for adopted downloads.
+// fields directly maps to the DOMDownload fields.
+dictionary AdoptDownloadDict {
+  // The URL of this resource if there is one available. An empty string if
+  // the download is not accessible via URL. An empty string is chosen over
+  // null so that existinc code does not need to null-check but the value is
+  // still falsey.  (Note: If you do have a usable URL, you should probably not
+  // be using the adoptDownload API and instead be initiating downloads the
+  // normal way.)
+  DOMString url;
+
+  // The storageName of the DeviceStorage instance the file was saved to.
+  // Required but marked as optional so the bindings don't auto-coerce the value
+  // null to "null".
+  DOMString? storageName;
+  // The path of the file within the DeviceStorage instance named by
+  // 'storageName'.  This is used to automatically compute the 'path' of the
+  // download.  Note that when DeviceStorage gives you a path to a file, the
+  // first path segment is the name of the specific device storage and you do
+  // *not* want to include this.  For example, if DeviceStorage tells you the
+  // file has a path of '/sdcard1/actual/path/file.ext', then the storageName
+  // should be 'sdcard1' and the storagePath should be 'actual/path/file.ext'.
+  //
+  // The existence of the file will be validated will be validated with stat()
+  // and the size the file-system tells us will be what we use.
+  //
+  // Required but marked as optional so the bindings don't auto-coerce the value
+  // null to "null".
+  DOMString? storagePath;
+
+  // The mime type for this resource.  Required, but marked as optional because
+  // WebIDL otherwise auto-coerces the value null to "null".
+  DOMString? contentType;
+
+  // The time the download was started. If omitted, the current time is used.
+  Date? startTime;
+};
diff --git a/dom/webidl/ExtendableMessageEvent.webidl b/dom/webidl/ExtendableMessageEvent.webidl
index 9800618e24..35d0534a80 100644
--- a/dom/webidl/ExtendableMessageEvent.webidl
+++ b/dom/webidl/ExtendableMessageEvent.webidl
@@ -31,7 +31,7 @@ interface ExtendableMessageEvent : ExtendableEvent {
    */
   readonly attribute (Client or ServiceWorker or MessagePort)? source;
 
-  readonly attribute MessagePortList? ports;
+  [SameObject] readonly attribute MessagePortList? ports;
 };
 
 dictionary ExtendableMessageEventInit : ExtendableEventInit {
diff --git a/dom/webidl/FetchEvent.webidl b/dom/webidl/FetchEvent.webidl
index 751cf13271..3967c122ea 100644
--- a/dom/webidl/FetchEvent.webidl
+++ b/dom/webidl/FetchEvent.webidl
@@ -7,11 +7,11 @@
  * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
  */
 
-[Constructor(DOMString type, optional FetchEventInit eventInitDict),
+[Constructor(DOMString type, FetchEventInit eventInitDict),
  Func="mozilla::dom::workers::ServiceWorkerVisible",
  Exposed=(ServiceWorker)]
 interface FetchEvent : ExtendableEvent {
-  [SameObject] readonly attribute Request? request;
+  [SameObject] readonly attribute Request request;
   readonly attribute DOMString? clientId;
   readonly attribute boolean isReload;
 
@@ -20,7 +20,7 @@ interface FetchEvent : ExtendableEvent {
 };
 
 dictionary FetchEventInit : EventInit {
-  Request request;
+  required Request request;
   DOMString? clientId = null;
   boolean isReload = false;
 };
diff --git a/dom/webidl/HeapSnapshot.webidl b/dom/webidl/HeapSnapshot.webidl
index bec4503648..f1418dc282 100644
--- a/dom/webidl/HeapSnapshot.webidl
+++ b/dom/webidl/HeapSnapshot.webidl
@@ -75,4 +75,31 @@ interface HeapSnapshot {
    */
   [Throws]
   DominatorTree computeDominatorTree();
+
+  /**
+   * Find the shortest retaining paths from the node associated with the ID
+   * `start` to each node associated with the IDs in `targets`. Find at most
+   * `maxNumPaths` retaining paths for each target node.
+   *
+   * The return value is a Map object mapping from each target node ID to an
+   * array of retaining paths. The array may be empty if we did not find any
+   * retaining paths.
+   *
+   * A path is an array of objects of the form:
+   *
+   *     {
+   *         predecessor: <node ID>,
+   *         edge: <string or null>,
+   *     }
+   *
+   * The first `predecessor` will always be `start`. The last edge in the path
+   * leads to the `target` node that is mapped to the path; the `target` does
+   * not appear as a `predecessor` in the path.
+   *
+   * Throws when `start` or any of the elements of `targets` are not an ID of a
+   * node in the snapshot, or if we encounter an out of memory exception.
+   */
+  [Throws]
+  object computeShortestPaths(NodeId start, sequence<NodeId> targets,
+                              unsigned long long maxNumPaths);
 };
diff --git a/dom/webidl/IDBCursor.webidl b/dom/webidl/IDBCursor.webidl
index b195ea3a80..20ed4550d3 100644
--- a/dom/webidl/IDBCursor.webidl
+++ b/dom/webidl/IDBCursor.webidl
@@ -39,6 +39,7 @@ interface IDBCursor {
     IDBRequest delete ();
 };
 
+[Exposed=(Window,Worker)]
 interface IDBCursorWithValue : IDBCursor {
     [Throws]
     readonly    attribute any value;
diff --git a/dom/webidl/InputMethod.webidl b/dom/webidl/InputMethod.webidl
index cb356bda9f..f936d03b7e 100644
--- a/dom/webidl/InputMethod.webidl
+++ b/dom/webidl/InputMethod.webidl
@@ -4,299 +4,583 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/**
+ * InputMethod API implements a bridge between the web content hosting an input
+ * element and the input content (a.k.a. input app, virtual keyboard app,
+ * or IME). This API is input content facing in order for it to interact with
+ * the remote input element.
+ * The API also contains a few Gaia System app only methods
+ * (marked with "input-manage" permission) for Gaia System app to interact with
+ * some types of inputs and to regulate the input apps.
+ */
 [JSImplementation="@mozilla.org/b2g-inputmethod;1",
  NavigatorProperty="mozInputMethod",
  Pref="dom.mozInputMethod.enabled",
  CheckAnyPermissions="input input-manage"]
 interface MozInputMethod : EventTarget {
-  // Input Method Manager contain a few global methods expose to apps
-  readonly attribute MozInputMethodManager mgmt;
-
-  // Fired when the input context changes, include changes from and to null.
-  // The new InputContext instance will be available in the event
-  // object under |inputcontext| property.  When it changes to null it
-  // means the app (the user of this API) no longer has the control of
-  // the original focused input field.
-  // Note that if the app saves the original context, it might get
-  // void; implementation decides when to void the input context.
-  attribute EventHandler oninputcontextchange;
-
-  // An "input context" is mapped to a text field that the app is
-  // allow to mutate.  this attribute should be null when there is no
-  // text field currently focused.
-  readonly attribute MozInputContext? inputcontext;
-
+  /**
+   * Activate or decactive current API instance.
+   * Gaia System app call this method via BrowserElement#setInputMethodActive.
+   */
   [ChromeOnly]
-  // Activate or decactive current input method window.
   void setActive(boolean isActive);
 
-  // Add a dynamically declared input.
-  //
-  // The id must not be the same with any statically declared input in the app
-  // manifest. If an input of the same id is already declared, the info of that
-  // input will be updated.
-  Promise<void> addInput(DOMString inputId, object inputManifest);
+  /**
+   * InputMethodManager contain a few global methods expose to input apps.
+   */
+  readonly attribute MozInputMethodManager mgmt;
 
-  // Remove a dynamically declared input.
-  //
-  // The id must not be the same with any statically declared input in the app
-  // manifest. Silently resolves if the input is not previously declared;
-  // rejects if attempt to remove a statically declared input.
+  /**
+   * Fired when the input context changes, include changes from and to null.
+   * The new InputContext instance will be available in the event
+   * object under |inputcontext| property.  When it changes to null it
+   * means the app (the user of this API) no longer has the control of
+   * the original focused input field.
+   * Note that if the app saves the original context, it might get
+   * void; implementation decides when to void the input context.
+   */
+  [CheckAnyPermissions="input"]
+  attribute EventHandler oninputcontextchange;
+
+  /**
+   * An "input context" is mapped to a text field that the app is
+   * allow to mutate. This attribute should be null when there is no
+   * text field currently focused.
+   */
+  [CheckAnyPermissions="input"]
+  readonly attribute MozInputContext? inputcontext;
+
+  /**
+   * Add a dynamically declared input.
+   *
+   * The id must not be the same with any statically declared input in the app
+   * manifest. If an input of the same id is already declared, the info of that
+   * input will be updated.
+   */
+  [CheckAnyPermissions="input"]
+  Promise<void> addInput(DOMString inputId,
+                         MozInputMethodInputManifest inputManifest);
+
+  /**
+   * Remove a dynamically declared input.
+   *
+   * The id must not be the same with any statically declared input in the app
+   * manifest. Silently resolves if the input is not previously declared;
+   * rejects if attempt to remove a statically declared input.
+   */
+  [CheckAnyPermissions="input"]
   Promise<void> removeInput(DOMString id);
 
-  // The following are internal methods for Firefox OS system app only.
+  /**
+   * Remove focus from the current input, usable by Gaia System app, globally,
+   * regardless of the current focus state.
+   */
+  [CheckAnyPermissions="input-manage"]
+  void removeFocus();
 
-  // Set the value on the currently focused element. This has to be used
-  // for special situations where the value had to be chosen amongst a
-  // list (type=month) or a widget (type=date, time, etc.).
-  // If the value passed in parameter isn't valid (in the term of HTML5
-  // Forms Validation), the value will simply be ignored by the element.
-  [Throws]
+  /**
+   * The following are internal methods for Firefox OS System app only,
+   * for handling the "option" group inputs.
+   */
+
+  /**
+   * Set the value on the currently focused element. This has to be used
+   * for special situations where the value had to be chosen amongst a
+   * list (type=month) or a widget (type=date, time, etc.).
+   * If the value passed in parameter isn't valid (in the term of HTML5
+   * Forms Validation), the value will simply be ignored by the element.
+   */
+  [CheckAnyPermissions="input-manage"]
   void setValue(DOMString value);
 
-  // Select the <select> option specified by index.
-  // If this method is called on a <select> that support multiple
-  // selection, then the option specified by index will be added to
-  // the selection.
-  // If this method is called for a select that does not support multiple
-  // selection the previous element will be unselected.
-  [Throws]
+  /**
+   * Select the <select> option specified by index.
+   * If this method is called on a <select> that support multiple
+   * selection, then the option specified by index will be added to
+   * the selection.
+   * If this method is called for a select that does not support multiple
+   * selection the previous element will be unselected.
+   */
+  [CheckAnyPermissions="input-manage"]
   void setSelectedOption(long index);
 
-  // Select the <select> options specified by indexes. All other options
-  // will be deselected.
-  // If this method is called for a <select> that does not support multiple
-  // selection, then the last index specified in indexes will be selected.
-  [Throws]
+  /**
+   * Select the <select> options specified by indexes. All other options
+   * will be deselected.
+   * If this method is called for a <select> that does not support multiple
+   * selection, then the last index specified in indexes will be selected.
+   */
+  [CheckAnyPermissions="input-manage"]
   void setSelectedOptions(sequence<long> indexes);
-
-  [Throws]
-  void removeFocus();
 };
 
-// Manages the list of IMEs, enables/disables IME and switches to an
-// IME.
+/**
+ * InputMethodManager contains a few of the global methods for the input app.
+ */
 [JSImplementation="@mozilla.org/b2g-imm;1",
- Pref="dom.mozInputMethod.enabled"]
-interface MozInputMethodManager {
-  // Ask the OS to show a list of available IMEs for users to switch from.
-  // OS should ignore this request if the app is currently not the active one.
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input input-manage"]
+interface MozInputMethodManager : EventTarget {
+  /**
+   * Ask the OS to show a list of available inputs for users to switch from.
+   * OS should sliently ignore this request if the app is currently not the
+   * active one.
+   */
+  [CheckAllPermissions="input"]
   void showAll();
 
-  // Ask the OS to switch away from the current active Keyboard app.
-  // OS should ignore this request if the app is currently not the active one.
+  /**
+   * Ask the OS to switch away from the current active input app.
+   * OS should sliently ignore this request if the app is currently not the
+   * active one.
+   */
+  [CheckAllPermissions="input"]
   void next();
 
-  // To know if the OS supports IME switching or not.
-  // Use case: let the keyboard app knows if it is necessary to show the "IME switching"
-  // (globe) button. We have a use case that when there is only one IME enabled, we
-  // should not show the globe icon.
+  /**
+   * If this method returns true, it is recommended that the input app provides
+   * a shortcut that would invoke the next() method above, for easy switching
+   * between inputs -- i.e. show a "global" button on screen if the input app
+   * implements an on-screen virtual keyboard.
+   *
+   * The returning value is depend on the inputType of the current input context.
+   */
+  [CheckAllPermissions="input"]
   boolean supportsSwitching();
 
-  // Ask the OS to hide the current active Keyboard app. (was: |removeFocus()|)
-  // OS should ignore this request if the app is currently not the active one.
-  // The OS will void the current input context (if it exists).
-  // This method belong to |mgmt| because we would like to allow Keyboard to access to
-  // this method w/o a input context.
+  /**
+   * Ask the OS to remove the input focus, will cause the lost of input context.
+   * OS should sliently ignore this request if the app is currently not the
+   * active one.
+   */
+  [CheckAllPermissions="input"]
   void hide();
+
+  /**
+   * Update Gecko with information on the input types which supportsSwitching()
+   * should return ture.
+   *
+   * @param types Array of input types in which supportsSwitching() should
+   *              return true.
+   */
+  [CheckAllPermissions="input-manage"]
+  void setSupportsSwitchingTypes(sequence<MozInputMethodInputContextInputTypes> types);
+
+  /**
+   * CustomEvent dispatches to System when there is an input to handle.
+   * If the API consumer failed to handle and call preventDefault(),
+   * there will be a message printed on the console.
+   *
+   * evt.detail is defined by MozInputContextFocusEventDetail.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler oninputcontextfocus;
+
+  /**
+   * Event dispatches to System when there is no longer an input to handle.
+   * If the API consumer failed to handle and call preventDefault(),
+   * there will be a message printed on the console.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler oninputcontextblur;
+
+  /**
+   * Event dispatches to System when there is a showAll() call.
+   * If the API consumer failed to handle and call preventDefault(),
+   * there will be a message printed on the console.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler onshowallrequest;
+
+  /**
+   * Event dispatches to System when there is a next() call.
+   * If the API consumer failed to handle and call preventDefault(),
+   * there will be a message printed on the console.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler onnextrequest;
+
+  /**
+   * Event dispatches to System when there is a addInput() call.
+   * The API consumer must call preventDefault() to indicate the event is
+   * consumed, otherwise the request is not considered handled even if
+   * waitUntil() was called.
+   *
+   * evt.detail is defined by MozInputRegistryEventDetail.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler onaddinputrequest;
+
+  /**
+   * Event dispatches to System when there is a removeInput() call.
+   * The API consumer must call preventDefault() to indicate the event is
+   * consumed, otherwise the request is not considered handled even if
+   * waitUntil() was called.
+   *
+   * evt.detail is defined by MozInputRegistryEventDetail.
+   */
+  [CheckAnyPermissions="input-manage"]
+  attribute EventHandler onremoveinputrequest;
 };
 
-// The input context, which consists of attributes and information of current input field.
-// It also hosts the methods available to the keyboard app to mutate the input field represented.
-// An "input context" gets void when the app is no longer allowed to interact with the text field,
-// e.g., the text field does no longer exist, the app is being switched to background, and etc.
+/**
+ * Detail of the inputcontextfocus event.
+ */
+[JSImplementation="@mozilla.org/b2g-imm-focus;1",
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input-manage"]
+interface MozInputContextFocusEventDetail {
+  /**
+   * The type of the focused input.
+   */
+  readonly attribute MozInputMethodInputContextTypes type;
+  /**
+   * The input type of the focused input.
+   */
+  readonly attribute MozInputMethodInputContextInputTypes inputType;
+
+  /**
+   * The following is only needed for rendering and handling "option" input types,
+   * in System app.
+   */
+
+  /**
+   * Current value of the input.
+   */
+  readonly attribute DOMString? value;
+  /**
+   * An object representing all the <optgroup> and <option> elements
+   * in the <select> element.
+   */
+  [Pure, Cached, Frozen]
+  readonly attribute MozInputContextChoicesInfo? choices;
+  /**
+   * Max/min value of <input>
+   */
+  readonly attribute DOMString? min;
+  readonly attribute DOMString? max;
+};
+
+/**
+ * Information about the options within the <select> element.
+ */
+dictionary MozInputContextChoicesInfo {
+  boolean multiple;
+  sequence<MozInputMethodChoiceDict> choices;
+};
+
+/**
+ * Content of the option header (<optgroup>) or an option (<option>).
+ */
+dictionary MozInputMethodChoiceDict {
+  boolean group;
+  DOMString text;
+  boolean disabled;
+  boolean? inGroup;
+  boolean? selected;
+  long? optionIndex;
+};
+
+/**
+ * detail of addinputrequest or removeinputrequest event.
+ */
+[JSImplementation="@mozilla.org/b2g-imm-input-registry;1",
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input-manage"]
+interface MozInputRegistryEventDetail {
+  /**
+   * Manifest URL of the requesting app.
+   */
+  readonly attribute DOMString manifestURL;
+  /**
+   * ID of the input
+   */
+  readonly attribute DOMString inputId;
+  /**
+   * Input manifest of the input to add.
+   * Null for removeinputrequest event.
+   */
+  [Pure, Cached, Frozen]
+  readonly attribute MozInputMethodInputManifest? inputManifest;
+  /**
+   * Resolve or Reject the addInput() or removeInput() call when the passed
+   * promises are resolved.
+   */
+  [Throws]
+  void waitUntil(Promise<any> p);
+};
+
+/**
+ * The input context, which consists of attributes and information of current
+ * input field. It also hosts the methods available to the keyboard app to
+ * mutate the input field represented. An "input context" gets void when the
+ * app is no longer allowed to interact with the text field,
+ * e.g., the text field does no longer exist, the app is being switched to
+ * background, and etc.
+ */
 [JSImplementation="@mozilla.org/b2g-inputcontext;1",
- Pref="dom.mozInputMethod.enabled"]
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input"]
 interface MozInputContext: EventTarget {
-   // The tag name of input field, which is enum of "input", "textarea", or "contenteditable"
-   readonly attribute DOMString? type;
-   // The type of the input field, which is enum of text, number, password, url, search, email, and so on.
-   // See http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#states-of-the-type-attribute
-   readonly attribute DOMString? inputType;
-   /*
-    * The inputmode string, representing the input mode.
-    * See http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#input-modalities:-the-inputmode-attribute
-    */
-   readonly attribute DOMString? inputMode;
-   /*
-    * The primary language for the input field.
-    * It is the value of HTMLElement.lang.
-    * See http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#htmlelement
-    */
-   readonly attribute DOMString? lang;
-   /*
-    * Get the whole text content of the input field.
-    * @return DOMString
-    */
-   Promise<DOMString> getText(optional long offset, optional long length);
-   // The start and stop position of the selection.
-   readonly attribute long selectionStart;
-   readonly attribute long selectionEnd;
+  /**
+   * Type of the InputContext. See MozInputMethodInputContextTypes
+   */
+  readonly attribute MozInputMethodInputContextTypes? type;
 
-   // The text before and after the begining of the selected text.
-   readonly attribute DOMString? textBeforeCursor;
-   readonly attribute DOMString? textAfterCursor;
+  /**
+   * InputType of the InputContext. See MozInputMethodInputContextInputTypes.
+   */
+  readonly attribute MozInputMethodInputContextInputTypes? inputType;
 
-    /*
-     * Set the selection range of the the editable text.
-     * Note: This method cannot be used to move the cursor during composition. Calling this
-     * method will cancel composition.
-     * @param start The beginning of the selected text.
-     * @param length The length of the selected text.
-     *
-     * Note that the start position should be less or equal to the end position.
-     * To move the cursor, set the start and end position to the same value.
-     *
-     * @return boolean
-     */
-    Promise<boolean> setSelectionRange(long start, long length);
+  /**
+   * The inputmode string, representing the inputmode of the input.
+   * See http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#input-modalities:-the-inputmode-attribute
+   */
+  readonly attribute DOMString? inputMode;
 
-    /* User moves the cursor, or changes the selection with other means. If the text around
-     * cursor has changed, but the cursor has not been moved, the IME won't get notification.
-     *
-     * A dict is provided in the detail property of the event containing the new values, and
-     * an "ownAction" property to denote the event is the result of our own mutation to
-     * the input field.
-     */
-    attribute EventHandler onselectionchange;
+  /**
+   * The primary language for the input field.
+   * It is the value of HTMLElement.lang.
+   * See http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#htmlelement
+   */
+  readonly attribute DOMString? lang;
 
-    /*
-     * Commit text to current input field and replace text around
-     * cursor position. It will clear the current composition.
-     *
-     * @param text The string to be replaced with.
-     * @param offset The offset from the cursor position where replacing starts. Defaults to 0.
-     * @param length The length of text to replace. Defaults to 0.
-     * @return boolean
-     */
-    Promise<boolean> replaceSurroundingText(DOMString text, optional long offset, optional long length);
+  /**
+   * Get the whole text content of the input field.
+   * @return DOMString
+   */
+  Promise<DOMString> getText(optional long offset, optional long length);
 
-    /*
-     *
-     * Delete text around the cursor.
-     * @param offset The offset from the cursor position where deletion starts.
-     * @param length The length of text to delete.
-     * TODO: maybe updateSurroundingText(DOMString beforeText, DOMString afterText); ?
-     * @return boolean
-     */
-    Promise<boolean> deleteSurroundingText(long offset, long length);
+  /**
+   * The start and stop position of the current selection.
+   */
+  readonly attribute long selectionStart;
+  readonly attribute long selectionEnd;
 
-    /*
-     * Notifies when the text around the cursor is changed, due to either text
-     * editing or cursor movement. If the cursor has been moved, but the text around has not
-     * changed, the IME won't get notification.
-     *
-     * A dict is provided in the detail property of the event containing the new values, and
-     * an "ownAction" property to denote the event is the result of our own mutation to
-     * the input field.
-     */
-    attribute EventHandler onsurroundingtextchange;
+  /**
+   * The text in the current input.
+   */
+  readonly attribute DOMString? text;
 
-    /*
-     * Send a string/character with its key events. There are two ways of invocating 
-     * the method for backward compability purpose.
-     *
-     * (1) The recommended way, allow specifying DOM level 3 properties like |code|.
-     * @param dictOrKeyCode See MozInputMethodKeyboardEventDict.
-     * @param charCode disregarded
-     * @param modifiers disregarded
-     * @param repeat disregarded
-     *
-     * (2) Deprecated, reserved for backward compability.
-     * @param dictOrKeyCode keyCode of the key to send, should be one of the DOM_VK_ value in KeyboardEvent.
-     * @param charCode charCode of the character, should be 0 for non-printable keys.
-     * @param modifiers this paramater is no longer honored.
-     * @param repeat indicates whether a key would be sent repeatedly.
-     *
-     * @return A promise. Resolve to true if succeeds.
-     *                    Rejects to a string indicating the error.
-     *
-     * Note that, if you want to send a key n times repeatedly, make sure set
-     * parameter repeat to true and invoke sendKey n times, and invoke keyup
-     * after the end of the input.
-     */
-    Promise<boolean> sendKey((MozInputMethodRequiredKeyboardEventDict or long) dictOrKeyCode,
-                             optional long charCode, 
-                             optional long modifiers, 
-                             optional boolean repeat);
+  /**
+   * The text before and after the begining of the selected text.
+   *
+   * You should use the text property instead because these properties are
+   * truncated at 100 characters.
+   */
+  readonly attribute DOMString? textBeforeCursor;
+  readonly attribute DOMString? textAfterCursor;
 
-    /*
-     * Send a string/character with keydown, and keypress events.
-     * keyup should be called afterwards to ensure properly sequence.
-     *
-     * @param dict See MozInputMethodKeyboardEventDict.
-     *
-     * @return A promise. Resolve to true if succeeds.
-     *                    Rejects to a string indicating the error.
-     */
-    Promise<boolean> keydown(MozInputMethodRequiredKeyboardEventDict dict);
+  /**
+   * Set the selection range of the the editable text.
+   * Note: This method cannot be used to move the cursor during composition. Calling this
+   * method will cancel composition.
+   * @param start The beginning of the selected text.
+   * @param length The length of the selected text.
+   *
+   * Note that the start position should be less or equal to the end position.
+   * To move the cursor, set the start and end position to the same value.
+   *
+   * @return boolean
+   */
+  Promise<boolean> setSelectionRange(long start, long length);
 
-    /*
-     * Send a keyup event. keydown should be called first to ensure properly sequence.
-     *
-     * @param dict See MozInputMethodKeyboardEventDict.
-     *
-     * @return A promise. Resolve to true if succeeds.
-     *                    Rejects to a string indicating the error.
-     *
-     */
-    Promise<boolean> keyup(MozInputMethodRequiredKeyboardEventDict dict);
+  /* User moves the cursor, or changes the selection with other means. If the text around
+   * cursor has changed, but the cursor has not been moved, the IME won't get notification.
+   *
+   * evt.detail is defined by MozInputContextSelectionChangeEventDetail.
+   */
+  attribute EventHandler onselectionchange;
 
-    /*
-     * Set current composing text. This method will start composition or update
-     * composition if it has started. The composition will be started right
-     * before the cursor position and any selected text will be replaced by the
-     * composing text. When the composition is started, calling this method can
-     * update the text and move cursor winthin the range of the composing text.
-     * @param text The new composition text to show.
-     * @param cursor The new cursor position relative to the start of the
-     * composition text. The cursor should be positioned within the composition
-     * text. This means the value should be >= 0 and <= the length of
-     * composition text. Defaults to the lenght of composition text, i.e., the
-     * cursor will be positioned after the composition text.
-     * @param clauses The array of composition clause information. If not set,
-     * only one clause is supported.
-     * @param dict The properties of the keyboard event that cause the composition
-     * to set. keydown or keyup event will be fired if it's necessary.
-     * For compatibility, we recommend that you should always set this argument 
-     * if it's caused by a key operation.
-     * 
-     * The composing text, which is shown with underlined style to distinguish
-     * from the existing text, is used to compose non-ASCII characters from
-     * keystrokes, e.g. Pinyin or Hiragana. The composing text is the
-     * intermediate text to help input complex character and is not committed to
-     * current input field. Therefore if any text operation other than
-     * composition is performed, the composition will automatically end. Same
-     * apply when the inputContext is lost during an unfinished composition
-     * session.
-     *
-     * To finish composition and commit text to current input field, an IME
-     * should call |endComposition|.
-     */
-    Promise<boolean> setComposition(DOMString text, 
-                                    optional long cursor,
-                                    optional sequence<CompositionClauseParameters> clauses,
-                                    optional MozInputMethodKeyboardEventDict dict);
+  /**
+   * Commit text to current input field and replace text around
+   * cursor position. It will clear the current composition.
+   *
+   * @param text The string to be replaced with.
+   * @param offset The offset from the cursor position where replacing starts. Defaults to 0.
+   * @param length The length of text to replace. Defaults to 0.
+   * @return boolean
+   */
+  Promise<boolean> replaceSurroundingText(DOMString text, optional long offset, optional long length);
 
-    /*
-     * End composition, clear the composing text and commit given text to
-     * current input field. The text will be committed before the cursor
-     * position.
-     * @param text The text to commited before cursor position. If empty string
-     * is given, no text will be committed.
-     * @param dict The properties of the keyboard event that cause the composition
-     * to end. keydown or keyup event will be fired if it's necessary.
-     * For compatibility, we recommend that you should always set this argument 
-     * if it's caused by a key operation.
-     *
-     * Note that composition always ends automatically with nothing to commit if
-     * the composition does not explicitly end by calling |endComposition|, but
-     * is interrupted by |sendKey|, |setSelectionRange|,
-     * |replaceSurroundingText|, |deleteSurroundingText|, user moving the
-     * cursor, changing the focus, etc.
-     */
-    Promise<boolean> endComposition(optional DOMString text, 
-                                    optional MozInputMethodKeyboardEventDict dict);
+  /**
+   * Delete text around the cursor.
+   * @param offset The offset from the cursor position where deletion starts.
+   * @param length The length of text to delete.
+   * TODO: maybe updateSurroundingText(DOMString beforeText, DOMString afterText); ?
+   * @return boolean
+   */
+  Promise<boolean> deleteSurroundingText(long offset, long length);
+
+  /**
+   * Notifies when the text around the cursor is changed, due to either text
+   * editing or cursor movement. If the cursor has been moved, but the text around has not
+   * changed, the IME won't get notification.
+   *
+   * evt.detail is defined by MozInputContextSurroundingTextChangeEventDetail.
+   */
+  attribute EventHandler onsurroundingtextchange;
+
+  /**
+   * Send a string/character with its key events. There are two ways of invocating
+   * the method for backward compability purpose.
+   *
+   * (1) The recommended way, allow specifying DOM level 3 properties like |code|.
+   * @param dictOrKeyCode See MozInputMethodKeyboardEventDict.
+   * @param charCode disregarded
+   * @param modifiers disregarded
+   * @param repeat disregarded
+   *
+   * (2) Deprecated, reserved for backward compability.
+   * @param dictOrKeyCode keyCode of the key to send, should be one of the DOM_VK_ value in KeyboardEvent.
+   * @param charCode charCode of the character, should be 0 for non-printable keys.
+   * @param modifiers this paramater is no longer honored.
+   * @param repeat indicates whether a key would be sent repeatedly.
+   *
+   * @return A promise. Resolve to true if succeeds.
+   *                    Rejects to a string indicating the error.
+   *
+   * Note that, if you want to send a key n times repeatedly, make sure set
+   * parameter repeat to true and invoke sendKey n times, and invoke keyup
+   * after the end of the input.
+   */
+  Promise<boolean> sendKey((MozInputMethodRequiredKeyboardEventDict or long) dictOrKeyCode,
+                           optional long charCode,
+                           optional long modifiers,
+                           optional boolean repeat);
+
+  /**
+   * Send a string/character with keydown, and keypress events.
+   * keyup should be called afterwards to ensure properly sequence.
+   *
+   * @param dict See MozInputMethodKeyboardEventDict.
+   *
+   * @return A promise. Resolve to true if succeeds.
+   *                    Rejects to a string indicating the error.
+   */
+  Promise<boolean> keydown(MozInputMethodRequiredKeyboardEventDict dict);
+
+  /**
+   * Send a keyup event. keydown should be called first to ensure properly sequence.
+   *
+   * @param dict See MozInputMethodKeyboardEventDict.
+   *
+   * @return A promise. Resolve to true if succeeds.
+   *                    Rejects to a string indicating the error.
+   */
+  Promise<boolean> keyup(MozInputMethodRequiredKeyboardEventDict dict);
+
+  /**
+   * Set current composing text. This method will start composition or update
+   * composition if it has started. The composition will be started right
+   * before the cursor position and any selected text will be replaced by the
+   * composing text. When the composition is started, calling this method can
+   * update the text and move cursor winthin the range of the composing text.
+   * @param text The new composition text to show.
+   * @param cursor The new cursor position relative to the start of the
+   * composition text. The cursor should be positioned within the composition
+   * text. This means the value should be >= 0 and <= the length of
+   * composition text. Defaults to the lenght of composition text, i.e., the
+   * cursor will be positioned after the composition text.
+   * @param clauses The array of composition clause information. If not set,
+   * only one clause is supported.
+   * @param dict The properties of the keyboard event that cause the composition
+   * to set. keydown or keyup event will be fired if it's necessary.
+   * For compatibility, we recommend that you should always set this argument
+   * if it's caused by a key operation.
+   *
+   * The composing text, which is shown with underlined style to distinguish
+   * from the existing text, is used to compose non-ASCII characters from
+   * keystrokes, e.g. Pinyin or Hiragana. The composing text is the
+   * intermediate text to help input complex character and is not committed to
+   * current input field. Therefore if any text operation other than
+   * composition is performed, the composition will automatically end. Same
+   * apply when the inputContext is lost during an unfinished composition
+   * session.
+   *
+   * To finish composition and commit text to current input field, an IME
+   * should call |endComposition|.
+   */
+  Promise<boolean> setComposition(DOMString text,
+                                  optional long cursor,
+                                  optional sequence<CompositionClauseParameters> clauses,
+                                  optional MozInputMethodKeyboardEventDict dict);
+
+  /**
+   * End composition, clear the composing text and commit given text to
+   * current input field. The text will be committed before the cursor
+   * position.
+   * @param text The text to commited before cursor position. If empty string
+   * is given, no text will be committed.
+   * @param dict The properties of the keyboard event that cause the composition
+   * to end. keydown or keyup event will be fired if it's necessary.
+   * For compatibility, we recommend that you should always set this argument
+   * if it's caused by a key operation.
+   *
+   * Note that composition always ends automatically with nothing to commit if
+   * the composition does not explicitly end by calling |endComposition|, but
+   * is interrupted by |sendKey|, |setSelectionRange|,
+   * |replaceSurroundingText|, |deleteSurroundingText|, user moving the
+   * cursor, changing the focus, etc.
+   */
+  Promise<boolean> endComposition(optional DOMString text,
+                                  optional MozInputMethodKeyboardEventDict dict);
+};
+
+/**
+ * Detail of the selectionchange event.
+ */
+[JSImplementation="@mozilla.org/b2g-imm-selectionchange;1",
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input"]
+interface MozInputContextSelectionChangeEventDetail {
+  /**
+   * Indicate whether or not the change is due to our own action from, 
+   * for example, sendKey() call.
+   *
+   * Note: this property is untrustworthy because it would still be true even
+   * if script in the page changed the text synchronously upon responding to
+   * events trigger by the call.
+   */
+  readonly attribute boolean ownAction;
+
+  /**
+   * The start and stop position of the current selection.
+   */
+  readonly attribute long selectionStart;
+  readonly attribute long selectionEnd;
+};
+
+/**
+ * Detail of the surroundingtextchange event.
+ */
+[JSImplementation="@mozilla.org/b2g-imm-surroundingtextchange;1",
+ Pref="dom.mozInputMethod.enabled",
+ CheckAnyPermissions="input"]
+interface MozInputContextSurroundingTextChangeEventDetail {
+  /**
+   * Indicate whether or not the change is due to our own action from, 
+   * for example, sendKey() call.
+   *
+   * Note: this property is untrustworthy because it would still be true even
+   * if script in the page changed the text synchronously upon responding to
+   * events trigger by the call.
+   */
+  readonly attribute boolean ownAction;
+
+  /**
+   * The text in the current input.
+   */
+  readonly attribute DOMString? text;
+
+  /**
+   * The text before and after the begining of the selected text.
+   *
+   * You should use the text property instead because these properties are
+   * truncated at 100 characters.
+   */
+  readonly attribute DOMString? textBeforeCursor;
+  readonly attribute DOMString? textAfterCursor;
 };
 
 enum CompositionClauseSelectionType {
@@ -307,25 +591,105 @@ enum CompositionClauseSelectionType {
 };
 
 dictionary CompositionClauseParameters {
-  DOMString selectionType = "raw-input";
+  CompositionClauseSelectionType selectionType = "raw-input";
   long length;
 };
 
-/*
+/**
+ * Types are HTML tag names of the inputs that is explosed with InputContext,
+ * *and* the special keyword "contenteditable" for contenteditable element.
+ */
+enum MozInputMethodInputContextTypes {
+  "input", "textarea", "contenteditable",
+  /**
+   * <select> is managed by the API but it is handled by the System app only,
+   * so this value is only accessible by System app from inputcontextfocus event.
+   */
+  "select"
+};
+
+/**
+ * InputTypes of the input that InputContext is representing. The value
+ * is inferred from the type attribute of element.
+ *
+ * See https://html.spec.whatwg.org/multipage/forms.html#states-of-the-type-attribute
+ * for types of HTMLInputElement.
+ *
+ * They are divided into groups -- an layout/input capable of handling one type
+ * in the group is considered as capable of handling all of the types in the
+ * same group.
+ * The layout/input that could handle type "text" is considered as the fallback
+ * if none of layout/input installed can handle a specific type.
+ *
+ * Groups and fallbacks is enforced in Gaia System app currently.
+ *
+ * Noted that the actual virtual keyboard to show, for example in the case of
+ * Gaia Keyboard app, will also depend on the inputMode of the input element.
+ */
+enum MozInputMethodInputContextInputTypes {
+  /**
+   * Group "text". Be reminded that contenteditable element is assigned with
+   * an input type of "textarea".
+   */
+  "text", "search", "textarea",
+  /**
+   * Group "number"
+   */
+  "number", "tel",
+  /**
+   * Group "url"
+   */
+  "url",
+  /**
+   * Group "email"
+   */
+  "email",
+  /**
+   * Group "password".
+   * An non-Latin alphabet layout/input should not be able to handle this type.
+   */
+  "password",
+  /**
+   * Group "option". These types are handled by System app itself currently, so
+   * no input app will be set to active for these input types.
+   * System app access these types from inputcontextfocus event.
+   * ("select-one" and "select-multiple" are valid HTMLSelectElement#type.)
+   */
+  "datetime", "date", "month", "week", "time", "datetime-local", "color",
+  "select-one", "select-multiple"
+  /**
+   * These types are ignored by the API even though they are valid
+   * HTMLInputElement#type.
+   */
+  //"checkbox", "radio", "file", "submit", "image", "range", "reset", "button"
+};
+
+/**
+ * An input app can host multiple inputs (a.k.a. layouts) and the capability of
+ * the input is described by the input manifest.
+ */
+dictionary MozInputMethodInputManifest {
+  required DOMString launch_path;
+  required DOMString name;
+  DOMString? description;
+  sequence<MozInputMethodInputContextInputTypes> types;
+};
+
+/**
  * A MozInputMethodKeyboardEventDictBase contains the following properties,
  * indicating the properties of the keyboard event caused.
  *
  * This is the base dictionary type for us to create two child types that could
  * be used as argument type in two types of methods, as WebIDL parser required.
- * 
+ *
  */
 dictionary MozInputMethodKeyboardEventDictBase {
-  /*
+  /**
    * String/character to output, or a registered name of non-printable key.
    * (To be defined in the inheriting dictionary types.)
    */
   // DOMString key;
-  /*
+  /**
    * String/char indicating the virtual hardware key pressed. Optional.
    * Must be a value defined in
    * http://www.w3.org/TR/DOM-Level-3-Events-code/#keyboard-chording-virtual
@@ -333,7 +697,7 @@ dictionary MozInputMethodKeyboardEventDictBase {
    * not be empty string. Otherwise, it should be empty string.
    */
   DOMString code = "";
-  /*
+  /**
    * keyCode of the keyboard event. Optional.
    * To be disregarded if |key| is an alphanumeric character.
    * If the key causes inputting a character and if your keyboard app emulates
@@ -343,11 +707,11 @@ dictionary MozInputMethodKeyboardEventDictBase {
    * the value should be proper value for the key value.
    */
   long? keyCode;
-  /*
+  /**
    * Indicates whether a key would be sent repeatedly. Optional.
    */
   boolean repeat = false;
-  /*
+  /**
    * Optional. True if |key| property is explicitly referring to a printable key.
    * When this is set, key will be printable even if the |key| value matches any
    * of the registered name of non-printable keys.
@@ -355,7 +719,7 @@ dictionary MozInputMethodKeyboardEventDictBase {
   boolean printable = false;
 };
 
-/*
+/**
  * For methods like setComposition() and endComposition(), the optional
  * dictionary type argument is really optional when all of it's property
  * are optional.
@@ -365,7 +729,7 @@ dictionary MozInputMethodKeyboardEventDict : MozInputMethodKeyboardEventDictBase
   DOMString? key;
 };
 
-/*
+/**
  * For methods like keydown() and keyup(), the dictionary type argument is
  * considered required only if at least one of it's property is required.
  * This dictionary type is used to denote that argument.
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 7e19582888..54d4abdc6b 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -1989,12 +1989,6 @@ RuntimeService::Shutdown()
   // That's it, no more workers.
   mShuttingDown = true;
 
-  // Remove all listeners from the worker debugger manager to ensure that it
-  // gets properly destroyed.
-  if (NS_FAILED(ClearWorkerDebuggerManagerListeners())) {
-    NS_WARNING("Failed to clear worker debugger manager listeners!");
-  }
-
   nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
   NS_WARN_IF_FALSE(obs, "Failed to get observer service?!");
 
diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp
index daf3d6021c..bf53648dfb 100644
--- a/dom/workers/ServiceWorkerEvents.cpp
+++ b/dom/workers/ServiceWorkerEvents.cpp
@@ -100,8 +100,7 @@ FetchEvent::Constructor(const GlobalObject& aGlobal,
   bool trusted = e->Init(owner);
   e->InitEvent(aType, aOptions.mBubbles, aOptions.mCancelable);
   e->SetTrusted(trusted);
-  e->mRequest = aOptions.mRequest.WasPassed() ?
-      &aOptions.mRequest.Value() : nullptr;
+  e->mRequest = aOptions.mRequest;
   e->mClientId = aOptions.mClientId;
   e->mIsReload = aOptions.mIsReload;
   return e.forget();
diff --git a/dom/workers/ServiceWorkerEvents.h b/dom/workers/ServiceWorkerEvents.h
index 3d4f01366a..4b102203a7 100644
--- a/dom/workers/ServiceWorkerEvents.h
+++ b/dom/workers/ServiceWorkerEvents.h
@@ -145,8 +145,9 @@ public:
   }
 
   Request*
-  GetRequest_() const
+  Request_() const
   {
+    MOZ_ASSERT(mRequest);
     return mRequest;
   }
 
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 46f98e9fa0..4d924e45e1 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -6,8 +6,6 @@
 
 #include "ServiceWorkerManager.h"
 
-#include "mozIApplication.h"
-#include "nsIAppsService.h"
 #include "nsIConsoleService.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDocument.h"
@@ -16,7 +14,6 @@
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpHeaderVisitor.h"
-#include "nsIJARChannel.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIMutableArray.h"
 #include "nsIScriptError.h"
@@ -1650,15 +1647,7 @@ ServiceWorkerManager::Register(nsIDOMWindow* aWindow,
   aScriptURI->SchemeIs("http", &isHttp);
   aScriptURI->SchemeIs("https", &isHttps);
   if (NS_WARN_IF(!isHttp && !isHttps)) {
-#ifdef RELEASE_BUILD
     return NS_ERROR_DOM_SECURITY_ERR;
-#else
-    bool isApp = false;
-    aScriptURI->SchemeIs("app", &isApp);
-    if (NS_WARN_IF(!isApp)) {
-    return NS_ERROR_DOM_SECURITY_ERR;
-    }
-#endif
   }
 
   nsCString cleanedScope;
@@ -3482,7 +3471,8 @@ ServiceWorkerManager::DispatchFetchEvent(const OriginAttributes& aOriginAttribut
 
     internalChannel->GetLoadGroup(getter_AddRefs(loadGroup));
 
-    documentId = aDocumentIdForTopLevelNavigation;
+    // TODO: Use aDocumentIdForTopLevelNavigation for potentialClientId, pending
+    // the spec change.
 
     nsCOMPtr<nsIURI> uri;
     aRv = aChannel->GetSecureUpgradedChannelURI(getter_AddRefs(uri));
@@ -4343,11 +4333,11 @@ ServiceWorkerManager::PropagateRemoveAll()
 }
 
 void
-ServiceWorkerManager::RemoveAllRegistrations(OriginAttributes* aParams)
+ServiceWorkerManager::RemoveAllRegistrations(OriginAttributesPattern* aPattern)
 {
   AssertIsOnMainThread();
 
-  MOZ_ASSERT(aParams);
+  MOZ_ASSERT(aPattern);
 
   for (auto it1 = mRegistrationInfos.Iter(); !it1.Done(); it1.Next()) {
     ServiceWorkerManager::RegistrationDataPerPrincipal* data = it1.UserData();
@@ -4361,49 +4351,14 @@ ServiceWorkerManager::RemoveAllRegistrations(OriginAttributes* aParams)
       MOZ_ASSERT(reg);
       MOZ_ASSERT(reg->mPrincipal);
 
-      bool equals = false;
-
-      if (aParams->mInBrowser) {
-        // When we do a system wide "clear cookies and stored data" on B2G we
-        // get the "clear-origin-data" notification with the System app appID
-        // and the browserOnly flag set to true. Web sites registering a
-        // service worker on B2G have a principal with the following
-        // information: web site origin + System app appId + inBrowser=1 So
-        // we need to check if the service worker registration info contains
-        // the System app appID and the enabled inBrowser flag and in that
-        // case remove it from the registry.
-        OriginAttributes attrs =
-          mozilla::BasePrincipal::Cast(reg->mPrincipal)->OriginAttributesRef();
-        equals = attrs == *aParams;
-      } else {
-        // If we get the "clear-origin-data" notification because of an app
-        // uninstallation, we need to check the full principal to get the
-        // match in the service workers registry. If we find a match, we
-        // unregister the worker.
-        nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
-        if (NS_WARN_IF(!appsService)) {
-          continue;
-        }
-
-        nsCOMPtr<mozIApplication> app;
-        appsService->GetAppByLocalId(aParams->mAppId, getter_AddRefs(app));
-        if (NS_WARN_IF(!app)) {
-          continue;
-        }
-
-        nsCOMPtr<nsIPrincipal> principal;
-        app->GetPrincipal(getter_AddRefs(principal));
-        if (NS_WARN_IF(!principal)) {
-          continue;
-        }
-
-        reg->mPrincipal->Equals(principal, &equals);
+      bool matches =
+        aPattern->Matches(BasePrincipal::Cast(reg->mPrincipal)->OriginAttributesRef());
+      if (!matches) {
+        continue;
       }
 
-      if (equals) {
-        RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
-        swm->ForceUnregister(data, reg);
-      }
+      RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+      swm->ForceUnregister(data, reg);
     }
   }
 }
@@ -4576,10 +4531,10 @@ ServiceWorkerManager::Observe(nsISupports* aSubject,
 
   if (strcmp(aTopic, CLEAR_ORIGIN_DATA) == 0) {
     MOZ_ASSERT(XRE_IsParentProcess());
-    OriginAttributes attrs;
-    MOZ_ALWAYS_TRUE(attrs.Init(nsAutoString(aData)));
+    OriginAttributesPattern pattern;
+    MOZ_ALWAYS_TRUE(pattern.Init(nsAutoString(aData)));
 
-    RemoveAllRegistrations(&attrs);
+    RemoveAllRegistrations(&pattern);
     return NS_OK;
   }
 
@@ -4926,7 +4881,7 @@ ServiceWorkerManager::UpdateTimerFired(nsIPrincipal* aPrincipal,
   }
 
   OriginAttributes attrs =
-    mozilla::BasePrincipal::Cast(aPrincipal)->OriginAttributesRef();
+    BasePrincipal::Cast(aPrincipal)->OriginAttributesRef();
 
   // Then trigger an update to fire asynchronously now.
   PropagateSoftUpdate(attrs, NS_ConvertUTF8toUTF16(aScope));
diff --git a/dom/workers/ServiceWorkerManager.h b/dom/workers/ServiceWorkerManager.h
index 1aa7f7b707..5670d151d6 100644
--- a/dom/workers/ServiceWorkerManager.h
+++ b/dom/workers/ServiceWorkerManager.h
@@ -648,10 +648,9 @@ private:
   void
   RemoveRegistrationInternal(ServiceWorkerRegistrationInfo* aRegistration);
 
-  // Removes all service worker registrations that matches the given
-  // mozIApplicationClearPrivateDataParams.
+  // Removes all service worker registrations that matches the given pattern.
   void
-  RemoveAllRegistrations(OriginAttributes* aParams);
+  RemoveAllRegistrations(OriginAttributesPattern* aPattern);
 
   RefPtr<ServiceWorkerManagerChild> mActor;
 
diff --git a/dom/workers/ServiceWorkerPrivate.cpp b/dom/workers/ServiceWorkerPrivate.cpp
index 3eb2a58c1b..578c985903 100644
--- a/dom/workers/ServiceWorkerPrivate.cpp
+++ b/dom/workers/ServiceWorkerPrivate.cpp
@@ -1001,7 +1001,6 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable
   nsCString mMethod;
   nsString mClientId;
   bool mIsReload;
-  DebugOnly<bool> mIsHttpChannel;
   RequestMode mRequestMode;
   RequestRedirect mRequestRedirect;
   RequestCredentials mRequestCredentials;
@@ -1024,7 +1023,6 @@ public:
     , mScriptSpec(aScriptSpec)
     , mClientId(aDocumentId)
     , mIsReload(aIsReload)
-    , mIsHttpChannel(false)
     , mRequestMode(RequestMode::No_cors)
     , mRequestRedirect(RequestRedirect::Follow)
     // By default we set it to same-origin since normal HTTP fetches always
@@ -1073,61 +1071,46 @@ public:
 
     nsCOMPtr<nsIURI> referrerURI;
     rv = NS_GetReferrerFromChannel(channel, getter_AddRefs(referrerURI));
-    // We can't bail on failure since certain non-http channels like JAR
-    // channels are intercepted but don't have referrers.
-    if (NS_SUCCEEDED(rv) && referrerURI) {
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (referrerURI) {
       rv = referrerURI->GetSpec(mReferrer);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
     nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
-    if (httpChannel) {
-      mIsHttpChannel = true;
+    MOZ_ASSERT(httpChannel, "How come we don't have an HTTP channel?");
 
-      rv = httpChannel->GetRequestMethod(mMethod);
+    rv = httpChannel->GetRequestMethod(mMethod);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIHttpChannelInternal> internalChannel = do_QueryInterface(httpChannel);
+    NS_ENSURE_TRUE(internalChannel, NS_ERROR_NOT_AVAILABLE);
+
+    mRequestMode = InternalRequest::MapChannelToRequestMode(channel);
+
+    // This is safe due to static_asserts at top of file.
+    uint32_t redirectMode;
+    internalChannel->GetRedirectMode(&redirectMode);
+    mRequestRedirect = static_cast<RequestRedirect>(redirectMode);
+
+    mRequestCredentials = InternalRequest::MapChannelToRequestCredentials(channel);
+
+    rv = httpChannel->VisitNonDefaultRequestHeaders(this);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIUploadChannel2> uploadChannel = do_QueryInterface(httpChannel);
+    if (uploadChannel) {
+      MOZ_ASSERT(!mUploadStream);
+      bool bodyHasHeaders = false;
+      rv = uploadChannel->GetUploadStreamHasHeaders(&bodyHasHeaders);
       NS_ENSURE_SUCCESS(rv, rv);
-
-      nsCOMPtr<nsIHttpChannelInternal> internalChannel = do_QueryInterface(httpChannel);
-      NS_ENSURE_TRUE(internalChannel, NS_ERROR_NOT_AVAILABLE);
-
-      mRequestMode = InternalRequest::MapChannelToRequestMode(channel);
-
-      // This is safe due to static_asserts at top of file.
-      uint32_t redirectMode;
-      internalChannel->GetRedirectMode(&redirectMode);
-      mRequestRedirect = static_cast<RequestRedirect>(redirectMode);
-
-      mRequestCredentials = InternalRequest::MapChannelToRequestCredentials(channel);
-
-      rv = httpChannel->VisitNonDefaultRequestHeaders(this);
+      nsCOMPtr<nsIInputStream> uploadStream;
+      rv = uploadChannel->CloneUploadStream(getter_AddRefs(uploadStream));
       NS_ENSURE_SUCCESS(rv, rv);
-
-      nsCOMPtr<nsIUploadChannel2> uploadChannel = do_QueryInterface(httpChannel);
-      if (uploadChannel) {
-        MOZ_ASSERT(!mUploadStream);
-        bool bodyHasHeaders = false;
-        rv = uploadChannel->GetUploadStreamHasHeaders(&bodyHasHeaders);
-        NS_ENSURE_SUCCESS(rv, rv);
-        nsCOMPtr<nsIInputStream> uploadStream;
-        rv = uploadChannel->CloneUploadStream(getter_AddRefs(uploadStream));
-        NS_ENSURE_SUCCESS(rv, rv);
-        if (bodyHasHeaders) {
-          HandleBodyWithHeaders(uploadStream);
-        } else {
-          mUploadStream = uploadStream;
-        }
-      }
-    } else {
-      nsCOMPtr<nsIJARChannel> jarChannel = do_QueryInterface(channel);
-      // If it is not an HTTP channel it must be a JAR one.
-      NS_ENSURE_TRUE(jarChannel, NS_ERROR_NOT_AVAILABLE);
-
-      mMethod = "GET";
-
-      mRequestMode = InternalRequest::MapChannelToRequestMode(channel);
-
-      if (loadFlags & nsIRequest::LOAD_ANONYMOUS) {
-        mRequestCredentials = RequestCredentials::Omit;
+      if (bodyHasHeaders) {
+        HandleBodyWithHeaders(uploadStream);
+      } else {
+        mUploadStream = uploadStream;
       }
     }
 
@@ -1180,13 +1163,6 @@ private:
     MOZ_ASSERT(aWorkerPrivate->IsServiceWorker());
     GlobalObject globalObj(aCx, aWorkerPrivate->GlobalScope()->GetWrapper());
 
-    NS_ConvertUTF8toUTF16 local(mSpec);
-    RequestOrUSVString requestInfo;
-    requestInfo.SetAsUSVString().Rebind(local.Data(), local.Length());
-
-    RootedDictionary<RequestInit> reqInit(aCx);
-    reqInit.mMethod.Construct(mMethod);
-
     RefPtr<InternalHeaders> internalHeaders = new InternalHeaders(HeadersGuardEnum::Request);
     MOZ_ASSERT(mHeaderNames.Length() == mHeaderValues.Length());
     for (uint32_t i = 0; i < mHeaderNames.Length(); i++) {
@@ -1198,47 +1174,41 @@ private:
       }
     }
 
-    RefPtr<Headers> headers = new Headers(globalObj.GetAsSupports(), internalHeaders);
-    reqInit.mHeaders.Construct();
-    reqInit.mHeaders.Value().SetAsHeaders() = headers;
-
-    reqInit.mMode.Construct(mRequestMode);
-    reqInit.mRedirect.Construct(mRequestRedirect);
-    reqInit.mCredentials.Construct(mRequestCredentials);
-
     ErrorResult result;
-    RefPtr<Request> request = Request::Constructor(globalObj, requestInfo, reqInit, result);
+    internalHeaders->SetGuard(HeadersGuardEnum::Immutable, result);
     if (NS_WARN_IF(result.Failed())) {
       result.SuppressException();
       return false;
     }
+
+    RefPtr<InternalRequest> internalReq = new InternalRequest(mSpec,
+                                                              mMethod,
+                                                              internalHeaders.forget(),
+                                                              mRequestMode,
+                                                              mRequestRedirect,
+                                                              mRequestCredentials,
+                                                              NS_ConvertUTF8toUTF16(mReferrer),
+                                                              mContentPolicyType);
+    internalReq->SetBody(mUploadStream);
     // For Telemetry, note that this Request object was created by a Fetch event.
-    RefPtr<InternalRequest> internalReq = request->GetInternalRequest();
-    MOZ_ASSERT(internalReq);
     internalReq->SetCreatedByFetchEvent();
 
-    internalReq->SetBody(mUploadStream);
-    internalReq->SetReferrer(NS_ConvertUTF8toUTF16(mReferrer));
-
-    request->SetContentPolicyType(mContentPolicyType);
-
-    request->GetInternalHeaders()->SetGuard(HeadersGuardEnum::Immutable, result);
-    if (NS_WARN_IF(result.Failed())) {
-      result.SuppressException();
+    nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(globalObj.GetAsSupports());
+    if (NS_WARN_IF(!global)) {
       return false;
     }
+    RefPtr<Request> request = new Request(global, internalReq);
 
-    // TODO: remove conditional on http here once app protocol support is
-    //       removed from service worker interception
-    MOZ_ASSERT_IF(mIsHttpChannel && internalReq->IsNavigationRequest(),
+    MOZ_ASSERT_IF(internalReq->IsNavigationRequest(),
                   request->Redirect() == RequestRedirect::Manual);
 
     RootedDictionary<FetchEventInit> init(aCx);
-    init.mRequest.Construct();
-    init.mRequest.Value() = request;
+    init.mRequest = request;
     init.mBubbles = false;
     init.mCancelable = true;
-    init.mClientId = mClientId;
+    if (!mClientId.IsEmpty()) {
+      init.mClientId = mClientId;
+    }
     init.mIsReload = mIsReload;
     RefPtr<FetchEvent> event =
       FetchEvent::Constructor(globalObj, NS_LITERAL_STRING("fetch"), init, result);
diff --git a/dom/workers/ServiceWorkerScriptCache.cpp b/dom/workers/ServiceWorkerScriptCache.cpp
index 938ca853bb..eefbcef8dc 100644
--- a/dom/workers/ServiceWorkerScriptCache.cpp
+++ b/dom/workers/ServiceWorkerScriptCache.cpp
@@ -263,12 +263,14 @@ public:
     mCacheStorage = CreateCacheStorage(jsapi.cx(), aPrincipal, result, &mSandbox);
     if (NS_WARN_IF(result.Failed())) {
       MOZ_ASSERT(!result.IsErrorWithMessage());
+      Cleanup();
       return result.StealNSResult();
     }
 
     mCN = new CompareNetwork(this);
     nsresult rv = mCN->Initialize(aPrincipal, aURL, aLoadGroup);
     if (NS_WARN_IF(NS_FAILED(rv))) {
+      Cleanup();
       return rv;
     }
 
@@ -277,6 +279,7 @@ public:
       rv = mCC->Initialize(aPrincipal, aURL, aCacheName);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         mCN->Abort();
+        Cleanup();
         return rv;
       }
     }
@@ -721,83 +724,54 @@ CompareNetwork::OnStreamComplete(nsIStreamLoader* aLoader, nsISupports* aContext
   }
 
   nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(request);
-  if (httpChannel) {
-    bool requestSucceeded;
-    rv = httpChannel->GetRequestSucceeded(&requestSucceeded);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      mManager->NetworkFinished(rv);
-      return NS_OK;
-    }
+  MOZ_ASSERT(httpChannel, "How come we don't have an HTTP channel?");
 
-    if (NS_WARN_IF(!requestSucceeded)) {
-      mManager->NetworkFinished(NS_ERROR_FAILURE);
-      return NS_OK;
-    }
-
-    nsAutoCString maxScope;
-    // Note: we explicitly don't check for the return value here, because the
-    // absence of the header is not an error condition.
-    Unused << httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Service-Worker-Allowed"),
-                                             maxScope);
-
-    mManager->SetMaxScope(maxScope);
-
-    bool isFromCache = false;
-    nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(httpChannel));
-    if (cacheChannel) {
-      cacheChannel->IsFromCache(&isFromCache);
-    }
-
-    // [9.2 Update]4.13, If response's cache state is not "local",
-    // set registration's last update check time to the current time
-    if (!isFromCache) {
-      RefPtr<ServiceWorkerRegistrationInfo> registration =
-        mManager->GetRegistration();
-      registration->RefreshLastUpdateCheckTime();
-    }
-
-    nsAutoCString mimeType;
-    rv = httpChannel->GetContentType(mimeType);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      mManager->NetworkFinished(NS_ERROR_DOM_SECURITY_ERR);
-      return rv;
-    }
-
-    if (!mimeType.LowerCaseEqualsLiteral("text/javascript") &&
-        !mimeType.LowerCaseEqualsLiteral("application/x-javascript") &&
-        !mimeType.LowerCaseEqualsLiteral("application/javascript")) {
-      mManager->NetworkFinished(NS_ERROR_DOM_SECURITY_ERR);
-      return rv;
-    }
+  bool requestSucceeded;
+  rv = httpChannel->GetRequestSucceeded(&requestSucceeded);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    mManager->NetworkFinished(rv);
+    return NS_OK;
   }
-  else {
-    // The only supported request schemes are http, https, and app.
-    // Above, we check to ensure that the request is http or https
-    // based on the channel qi.  Here we test the scheme to ensure
-    // that it is app.  Otherwise, bail.
-    nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
-    if (NS_WARN_IF(!channel)) {
-      mManager->NetworkFinished(NS_ERROR_FAILURE);
-      return NS_OK;
-    }
-    nsCOMPtr<nsIURI> uri;
-    rv = channel->GetURI(getter_AddRefs(uri));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      mManager->NetworkFinished(rv);
-      return NS_OK;
-    }
 
-    nsAutoCString scheme;
-    rv = uri->GetScheme(scheme);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      mManager->NetworkFinished(rv);
-      return NS_OK;
-    }
+  if (NS_WARN_IF(!requestSucceeded)) {
+    mManager->NetworkFinished(NS_ERROR_FAILURE);
+    return NS_OK;
+  }
 
-    if (NS_WARN_IF(!scheme.LowerCaseEqualsLiteral("app"))) {
-      mManager->NetworkFinished(NS_ERROR_FAILURE);
-      return NS_OK;
-    }
+  nsAutoCString maxScope;
+  // Note: we explicitly don't check for the return value here, because the
+  // absence of the header is not an error condition.
+  Unused << httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Service-Worker-Allowed"),
+                                           maxScope);
+
+  mManager->SetMaxScope(maxScope);
+
+  bool isFromCache = false;
+  nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(httpChannel));
+  if (cacheChannel) {
+    cacheChannel->IsFromCache(&isFromCache);
+  }
+
+  // [9.2 Update]4.13, If response's cache state is not "local",
+  // set registration's last update check time to the current time
+  if (!isFromCache) {
+    RefPtr<ServiceWorkerRegistrationInfo> registration =
+      mManager->GetRegistration();
+    registration->RefreshLastUpdateCheckTime();
+  }
+
+  nsAutoCString mimeType;
+  rv = httpChannel->GetContentType(mimeType);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    mManager->NetworkFinished(NS_ERROR_DOM_SECURITY_ERR);
+    return rv;
+  }
+
+  if (!mimeType.LowerCaseEqualsLiteral("text/javascript") &&
+      !mimeType.LowerCaseEqualsLiteral("application/x-javascript") &&
+      !mimeType.LowerCaseEqualsLiteral("application/javascript")) {
+    mManager->NetworkFinished(NS_ERROR_DOM_SECURITY_ERR);
+    return rv;
   }
 
   char16_t* buffer = nullptr;
diff --git a/dom/workers/WorkerDebuggerManager.cpp b/dom/workers/WorkerDebuggerManager.cpp
index 28c0a878df..e62d83769d 100644
--- a/dom/workers/WorkerDebuggerManager.cpp
+++ b/dom/workers/WorkerDebuggerManager.cpp
@@ -8,22 +8,23 @@
 
 #include "nsISimpleEnumerator.h"
 
+#include "mozilla/ClearOnShutdown.h"
+
 #include "WorkerPrivate.h"
 
 USING_WORKERS_NAMESPACE
 
+namespace {
+
 class RegisterDebuggerMainThreadRunnable final : public nsRunnable
 {
-  RefPtr<WorkerDebuggerManager> mManager;
   WorkerPrivate* mWorkerPrivate;
   bool mNotifyListeners;
 
 public:
-  RegisterDebuggerMainThreadRunnable(WorkerDebuggerManager* aManager,
-                                     WorkerPrivate* aWorkerPrivate,
+  RegisterDebuggerMainThreadRunnable(WorkerPrivate* aWorkerPrivate,
                                      bool aNotifyListeners)
-  : mManager(aManager),
-    mWorkerPrivate(aWorkerPrivate),
+  : mWorkerPrivate(aWorkerPrivate),
     mNotifyListeners(aNotifyListeners)
   { }
 
@@ -34,21 +35,21 @@ private:
   NS_IMETHOD
   Run() override
   {
-    mManager->RegisterDebuggerMainThread(mWorkerPrivate, mNotifyListeners);
+    WorkerDebuggerManager* manager = WorkerDebuggerManager::Get();
+    MOZ_ASSERT(manager);
 
+    manager->RegisterDebuggerMainThread(mWorkerPrivate, mNotifyListeners);
     return NS_OK;
   }
 };
 
 class UnregisterDebuggerMainThreadRunnable final : public nsRunnable
 {
-  RefPtr<WorkerDebuggerManager> mManager;
   WorkerPrivate* mWorkerPrivate;
 
 public:
-  UnregisterDebuggerMainThreadRunnable(WorkerDebuggerManager* aManager,
-                                       WorkerPrivate* aWorkerPrivate)
-  : mManager(aManager), mWorkerPrivate(aWorkerPrivate)
+  explicit UnregisterDebuggerMainThreadRunnable(WorkerPrivate* aWorkerPrivate)
+  : mWorkerPrivate(aWorkerPrivate)
   { }
 
 private:
@@ -58,12 +59,19 @@ private:
   NS_IMETHOD
   Run() override
   {
-    mManager->UnregisterDebuggerMainThread(mWorkerPrivate);
+    WorkerDebuggerManager* manager = WorkerDebuggerManager::Get();
+    MOZ_ASSERT(manager);
 
+    manager->UnregisterDebuggerMainThread(mWorkerPrivate);
     return NS_OK;
   }
 };
 
+// Does not hold an owning reference.
+static WorkerDebuggerManager* gWorkerDebuggerManager;
+
+} /* anonymous namespace */
+
 BEGIN_WORKERS_NAMESPACE
 
 class WorkerDebuggerEnumerator final : public nsISimpleEnumerator
@@ -116,7 +124,54 @@ WorkerDebuggerManager::~WorkerDebuggerManager()
   AssertIsOnMainThread();
 }
 
-NS_IMPL_ISUPPORTS(WorkerDebuggerManager, nsIWorkerDebuggerManager);
+// static
+already_AddRefed<WorkerDebuggerManager>
+WorkerDebuggerManager::GetInstance()
+{
+  RefPtr<WorkerDebuggerManager> manager = WorkerDebuggerManager::GetOrCreate();
+  return manager.forget();
+}
+
+// static
+WorkerDebuggerManager*
+WorkerDebuggerManager::GetOrCreate()
+{
+  AssertIsOnMainThread();
+
+  if (!gWorkerDebuggerManager) {
+    // The observer service now owns us until shutdown.
+    gWorkerDebuggerManager = new WorkerDebuggerManager();
+    if (NS_FAILED(gWorkerDebuggerManager->Init())) {
+      NS_WARNING("Failed to initialize worker debugger manager!");
+      gWorkerDebuggerManager = nullptr;
+      return nullptr;
+    }
+  }
+
+  return gWorkerDebuggerManager;
+}
+
+WorkerDebuggerManager*
+WorkerDebuggerManager::Get()
+{
+  MOZ_ASSERT(gWorkerDebuggerManager);
+  return gWorkerDebuggerManager;
+}
+
+NS_IMPL_ISUPPORTS(WorkerDebuggerManager, nsIObserver, nsIWorkerDebuggerManager);
+
+NS_IMETHODIMP
+WorkerDebuggerManager::Observe(nsISupports* aSubject, const char* aTopic,
+                               const char16_t* aData)
+{
+  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
+    Shutdown();
+    return NS_OK;
+  }
+
+  NS_NOTREACHED("Unknown observer topic!");
+  return NS_OK;
+}
 
 NS_IMETHODIMP
 WorkerDebuggerManager::GetWorkerDebuggerEnumerator(
@@ -161,8 +216,20 @@ WorkerDebuggerManager::RemoveListener(
   return NS_OK;
 }
 
+nsresult
+WorkerDebuggerManager::Init()
+{
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  NS_ENSURE_TRUE(obs, NS_ERROR_FAILURE);
+
+  nsresult rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 void
-WorkerDebuggerManager::ClearListeners()
+WorkerDebuggerManager::Shutdown()
 {
   AssertIsOnMainThread();
 
@@ -205,8 +272,7 @@ WorkerDebuggerManager::RegisterDebugger(WorkerPrivate* aWorkerPrivate)
     }
 
     nsCOMPtr<nsIRunnable> runnable =
-      new RegisterDebuggerMainThreadRunnable(this, aWorkerPrivate,
-                                             hasListeners);
+      new RegisterDebuggerMainThreadRunnable(aWorkerPrivate, hasListeners);
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
       NS_DispatchToMainThread(runnable, NS_DISPATCH_NORMAL)));
 
@@ -225,7 +291,7 @@ WorkerDebuggerManager::UnregisterDebugger(WorkerPrivate* aWorkerPrivate)
     UnregisterDebuggerMainThread(aWorkerPrivate);
   } else {
     nsCOMPtr<nsIRunnable> runnable =
-      new UnregisterDebuggerMainThreadRunnable(this, aWorkerPrivate);
+      new UnregisterDebuggerMainThreadRunnable(aWorkerPrivate);
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
       NS_DispatchToMainThread(runnable, NS_DISPATCH_NORMAL)));
 
diff --git a/dom/workers/WorkerDebuggerManager.h b/dom/workers/WorkerDebuggerManager.h
index 2b3d1b5646..2ba6a75441 100644
--- a/dom/workers/WorkerDebuggerManager.h
+++ b/dom/workers/WorkerDebuggerManager.h
@@ -9,6 +9,7 @@
 
 #include "Workers.h"
 
+#include "nsIObserver.h"
 #include "nsIWorkerDebuggerManager.h"
 
 #include "nsServiceManagerUtils.h"
@@ -24,7 +25,8 @@ BEGIN_WORKERS_NAMESPACE
 
 class WorkerDebugger;
 
-class WorkerDebuggerManager final : public nsIWorkerDebuggerManager
+class WorkerDebuggerManager final : public nsIObserver,
+                                    public nsIWorkerDebuggerManager
 {
   Mutex mMutex;
 
@@ -35,54 +37,58 @@ class WorkerDebuggerManager final : public nsIWorkerDebuggerManager
   nsTArray<RefPtr<WorkerDebugger>> mDebuggers;
 
 public:
+  static already_AddRefed<WorkerDebuggerManager>
+  GetInstance();
+
   static WorkerDebuggerManager*
-  GetOrCreateService()
-  {
-    nsCOMPtr<nsIWorkerDebuggerManager> manager =
-      do_GetService(WORKERDEBUGGERMANAGER_CONTRACTID);
-    return static_cast<WorkerDebuggerManager*>(manager.get());
-  }
+  GetOrCreate();
+
+  static WorkerDebuggerManager*
+  Get();
 
   WorkerDebuggerManager();
 
-  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
   NS_DECL_NSIWORKERDEBUGGERMANAGER
 
-  void ClearListeners();
+  nsresult
+  Init();
 
-  void RegisterDebugger(WorkerPrivate* aWorkerPrivate);
+  void
+  Shutdown();
 
-  void UnregisterDebugger(WorkerPrivate* aWorkerPrivate);
+  void
+  RegisterDebugger(WorkerPrivate* aWorkerPrivate);
 
-  void RegisterDebuggerMainThread(WorkerPrivate* aWorkerPrivate,
-                                  bool aNotifyListeners);
+  void
+  RegisterDebuggerMainThread(WorkerPrivate* aWorkerPrivate,
+                             bool aNotifyListeners);
 
-  void UnregisterDebuggerMainThread(WorkerPrivate* aWorkerPrivate);
+  void
+  UnregisterDebugger(WorkerPrivate* aWorkerPrivate);
+
+  void
+  UnregisterDebuggerMainThread(WorkerPrivate* aWorkerPrivate);
 
 private:
   virtual ~WorkerDebuggerManager();
 };
 
-inline nsresult
-ClearWorkerDebuggerManagerListeners()
-{
-  RefPtr<WorkerDebuggerManager> manager =
-    WorkerDebuggerManager::GetOrCreateService();
-  if (!manager) {
-    return NS_ERROR_FAILURE;
-  }
-
-  manager->ClearListeners();
-  return NS_OK;
-}
-
 inline nsresult
 RegisterWorkerDebugger(WorkerPrivate* aWorkerPrivate)
 {
-  RefPtr<WorkerDebuggerManager> manager =
-    WorkerDebuggerManager::GetOrCreateService();
-  if (!manager) {
-    return NS_ERROR_FAILURE;
+  WorkerDebuggerManager* manager;
+
+  if (NS_IsMainThread()) {
+    manager = WorkerDebuggerManager::GetOrCreate();
+    if (!manager) {
+      NS_WARNING("Failed to create worker debugger manager!");
+      return NS_ERROR_FAILURE;
+    }
+  }
+  else {
+    manager = WorkerDebuggerManager::Get();
   }
 
   manager->RegisterDebugger(aWorkerPrivate);
@@ -92,10 +98,17 @@ RegisterWorkerDebugger(WorkerPrivate* aWorkerPrivate)
 inline nsresult
 UnregisterWorkerDebugger(WorkerPrivate* aWorkerPrivate)
 {
-  RefPtr<WorkerDebuggerManager> manager =
-    WorkerDebuggerManager::GetOrCreateService();
-  if (!manager) {
-    return NS_ERROR_FAILURE;
+  WorkerDebuggerManager* manager;
+
+  if (NS_IsMainThread()) {
+    manager = WorkerDebuggerManager::GetOrCreate();
+    if (!manager) {
+      NS_WARNING("Failed to create worker debugger manager!");
+      return NS_ERROR_FAILURE;
+    }
+  }
+  else {
+    manager = WorkerDebuggerManager::Get();
   }
 
   manager->UnregisterDebugger(aWorkerPrivate);
diff --git a/dom/workers/WorkerFeature.h b/dom/workers/WorkerFeature.h
index 21ef2253d0..9c6d8da685 100644
--- a/dom/workers/WorkerFeature.h
+++ b/dom/workers/WorkerFeature.h
@@ -74,9 +74,6 @@ class WorkerFeature
 public:
   virtual ~WorkerFeature() { }
 
-  virtual bool Suspend(JSContext* aCx) { return true; }
-  virtual bool Resume(JSContext* aCx) { return true; }
-
   virtual bool Notify(JSContext* aCx, Status aStatus) = 0;
 };
 
diff --git a/dom/workers/WorkerRunnable.cpp b/dom/workers/WorkerRunnable.cpp
index 624ec0f5c7..5044f34141 100644
--- a/dom/workers/WorkerRunnable.cpp
+++ b/dom/workers/WorkerRunnable.cpp
@@ -348,10 +348,44 @@ WorkerRunnable::Run()
     cx = jsapi.cx();
   }
 
-  // If we're not on the worker thread we'll either be in our parent's
-  // compartment or the null compartment, so we need to enter our own.
+  // Note that we can't assert anything about mWorkerPrivate->GetWrapper()
+  // existing, since it may in fact have been GCed (and we may be one of the
+  // runnables cleaning up the worker as a result).
+
+  // If we are on the parent thread and that thread is not the main thread,
+  // then we must be a dedicated worker (because there are no
+  // Shared/ServiceWorkers whose parent is itself a worker) and then we
+  // definitely have a globalObject.  If it _is_ the main thread, globalObject
+  // can be null for workers started from JSMs or other non-window contexts,
+  // sadly.
+  MOZ_ASSERT_IF(!targetIsWorkerThread && !isMainThread,
+                mWorkerPrivate->IsDedicatedWorker() && globalObject);
+
+  // If we're on the parent thread we might be in a null compartment in the
+  // situation described above when globalObject is null.  Make sure to enter
+  // the compartment of the worker's reflector if there is one.  There might
+  // not be one if we're just starting to compile the script for this worker.
   Maybe<JSAutoCompartment> ac;
   if (!targetIsWorkerThread && mWorkerPrivate->GetWrapper()) {
+    // If we're on the parent thread and have a reflector and a globalObject,
+    // then the compartments of cx, globalObject, and the worker's reflector
+    // should all match.
+    MOZ_ASSERT_IF(globalObject,
+                  js::GetObjectCompartment(mWorkerPrivate->GetWrapper()) ==
+                    js::GetContextCompartment(cx));
+    MOZ_ASSERT_IF(globalObject,
+                  js::GetObjectCompartment(mWorkerPrivate->GetWrapper()) ==
+                    js::GetObjectCompartment(globalObject->GetGlobalJSObject()));
+
+    // If we're on the parent thread and have a reflector, then our
+    // JSContext had better be either in the null compartment (and hence
+    // have no globalObject) or in the compartment of our reflector.
+    MOZ_ASSERT(!js::GetContextCompartment(cx) ||
+               js::GetObjectCompartment(mWorkerPrivate->GetWrapper()) ==
+                 js::GetContextCompartment(cx),
+               "Must either be in the null compartment or in our reflector "
+               "compartment");
+
     ac.emplace(cx, mWorkerPrivate->GetWrapper());
   }
 
diff --git a/dom/workers/WorkerRunnable.h b/dom/workers/WorkerRunnable.h
index 25dc479eba..62bfb7a051 100644
--- a/dom/workers/WorkerRunnable.h
+++ b/dom/workers/WorkerRunnable.h
@@ -115,26 +115,45 @@ protected:
   // By default asserts that Dispatch() is being called on the right thread
   // (ParentThread if |mTarget| is WorkerThread, or WorkerThread otherwise).
   // Also increments the busy count of |mWorkerPrivate| if targeting the
-  // WorkerThread.
+  // WorkerThread.  The JSContext passed in here is the one that was passed to
+  // Dispatch().
   virtual bool
   PreDispatch(JSContext* aCx, WorkerPrivate* aWorkerPrivate);
 
   // By default asserts that Dispatch() is being called on the right thread
   // (ParentThread if |mTarget| is WorkerThread, or WorkerThread otherwise).
-  // Also reports any Dispatch() failures as an exception on |aCx|, and
-  // busy count if targeting the WorkerThread and Dispatch() failed.
+  // Also reports any Dispatch() failures as an exception on |aCx|, and busy
+  // count if targeting the WorkerThread and Dispatch() failed.  The JSContext
+  // passed in here is the one that was passed to Dispatch().
   virtual void
   PostDispatch(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
                bool aDispatchResult);
 
-  // Must be implemented by subclasses. Called on the target thread.
+  // Must be implemented by subclasses. Called on the target thread.  The return
+  // value will be passed to PostRun().  The JSContext passed in here comes from
+  // an AutoJSAPI (or AutoEntryScript) that we set up on the stack.  If
+  // mBehavior is ParentThreadUnchangedBusyCount, it is in the compartment of
+  // mWorkerPrivate's reflector (i.e. the worker object in the parent thread),
+  // unless that reflector is null, in which case it's in the compartment of the
+  // parent global (which is the compartment reflector would have been in), or
+  // in the null compartment if there is no parent global.  For other mBehavior
+  // values, we're running on the worker thread and aCx is in whatever
+  // compartment GetCurrentThreadJSContext() was in when nsIRunnable::Run() got
+  // called (XXXbz: Why is this a sane thing to be doing now that we have
+  // multiple globals per worker???).  If it wasn't in a compartment, aCx will
+  // be in either the debugger global's compartment or the worker's global's
+  // compartment depending on whether IsDebuggerRunnable() is true.
   virtual bool
   WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) = 0;
 
   // By default asserts that Run() (and WorkerRun()) were called on the correct
-  // thread. Any failures (false return from WorkerRun) are reported on |aCx|.
-  // Also sends an asynchronous message to the ParentThread if the busy
-  // count was previously modified in PreDispatch().
+  // thread.  Also sends an asynchronous message to the ParentThread if the
+  // busy count was previously modified in PreDispatch().
+  //
+  // The aCx passed here is the same one as was passed to WorkerRun and is
+  // still in the same compartment.  If aRunResult is false, any failures on
+  // aCx are reported.  Otherwise failures are left to linger on the JSContext
+  // and maim later code (XXXbz: Aiming to fix that in bug 1072144).
   virtual void
   PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, bool aRunResult);
 
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index b877c8fcc9..746ac3af92 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -436,8 +436,12 @@ DedicatedWorkerGlobalScope::WrapGlobalObject(JSContext* aCx,
   behaviors.setDiscardSource(discardSource)
            .extraWarningsOverride().set(extraWarnings);
 
+  const bool inCertifiedApp = mWorkerPrivate->IsInCertifiedApp();
+  const bool sharedMemoryEnabled = xpc::SharedMemoryEnabled();
+
   JS::CompartmentCreationOptions& creationOptions = options.creationOptions();
-  creationOptions.setSharedMemoryAndAtomicsEnabled(xpc::SharedMemoryEnabled());
+  creationOptions.setSharedMemoryAndAtomicsEnabled(sharedMemoryEnabled)
+                 .setExperimentalDateTimeFormatFormatToPartsEnabled(inCertifiedApp);
 
   return DedicatedWorkerGlobalScopeBinding_workers::Wrap(aCx, this, this,
                                                          options,
diff --git a/dom/workers/Workers.h b/dom/workers/Workers.h
index 92f3842918..11872144f0 100644
--- a/dom/workers/Workers.h
+++ b/dom/workers/Workers.h
@@ -294,6 +294,8 @@ SuspendWorkersForWindow(nsPIDOMWindow* aWindow);
 void
 ResumeWorkersForWindow(nsPIDOMWindow* aWindow);
 
+// A class that can be used with WorkerCrossThreadDispatcher to run a
+// bit of C++ code on the worker thread.
 class WorkerTask
 {
 protected:
@@ -306,6 +308,8 @@ protected:
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(WorkerTask)
 
+  // The return value here has the same semantics as the return value
+  // of WorkerRunnable::WorkerRun.
   virtual bool
   RunTask(JSContext* aCx) = 0;
 };
diff --git a/dom/workers/test/serviceworkers/app-protocol/README.txt b/dom/workers/test/serviceworkers/app-protocol/README.txt
deleted file mode 100644
index 541e2bda23..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-application.list contains a list of files that are in application.zip.
-
-To update application.zip when changing one of those files, run makezip.sh.
diff --git a/dom/workers/test/serviceworkers/app-protocol/application.list b/dom/workers/test/serviceworkers/app-protocol/application.list
deleted file mode 100644
index 8ebb411002..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/application.list
+++ /dev/null
@@ -1,7 +0,0 @@
-controlled.html
-foo.txt
-index.html
-manifest.webapp
-sw.js
-test.js
-test_doc_load_interception.js
diff --git a/dom/workers/test/serviceworkers/app-protocol/application.zip b/dom/workers/test/serviceworkers/app-protocol/application.zip
index 7d4be7f461..5274ade945 100644
Binary files a/dom/workers/test/serviceworkers/app-protocol/application.zip and b/dom/workers/test/serviceworkers/app-protocol/application.zip differ
diff --git a/dom/workers/test/serviceworkers/app-protocol/controlled.html b/dom/workers/test/serviceworkers/app-protocol/controlled.html
deleted file mode 100644
index e7e23adcfa..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/controlled.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test app for bug 1161684</title>
-    <script src='test.js'></script>
-    <script src='test_doc_load_interception.js'></script>
-    <script type='application/javascript;version=1.7'>
-
-function runTests() {
-  return Promise.resolve()
-    .then(navigator.serviceWorker.ready)
-    .then(() => {
-        return testFetchAppResource('foo.txt',
-                                    'swresponse', 'text/plain');
-    })
-    .then(() => {
-        return testFetchAppResource('test_custom_content_type',
-                                    'customContentType', 'text/html');
-    })
-    // XXX: Cross-origin interceptions without CORS result in opaque responses
-    //      which are illegal for navigations like iframes. (bug 1183313)
-    //.then(testRedirectedResponse)
-    //.then(testRedirectedHttpsResponse)
-    //.then(testCachedRedirectedResponse)
-    //.then(testCachedRedirectedHttpsResponse)
-    .then(done);
-}
-  </script>
-  </head>
-  <body onload='runTests()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/app-protocol/foo.txt b/dom/workers/test/serviceworkers/app-protocol/foo.txt
deleted file mode 100644
index 8d1556472f..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/foo.txt
+++ /dev/null
@@ -1 +0,0 @@
-networkresponse
\ No newline at end of file
diff --git a/dom/workers/test/serviceworkers/app-protocol/index.html b/dom/workers/test/serviceworkers/app-protocol/index.html
deleted file mode 100644
index 7dcc8cac52..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test app for bug 1161684</title>
-    <script src='test.js'></script>
-    <script type='application/javascript;version=1.7'>
-function registerServiceWorker() {
-  return new Promise((resolve, reject) => {
-    navigator.serviceWorker.ready.then(() => {
-      resolve();
-    });
-    navigator.serviceWorker.register('sw.js', {scope: '.'})
-    .then(registration => {
-      ok(true, 'service worker registered');
-    })
-    .catch(reject);
-  });
-}
-
-function runTests() {
-  return Promise.resolve()
-    .then(() => { return testFetchAppResource('foo.txt',
-                                              'networkresponse'); })
-    .then(registerServiceWorker)
-    .then(ready);
-}
-  </script>
-  </head>
-  <body onload='runTests()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/app-protocol/makezip.sh b/dom/workers/test/serviceworkers/app-protocol/makezip.sh
deleted file mode 100644
index 317c908919..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/makezip.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm application.zip
-zip application.zip `cat application.list`
diff --git a/dom/workers/test/serviceworkers/app-protocol/realindex.html b/dom/workers/test/serviceworkers/app-protocol/realindex.html
deleted file mode 100644
index a0a381f5b3..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/realindex.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-real index
diff --git a/dom/workers/test/serviceworkers/app-protocol/realindex.html^headers^ b/dom/workers/test/serviceworkers/app-protocol/realindex.html^headers^
deleted file mode 100644
index cb762eff80..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/realindex.html^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Access-Control-Allow-Origin: *
diff --git a/dom/workers/test/serviceworkers/app-protocol/redirect-https.sjs b/dom/workers/test/serviceworkers/app-protocol/redirect-https.sjs
deleted file mode 100644
index 7806ee0a05..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/redirect-https.sjs
+++ /dev/null
@@ -1,5 +0,0 @@
-function handleRequest(request, response) {
-  response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Access-Control-Allow-Origin", "*", false);
-  response.setHeader("Location", "https://example.org/tests/dom/workers/test/serviceworkers/app-protocol/realindex.html", false);
-}
diff --git a/dom/workers/test/serviceworkers/app-protocol/redirect.sjs b/dom/workers/test/serviceworkers/app-protocol/redirect.sjs
deleted file mode 100644
index a63b0c2f92..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/redirect.sjs
+++ /dev/null
@@ -1,5 +0,0 @@
-function handleRequest(request, response) {
-  response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Access-Control-Allow-Origin", "*", false);
-  response.setHeader("Location", "http://example.org/tests/dom/workers/test/serviceworkers/app-protocol/realindex.html", false);
-}
diff --git a/dom/workers/test/serviceworkers/app-protocol/sw.js b/dom/workers/test/serviceworkers/app-protocol/sw.js
deleted file mode 100644
index ccf2ce69ad..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/sw.js
+++ /dev/null
@@ -1,63 +0,0 @@
-const kHTTPRedirect = "http://example.com/tests/dom/workers/test/serviceworkers/app-protocol/redirect.sjs";
-const kHTTPSRedirect = "https://example.com/tests/dom/workers/test/serviceworkers/app-protocol/redirect-https.sjs";
-
-self.addEventListener('install', (event) => {
-  event.waitUntil(
-    self.caches.open("origin-app-cache")
-      .then(c => {
-        return Promise.all(
-          [
-            c.add(kHTTPRedirect),
-            c.add(kHTTPSRedirect),
-          ]
-        );
-      })
-  );
-});
-
-self.addEventListener('fetch', (event) => {
-  if (event.request.url.indexOf('foo.txt') >= 0) {
-    event.respondWith(new Response('swresponse', {
-      headers: {'Content-Type': 'text/plain'}
-    }));
-  }
-
-  if (event.request.url.indexOf('test_doc_load_interception.js') >= 0 ) {
-    var scriptContent = 'alert("OK: Script modified by service worker")';
-    event.respondWith(new Response(scriptContent, {
-      headers: {'Content-Type': 'application/javascript'}
-    }));
-  }
-
-  if (event.request.url.indexOf('test_custom_content_type') >= 0) {
-    event.respondWith(new Response('customContentType', {
-      headers: {'Content-Type': 'text/html'}
-    }));
-  }
-
-  if (event.request.url.indexOf('redirected.html') >= 0) {
-    event.respondWith(fetch(kHTTPRedirect));
-  }
-
-  if (event.request.url.indexOf('redirected-https.html') >= 0) {
-    event.respondWith(fetch(kHTTPSRedirect));
-  }
-
-  if (event.request.url.indexOf('redirected-cached.html') >= 0) {
-    event.respondWith(
-      self.caches.open("origin-app-cache")
-        .then(c => {
-          return c.match(kHTTPRedirect);
-        })
-    );
-  }
-
-  if (event.request.url.indexOf('redirected-https-cached.html') >= 0) {
-    event.respondWith(
-      self.caches.open("origin-app-cache")
-        .then(c => {
-          return c.match(kHTTPSRedirect);
-        })
-    );
-  }
-});
diff --git a/dom/workers/test/serviceworkers/app-protocol/test.js b/dom/workers/test/serviceworkers/app-protocol/test.js
deleted file mode 100644
index 814310c732..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function ok(aCondition, aMessage) {
-  if (aCondition) {
-    alert('OK: ' + aMessage);
-  } else {
-    alert('KO: ' + aMessage);
-  }
-}
-
-function ready() {
-  alert('READY');
-}
-
-function done() {
-  alert('DONE');
-}
-
-function testFetchAppResource(aUrl,
-                              aExpectedResponse,
-                              aExpectedContentType) {
-  return fetch(aUrl).then(res => {
-    ok(true, 'fetch should resolve');
-    if (res.type == 'error') {
-      ok(false, 'fetch failed');
-    }
-    ok(res.status == 200, 'status should be 200');
-    ok(res.statusText == 'OK', 'statusText should be OK');
-    if (aExpectedContentType) {
-      var headers = res.headers.getAll('Content-Type');
-      ok(headers.length, "Headers length");
-      var contentType = res.headers.get('Content-Type');
-      ok(contentType == aExpectedContentType, ('content type ' +
-         contentType + ' should match with ' + aExpectedContentType));
-    }
-    return res.text().then(body => {
-      ok(body == aExpectedResponse, 'body ' + body +
-         ' should match with ' + aExpectedResponse);
-    });
-  });
-}
-
-function testRedirectedResponse() {
-  return testRedirectedResponseWorker("redirected", "IFRAMELOADED");
-}
-
-function testRedirectedHttpsResponse() {
-  return testRedirectedResponseWorker("redirected-https", "HTTPSIFRAMELOADED");
-}
-
-function testCachedRedirectedResponse() {
-  return testRedirectedResponseWorker("redirected-cached", "IFRAMELOADED");
-}
-
-function testCachedRedirectedHttpsResponse() {
-  return testRedirectedResponseWorker("redirected-https-cached", "HTTPSIFRAMELOADED");
-}
-
-function testRedirectedResponseWorker(aFrameId, aAlert) {
-  // Because of the CSP policies applied to privileged apps, we cannot run
-  // inline script inside realindex.html, and loading a script from the app://
-  // URI is also not an option, so we let the parent iframe which has access
-  // to the SpecialPowers API use those privileges to access the document.
-  var iframe = document.createElement("iframe");
-  document.body.appendChild(iframe);
-  iframe.src = aFrameId + ".html";
-  iframe.id = aFrameId;
-  return new Promise(resolve => {
-    iframe.addEventListener("load", event => {
-      alert(aAlert);
-      resolve();
-    }, false);
-  });
-}
diff --git a/dom/workers/test/serviceworkers/app-protocol/test_doc_load_interception.js b/dom/workers/test/serviceworkers/app-protocol/test_doc_load_interception.js
deleted file mode 100644
index df42904269..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/test_doc_load_interception.js
+++ /dev/null
@@ -1 +0,0 @@
-alert('KO: Should not load this file, but the sw modified version instead');
diff --git a/dom/workers/test/serviceworkers/app-protocol/update.webapp b/dom/workers/test/serviceworkers/app-protocol/update.webapp
deleted file mode 100644
index e4649d81c8..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/update.webapp
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "App",
-  "launch_path": "/index.html",
-  "description": "Test app for bug 1161684",
-  "package_path": "application.zip"
-}
diff --git a/dom/workers/test/serviceworkers/app-protocol/update.webapp^headers^ b/dom/workers/test/serviceworkers/app-protocol/update.webapp^headers^
deleted file mode 100644
index 90818c6398..0000000000
--- a/dom/workers/test/serviceworkers/app-protocol/update.webapp^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: application/manifest+json
diff --git a/dom/workers/test/serviceworkers/app/manifest.webapp b/dom/workers/test/serviceworkers/app/manifest.webapp
deleted file mode 100644
index e8ead7c605..0000000000
--- a/dom/workers/test/serviceworkers/app/manifest.webapp
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "App",
-  "launch_path": "/index.html",
-  "description": "Test app for bug 1169249"
-}
diff --git a/dom/workers/test/serviceworkers/app/sw.js b/dom/workers/test/serviceworkers/app/sw.js
deleted file mode 100644
index 9d071d6df7..0000000000
--- a/dom/workers/test/serviceworkers/app/sw.js
+++ /dev/null
@@ -1 +0,0 @@
-// Useless service worker.
diff --git a/dom/workers/test/serviceworkers/app2/client.html b/dom/workers/test/serviceworkers/app2/client.html
deleted file mode 100644
index 3a48672b9a..0000000000
--- a/dom/workers/test/serviceworkers/app2/client.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>Test app for bug 1178233</title>
-    <script type='application/javascript;version=1.7'>
-
-function onLoad() {
-  navigator.serviceWorker.ready.then(function(swr) {
-    parent.postMessage({status: "callback", data: "done"}, '*');
-  });
-}
-
-    </script>
-  </head>
-  <body onload='onLoad()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/app2/index.html b/dom/workers/test/serviceworkers/app2/index.html
deleted file mode 100644
index 09e7fb3b53..0000000000
--- a/dom/workers/test/serviceworkers/app2/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test app for bug 1178233</title>
-    <script type='application/javascript;version=1.7'>
-
-function ok(aCondition, aMessage) {
-  if (aCondition) {
-    alert('OK: ' + aMessage);
-  } else {
-    alert('KO: ' + aMessage);
-  }
-}
-
-function done() {
-  alert('DONE');
-}
-
-function testFrame(src) {
-  return new Promise(function(resolve, reject) {
-    var iframe = document.createElement("iframe");
-    iframe.src = src;
-    window.onmessage = function(e) {
-      if (e.data.status == "callback") {
-        window.onmessage = null;
-        var result = e.data.data;
-        iframe.src = "about:blank";
-        document.body.removeChild(iframe);
-        iframe = null;
-        resolve(result);
-      }
-    };
-    document.body.appendChild(iframe);
-  });
-}
-
-function registerServiceWorker() {
-  return navigator.serviceWorker.register('sw.sjs', {scope: '.'});
-}
-
-function runTests() {
-  var lastSeenVersion;
-  return Promise.resolve()
-    .then(function() {
-      // Check whether the service worker is already registered and save its
-      // version.
-      return navigator.serviceWorker.getRegistration(".").then(function(swr) {
-        if (!swr) {
-          lastSeenVersion = 0;
-          return registerServiceWorker();
-        }
-        return testFrame('version.html').then(function(body) {
-          lastSeenVersion = parseInt(body);
-          return Promise.resolve();
-        });
-      });
-    })
-    .then(function() {
-      // Wait until the service worker start controlling the client.
-      return testFrame('client.html');
-    })
-    .then(function() {
-      return new Promise((resolve, reject) => {
-        testFrame('wait_for_update.html').then(function() {
-          // Fetch current version. It should be greater than the last seen version.
-          testFrame('version.html').then(function(body) {
-            var currentVersion = parseInt(body);
-            ok(lastSeenVersion < currentVersion, "New service worker version seen");
-            resolve();
-          });
-        });
-      });
-    })
-    .then(done);
-}
-
-    </script>
-  </head>
-  <body onload='runTests()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/app2/manifest.webapp b/dom/workers/test/serviceworkers/app2/manifest.webapp
deleted file mode 100644
index a002467bde..0000000000
--- a/dom/workers/test/serviceworkers/app2/manifest.webapp
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "App",
-  "launch_path": "/index.html",
-  "description": "Test app for bug 1178233"
-}
diff --git a/dom/workers/test/serviceworkers/app2/manifest.webapp^headers^ b/dom/workers/test/serviceworkers/app2/manifest.webapp^headers^
deleted file mode 100644
index 90818c6398..0000000000
--- a/dom/workers/test/serviceworkers/app2/manifest.webapp^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: application/manifest+json
diff --git a/dom/workers/test/serviceworkers/app2/sw.sjs b/dom/workers/test/serviceworkers/app2/sw.sjs
deleted file mode 100644
index f60400cbf2..0000000000
--- a/dom/workers/test/serviceworkers/app2/sw.sjs
+++ /dev/null
@@ -1,22 +0,0 @@
-function handleRequest(request, response) {
-  var stateName = request.scheme + 'counter';
-  if (!getState(stateName)) {
-    setState(stateName, '1');
-  } else {
-    // Make sure that we pass a string value to setState!
-    setState(stateName, "" + (parseInt(getState(stateName)) + 1));
-  }
-  response.setHeader("Content-Type", "application/javascript", false);
-  response.write(getScript(stateName));
-}
-
-function getScript(stateName) {
-  return "oninstall = function(evt) {" +
-           "evt.waitUntil(self.skipWaiting());" +
-         "}; " +
-         "onfetch = function(evt) {" +
-           "if (evt.request.url.indexOf('get-sw-version') > -1) {" +
-             "evt.respondWith(new Response('" + getState(stateName) + "'));" +
-           "}" +
-         "};";
-}
diff --git a/dom/workers/test/serviceworkers/app2/version.html b/dom/workers/test/serviceworkers/app2/version.html
deleted file mode 100644
index 9d4537648d..0000000000
--- a/dom/workers/test/serviceworkers/app2/version.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>Test app for bug 1178233</title>
-    <script type='application/javascript;version=1.7'>
-
-function onLoad() {
-  fetch("get-sw-version").then(function(r) {
-    return r.text();
-  }).then(function(body) {
-    parent.postMessage({status: "callback", data: body}, "*");
-  });
-}
-
-    </script>
-  </head>
-  <body onload='onLoad()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/app2/wait_for_update.html b/dom/workers/test/serviceworkers/app2/wait_for_update.html
deleted file mode 100644
index fb4410f4fc..0000000000
--- a/dom/workers/test/serviceworkers/app2/wait_for_update.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test app for bug 1178233</title>
-    <script type='application/javascript;version=1.7'>
-
-function update() {
-  alert('UPDATE');
-}
-
-function onLoad() {
-  navigator.serviceWorker.getRegistration(".").then(function(swr) {
-    swr.onupdatefound = function() {
-      swr.onupdatefound = null;
-      parent.postMessage({status: "callback", data: "done"}, "*");
-    };
-    update();
-  });
-}
-
-    </script>
-  </head>
-  <body onload='onLoad()'>
-  </body>
-</html>
diff --git a/dom/workers/test/serviceworkers/chrome.ini b/dom/workers/test/serviceworkers/chrome.ini
index 4799c73bec..a5b493bfb0 100644
--- a/dom/workers/test/serviceworkers/chrome.ini
+++ b/dom/workers/test/serviceworkers/chrome.ini
@@ -1,18 +1,15 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
-  app/*
-  app2/*
   chrome_helpers.js
+  empty.js
+  serviceworker.html
   serviceworkerinfo_iframe.html
   serviceworkermanager_iframe.html
   serviceworkerregistrationinfo_iframe.html
   worker.js
   worker2.js
 
-[test_aboutserviceworkers.html]
-skip-if = true #bug 1193319
-[test_app_installation.html]
 [test_privateBrowsing.html]
 [test_serviceworkerinfo.xul]
 [test_serviceworkermanager.xul]
diff --git a/dom/workers/test/serviceworkers/fetch/fetch_tests.js b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
index 78ece9b0ad..54da1b66eb 100644
--- a/dom/workers/test/serviceworkers/fetch/fetch_tests.js
+++ b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
@@ -121,6 +121,12 @@ fetchXHR('headers.txt', function(xhr) {
   finish();
 }, null, [["X-Test1", "header1"], ["X-Test2", "header2"]]);
 
+fetchXHR('http://user:pass@mochi.test:8888/user-pass', function(xhr) {
+  my_ok(xhr.status == 200, "load should be successful");
+  my_ok(xhr.responseText == 'http://user:pass@mochi.test:8888/user-pass', 'The username and password should be preserved');
+  finish();
+});
+
 var expectedUncompressedResponse = "";
 for (var i = 0; i < 10; ++i) {
   expectedUncompressedResponse += "hello";
@@ -402,7 +408,7 @@ fetch('fetchevent-request')
 .then(function(res) {
   return res.text();
 }).then(function(body) {
-  my_ok(body == "nullable", "FetchEvent.request must be nullable");
+  my_ok(body == "non-nullable", "FetchEvent.request must be non-nullable");
   finish();
 }, function(err) {
   my_ok(false, "A promise was rejected with " + err);
diff --git a/dom/workers/test/serviceworkers/fetch/origin/https/origin_test.js b/dom/workers/test/serviceworkers/fetch/origin/https/origin_test.js
index ca7d906d6b..9839fc5f07 100644
--- a/dom/workers/test/serviceworkers/fetch/origin/https/origin_test.js
+++ b/dom/workers/test/serviceworkers/fetch/origin/https/origin_test.js
@@ -1,10 +1,16 @@
 var prefix = "/tests/dom/workers/test/serviceworkers/fetch/origin/https/";
 
+function addOpaqueRedirect(cache, file) {
+  return fetch(new Request(prefix + file, { redirect: "manual" })).then(function(response) {
+    return cache.put(prefix + file, response);
+  });
+}
+
 self.addEventListener("install", function(event) {
   event.waitUntil(
     self.caches.open("origin-cache")
       .then(c => {
-        return c.add(new Request(prefix + 'index-https.sjs', {redirect: "manual"}));
+        return addOpaqueRedirect(c, 'index-https.sjs');
       })
   );
 });
diff --git a/dom/workers/test/serviceworkers/fetch/origin/origin_test.js b/dom/workers/test/serviceworkers/fetch/origin/origin_test.js
index 53e55f9e83..d2be9573b7 100644
--- a/dom/workers/test/serviceworkers/fetch/origin/origin_test.js
+++ b/dom/workers/test/serviceworkers/fetch/origin/origin_test.js
@@ -1,13 +1,19 @@
 var prefix = "/tests/dom/workers/test/serviceworkers/fetch/origin/";
 
+function addOpaqueRedirect(cache, file) {
+  return fetch(new Request(prefix + file, { redirect: "manual" })).then(function(response) {
+    return cache.put(prefix + file, response);
+  });
+}
+
 self.addEventListener("install", function(event) {
   event.waitUntil(
     self.caches.open("origin-cache")
       .then(c => {
         return Promise.all(
           [
-            c.add(new Request(prefix + 'index.sjs', {redirect: "manual"})),
-            c.add(new Request(prefix + 'index-to-https.sjs', {redirect: "manual"}))
+            addOpaqueRedirect(c, 'index.sjs'),
+            addOpaqueRedirect(c, 'index-to-https.sjs')
           ]
         );
       })
diff --git a/dom/workers/test/serviceworkers/fetch_event_worker.js b/dom/workers/test/serviceworkers/fetch_event_worker.js
index f0c51ba157..a4ba2ae9f5 100644
--- a/dom/workers/test/serviceworkers/fetch_event_worker.js
+++ b/dom/workers/test/serviceworkers/fetch_event_worker.js
@@ -99,14 +99,25 @@ onfetch = function(ev) {
     ));
   }
 
+  else if (ev.request.url.includes('user-pass')) {
+    ev.respondWith(new Response(ev.request.url));
+  }
+
   else if (ev.request.url.includes("nonexistent_image.gif")) {
-      resolve(new Response(atob("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs"), {
+    var imageAsBinaryString = atob("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs");
+    var imageLength = imageAsBinaryString.length;
+
+    // If we just pass |imageAsBinaryString| to the Response constructor, an
+    // encoding conversion occurs that corrupts the image. Instead, we need to
+    // convert it to a typed array.
+    // typed array.
+    var imageAsArray = new Uint8Array(imageLength);
+    for (var i = 0; i < imageLength; ++i) {
+      imageAsArray[i] = imageAsBinaryString.charCodeAt(i);
+    }
+
     ev.respondWith(Promise.resolve(
-      new Response(atob("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs"), {
-        headers: {
-          "Content-Type": "image/gif"
-        }
-      })
+      new Response(imageAsArray, { headers: { "Content-Type": "image/gif" } })
     ));
   }
 
@@ -287,10 +298,15 @@ onfetch = function(ev) {
   }
 
   else if (ev.request.url.includes('fetchevent-request')) {
-    if ((new FetchEvent("foo")).request === null) {
-      ev.respondWith(new Response("nullable"));
-    } else {
-      ev.respondWith(Promise.reject());
+    var threw = false;
+    try {
+      new FetchEvent("foo");
+    } catch(e) {
+      if (e.name == "TypeError") {
+        threw = true;
+      }
+    } finally {
+      ev.respondWith(new Response(threw ? "non-nullable" : "nullable"));
     }
   }
 };
diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/serviceworkers/mochitest.ini
index 9a677b390a..698e45ae75 100644
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -134,8 +134,10 @@ support-files =
   notification_constructor_error.js
   notification_get_sw.js
   notification/register.html
+  notification/unregister.html
   notification/listener.html
   notification_alt/register.html
+  notification_alt/unregister.html
   sanitize/frame.html
   sanitize/register.html
   sanitize/example_check_and_unregister.html
@@ -155,7 +157,6 @@ support-files =
   claim_worker_2.js
   claim_clients/client.html
   claim_fetch_worker.js
-  app-protocol/*
   force_refresh_worker.js
   sw_clients/refresher.html
   sw_clients/refresher_compressed.html
@@ -193,8 +194,6 @@ support-files =
   redirect.sjs
   open_window/client.html
 
-[test_app_protocol.html]
-skip-if = release_build
 [test_bug1151916.html]
 [test_claim.html]
 [test_claim_fetch.html]
diff --git a/dom/workers/test/serviceworkers/notification/unregister.html b/dom/workers/test/serviceworkers/notification/unregister.html
new file mode 100644
index 0000000000..d5a141f830
--- /dev/null
+++ b/dom/workers/test/serviceworkers/notification/unregister.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script>
+  navigator.serviceWorker.getRegistration(".").then(function(registration) {
+    registration.unregister().then(function(success) {
+      if (success) {
+        window.parent.callback();
+      }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
+    });
+  });
+</script>
diff --git a/dom/workers/test/serviceworkers/notification_alt/unregister.html b/dom/workers/test/serviceworkers/notification_alt/unregister.html
new file mode 100644
index 0000000000..d5a141f830
--- /dev/null
+++ b/dom/workers/test/serviceworkers/notification_alt/unregister.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script>
+  navigator.serviceWorker.getRegistration(".").then(function(registration) {
+    registration.unregister().then(function(success) {
+      if (success) {
+        window.parent.callback();
+      }
+    }, function(e) {
+      dump("Unregistering the SW failed with " + e + "\n");
+    });
+  });
+</script>
diff --git a/dom/workers/test/serviceworkers/serviceworker.html b/dom/workers/test/serviceworkers/serviceworker.html
new file mode 100644
index 0000000000..11edd001a2
--- /dev/null
+++ b/dom/workers/test/serviceworkers/serviceworker.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script>
+       navigator.serviceWorker.register("worker.js");
+    </script>
+  </head>
+  <body>
+    This is a test page.
+  </body>
+<html>
diff --git a/dom/workers/test/serviceworkers/serviceworkerregistrationinfo_iframe.html b/dom/workers/test/serviceworkers/serviceworkerregistrationinfo_iframe.html
index e18af92d16..f093d38db4 100644
--- a/dom/workers/test/serviceworkers/serviceworkerregistrationinfo_iframe.html
+++ b/dom/workers/test/serviceworkers/serviceworkerregistrationinfo_iframe.html
@@ -3,18 +3,23 @@
   <head>
     <meta charset="utf-8">
     <script>
+      var reg;
       window.onmessage = function (event) {
         if (event.data !== "register") {
           return;
         }
         var promise = navigator.serviceWorker.register("worker.js");
         window.onmessage = function (event) {
-          if (event.data !== "register") {
-            return;
+          if (event.data === "register") {
+            promise.then(function (registration) {
+              return navigator.serviceWorker.register("worker2.js")
+                .then(function(registration) {
+                  reg = registration;
+                });
+            });
+          } else if (event.data === "unregister") {
+            reg.unregister();
           }
-          promise.then(function (registration) {
-            return navigator.serviceWorker.register("worker2.js");
-          });
         };
       };
     </script>
diff --git a/dom/workers/test/serviceworkers/test_aboutserviceworkers.html b/dom/workers/test/serviceworkers/test_aboutserviceworkers.html
deleted file mode 100644
index 2d0a01f45c..0000000000
--- a/dom/workers/test/serviceworkers/test_aboutserviceworkers.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1178233
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1178233</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript;version=1.7">
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "gServiceWorkerManager",
-                                   "@mozilla.org/serviceworkers/manager;1",
-                                   "nsIServiceWorkerManager");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gAppsService",
-                                   "@mozilla.org/AppsService;1",
-                                   "nsIAppsService");
-
-SimpleTest.waitForExplicitFinish();
-
-const gOrigin = 'http://test/chrome/dom/workers/test/serviceworkers/app2';
-const appManifestURL = gOrigin + '/manifest.webapp';
-let gApp;
-
-function uninstallApp() {
-  return new Promise((resolve, reject) => {
-    if (!gApp) {
-      return reject();
-    }
-    let req = navigator.mozApps.mgmt.uninstall(gApp);
-    req.onsuccess = resolve;
-    req.onerror = reject;
-  });
-}
-
-function update() {
-  return new Promise((resolve, reject) => {
-    let registrations = [];
-    registrations = gServiceWorkerManager.getAllRegistrations();
-
-    ok(registrations.length === 1, "The registration shows up in about:serviceworker page");
-
-    for (let i = 0; i < registrations.length; i++) {
-      let registration = registrations.queryElementAt(i, Ci.nsIServiceWorkerRegistrationInfo);
-      if (!registration) {
-        reject();
-        return;
-      }
-      info('Update service worker registration');
-      gServiceWorkerManager.propagateSoftUpdate(
-        registration.principal.originAttributes,
-        registration.scope
-      );
-    }
-    resolve();
-  });
-}
-
-function testApp() {
-  if (!gApp) {
-    ok(false, 'No test application to launch');
-    return Promise.reject();
-  }
-  return new Promise((resolve, reject) => {
-    let iframe = document.createElement('iframe');
-    let domParent = document.getElementById('container');
-    iframe.setAttribute('mozbrowser', 'true');
-    iframe.setAttribute('mozapp', gApp.manifestURL);
-    iframe.addEventListener('mozbrowsershowmodalprompt', function listener(e) {
-      let message = e.detail.message;
-      if (/OK/.exec(message)) {
-        ok(true, "Message from app: " + message);
-      } else if (/UPDATE/.exec(message)) {
-        ok(true, "Message from app: " + message);
-        update();
-      } else if (/KO/.exec(message)) {
-        ok(false, "Message from app: " + message);
-      } else if (/DONE/.exec(message)) {
-        ok(true, "Message from app: " + message);
-        iframe.src = "about:blank";
-        domParent.removeChild(iframe);
-        iframe = null;
-        resolve();
-      }
-    }, false);
-    domParent.appendChild(iframe);
-    ok(true, "origin " +  gOrigin + gApp.manifest.launch_path);
-    SpecialPowers.wrap(iframe.contentWindow).location =
-      gOrigin + gApp.manifest.launch_path;
-  });
-}
-
-function installApp() {
-  return new Promise((resolve, reject) => {
-    let req = navigator.mozApps.install(appManifestURL);
-    req.onsuccess = function() {
-      gApp = req.result;
-      is(req.result.manifestURL, appManifestURL, 'app installed');
-      if (req.result.installState == 'installed') {
-        is(req.result.installState, 'installed', 'app downloaded');
-        resolve()
-      } else {
-        req.result.ondownloadapplied = function() {
-          is(req.result.installState, 'installed', 'app downloaded');
-          resolve();
-        }
-      }
-    }
-    req.onerror = reject;
-  });
-}
-
-function setup() {
-  info('Setting up');
-  return new Promise((resolve, reject) => {
-    SpecialPowers.setAllAppsLaunchable(true);
-    SpecialPowers.pushPrefEnv({'set': [
-      ['dom.mozBrowserFramesEnabled', true],
-      ['dom.serviceWorkers.exemptFromPerDomainMax', true],
-      ['dom.serviceWorkers.enabled', true],
-      ['dom.serviceWorkers.testing.enabled', true],
-      ['dom.serviceWorkers.interception.enabled', true]
-    ]}, () => {
-      SpecialPowers.pushPermissions([
-        { 'type': 'webapps-manage', 'allow': 1, 'context': document },
-        { 'type': 'browser', 'allow': 1, 'context': document },
-        { 'type': 'embed-apps', 'allow': 1, 'context': document }
-      ], () => {
-        SpecialPowers.autoConfirmAppInstall(() => {
-          SpecialPowers.autoConfirmAppUninstall(resolve);
-        });
-      });
-    });
-  });
-}
-
-function go() {
-  setup()
-    .then(installApp)
-    .then(testApp)
-    .then(uninstallApp)
-    .then(SimpleTest.finish)
-    .catch(function(e) {
-      ok(false, 'Unexpected error ' + e);
-      SimpleTest.finish();
-    });
-}
-  </script>
-</head>
-<body onload="go()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1171917">Mozilla Bug 1178233</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-</pre>
-<div id="container"></div>
-</body>
-</html>
diff --git a/dom/workers/test/serviceworkers/test_app_installation.html b/dom/workers/test/serviceworkers/test_app_installation.html
deleted file mode 100644
index 17f99add04..0000000000
--- a/dom/workers/test/serviceworkers/test_app_installation.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id={1169249}
--->
-<head>
-  <title>Test for Bug {1169249}</title>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/chrome-harness.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={1169249}">Mozilla Bug {1169249}</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-<script class="testbody" type="application/javascript;version=1.7">
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "gServiceWorkerManager",
-                                   "@mozilla.org/serviceworkers/manager;1",
-                                   "nsIServiceWorkerManager");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gAppsService",
-                                   "@mozilla.org/AppsService;1",
-                                   "nsIAppsService");
-SimpleTest.waitForExplicitFinish();
-
-const gOrigin = 'http://test/chrome/dom/workers/test/serviceworkers/app';
-const appManifestURL = gOrigin + '/manifest.webapp';
-let gApp;
-
-addLoadEvent(go);
-
-function setup() {
-  info('Setting up');
-  return new Promise((resolve, reject) => {
-    SpecialPowers.setAllAppsLaunchable(true);
-    SpecialPowers.pushPrefEnv({'set': [
-      ['dom.mozBrowserFramesEnabled', true],
-      ['dom.serviceWorkers.exemptFromPerDomainMax', true],
-      ['dom.serviceWorkers.enabled', true],
-      ['dom.serviceWorkers.testing.enabled', true],
-      ['dom.serviceWorkers.interception.enabled', true],
-    ]}, () => {
-      SpecialPowers.pushPermissions([
-        { 'type': 'webapps-manage', 'allow': 1, 'context': document },
-        { 'type': 'browser', 'allow': 1, 'context': document },
-        { 'type': 'embed-apps', 'allow': 1, 'context': document }
-      ], () => {
-        SpecialPowers.autoConfirmAppInstall(() => {
-          SpecialPowers.autoConfirmAppUninstall(resolve);
-        });
-      });
-    });
-  });
-}
-
-function installApp() {
-  return new Promise((resolve, reject) => {
-    let req = navigator.mozApps.install(appManifestURL);
-    req.onsuccess = function() {
-      gApp = req.result;
-      is(req.result.manifestURL, appManifestURL, 'app installed');
-      if (req.result.installState == 'installed') {
-        is(req.result.installState, 'installed', 'app downloaded');
-        resolve()
-      } else {
-        req.result.ondownloadapplied = function() {
-          is(req.result.installState, 'installed', 'app downloaded');
-          resolve();
-        }
-      }
-    }
-    req.onerror = reject;
-  });
-}
-
-function checkSwRegistration(aExpectedRegistrations) {
-  return new Promise((resolve, reject) => {
-    let registrations = [];
-    registrations = gServiceWorkerManager.getAllRegistrations();
-    is(registrations.length, aExpectedRegistrations.length,
-       "There should be " + aExpectedRegistrations.length + " registrations");
-
-    for (let i = 0; i < registrations.length; i++) {
-      let registration = registrations.queryElementAt(i, Ci.nsIServiceWorkerRegistrationInfo);
-      if (!registration) {
-        reject();
-        return;
-      }
-      is(registration.principal.origin, aExpectedRegistrations[i].origin,
-         "Registration principal should be as expected");
-    }
-    resolve();
-  });
-}
-
-
-function launchApp() {
-  if (!gApp) {
-    ok(false, 'No test application to launch');
-    return Promise.reject();
-  }
-  return new Promise((resolve, reject) => {
-    let iframe = document.createElement('iframe');
-    iframe.setAttribute('mozbrowser', 'true');
-    iframe.setAttribute('mozapp', gApp.manifestURL);
-    iframe.addEventListener('mozbrowsershowmodalprompt', function listener(e) {
-      let message = e.detail.message;
-      if (/OK/.exec(message)) {
-        ok(true, "Message from app: " + message);
-      } else if (/READY/.exec(message)) {
-        ok(true, 'Message from app: ' + message);
-        resolve();
-      }
-    }, false);
-    let domParent = document.getElementById('container');
-    domParent.appendChild(iframe);
-    ok(true, "origin " +  gOrigin + gApp.manifest.launch_path);
-    SpecialPowers.wrap(iframe.contentWindow).location =
-      gOrigin + gApp.manifest.launch_path;
-  });
-}
-
-function uninstallApp() {
-  return new Promise((resolve, reject) => {
-    if (!gApp) {
-      return reject();
-    }
-    let req = navigator.mozApps.mgmt.uninstall(gApp);
-    req.onsuccess = resolve;
-    req.onerror = reject;
-  });
-}
-
-function go() {
-  setup()
-    .then(installApp)
-    .then(launchApp)
-    .then(() => {
-      app = gAppsService.getAppByManifestURL(gApp.manifestURL);
-      return checkSwRegistration([{
-        origin: app.principal.origin
-      }]);
-    })
-    .then(uninstallApp)
-    .then(() => {
-      return checkSwRegistration([]);
-    })
-    .then(SimpleTest.finish)
-    .catch((e) => {
-      ok(false, 'Unexpected error ' + e);
-      SimpleTest.finish();
-    });
-}
-</script>
-</pre>
-<div id="container"></div>
-</body>
-</html>
diff --git a/dom/workers/test/serviceworkers/test_eval_allowed.html b/dom/workers/test/serviceworkers/test_eval_allowed.html
index feea8047eb..25125d31de 100644
--- a/dom/workers/test/serviceworkers/test_eval_allowed.html
+++ b/dom/workers/test/serviceworkers/test_eval_allowed.html
@@ -29,8 +29,10 @@
     register()
       .then(function(swr) {
         ok(true, "eval restriction didn't get inherited");
-        swr.unregister();
-        SimpleTest.finish();
+        swr.unregister()
+          .then(function() {
+            SimpleTest.finish();
+          });
       }).catch(function(e) {
         ok(false, "Some test failed with error " + e);
         SimpleTest.finish();
diff --git a/dom/workers/test/serviceworkers/test_notification_get.html b/dom/workers/test/serviceworkers/test_notification_get.html
index 0a45240cff..822843c124 100644
--- a/dom/workers/test/serviceworkers/test_notification_get.html
+++ b/dom/workers/test/serviceworkers/test_notification_get.html
@@ -37,6 +37,12 @@
     });
   }
 
+  function unregisterSW() {
+    return testFrame('notification/unregister.html').then(function() {
+      ok(true, "Unregistered service worker.");
+    });
+  }
+
   // To check that the scope is respected when retrieving notifications.
   function registerAlternateSWAndAddNotification() {
     return testFrame('notification_alt/register.html').then(function() {
@@ -47,6 +53,12 @@
     });
   }
 
+  function unregisterAlternateSWAndAddNotification() {
+    return testFrame('notification_alt/unregister.html').then(function() {
+      ok(true, "unregistered alternate service worker.");
+    });
+  }
+
   function testGet() {
     // Non persistent notifications will not show up in getNotification().
     var n = new Notification("Scope does not match");
@@ -86,7 +98,7 @@
         is(notifications.length, 0, "There should be no more stored notifications");
       }).catch(function(e) {
         ok(false, "Something went wrong " + e.message);
-      });
+      }).then(unregisterAlternateSWAndAddNotification);
   }
 
   function testGetWorker() {
@@ -155,6 +167,7 @@
       .then(testGetWorker)
       .then(testGetServiceWorker)
       .then(testAcrossThreads)
+      .then(unregisterSW)
       .then(function() {
         MockServices.unregister();
         SimpleTest.finish();
diff --git a/dom/workers/test/serviceworkers/test_notificationclick.html b/dom/workers/test/serviceworkers/test_notificationclick.html
index b55cec2b7d..02feefb3c9 100644
--- a/dom/workers/test/serviceworkers/test_notificationclick.html
+++ b/dom/workers/test/serviceworkers/test_notificationclick.html
@@ -29,15 +29,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=916893
       iframe = null;
       ok(result, "Got notificationclick event with correct data.");
       MockServices.unregister();
-      SimpleTest.finish();
+      registration.unregister().then(function() {
+        SimpleTest.finish();
+      });
     };
     document.body.appendChild(iframe);
   }
 
+  var registration;
+
   function runTest() {
     MockServices.register();
     testFrame('notificationclick.html');
     navigator.serviceWorker.register("notificationclick.js", { scope: "notificationclick.html" }).then(function(reg) {
+      registration = reg;
     }, function(e) {
       ok(false, "registration should have passed!");
     });
diff --git a/dom/workers/test/serviceworkers/test_notificationclick_focus.html b/dom/workers/test/serviceworkers/test_notificationclick_focus.html
index ed0d273a4a..81d6e269c3 100644
--- a/dom/workers/test/serviceworkers/test_notificationclick_focus.html
+++ b/dom/workers/test/serviceworkers/test_notificationclick_focus.html
@@ -29,15 +29,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=916893
       iframe = null;
       ok(result, "All tests passed.");
       MockServices.unregister();
-      SimpleTest.finish();
+      registration.unregister().then(function() {
+        SimpleTest.finish();
+      });
     };
     document.body.appendChild(iframe);
   }
 
+  var registration;
+
   function runTest() {
     MockServices.register();
     testFrame('notificationclick_focus.html');
     navigator.serviceWorker.register("notificationclick_focus.js", { scope: "notificationclick_focus.html" }).then(function(reg) {
+      registration = reg;
     }, function(e) {
       ok(false, "registration should have passed!");
     });
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
index 676f3f5dd5..4ab9880413 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
+++ b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
@@ -122,6 +122,8 @@ var interfaceNamesInGlobalScope =
     "Headers",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "IDBCursor",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    "IDBCursorWithValue",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "IDBDatabase",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -212,7 +214,7 @@ var interfaceNamesInGlobalScope =
   ];
 // IMPORTANT: Do not change the list above without review from a DOM peer!
 
-function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
+function createInterfaceMap(permissionMap, version, userAgent, isB2G) {
   var isNightly = version.endsWith("a1");
   var isRelease = !version.includes("a");
   var isDesktop = !/Mobile|Tablet/.test(userAgent);
@@ -225,16 +227,18 @@ function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
     for (var entry of interfaces) {
       if (typeof(entry) === "string") {
         interfaceMap[entry] = true;
-      } else if ((entry.nightly === !isNightly) ||
-                 (entry.desktop === !isDesktop) ||
-                 (entry.android === !isAndroid) ||
-                 (entry.b2g === !isB2G) ||
-                 (entry.release === !isRelease) ||
-                 (entry.pref && !prefMap[entry.pref])  ||
-                 (entry.permission && !permissionMap[entry.permission])) {
-        interfaceMap[entry.name] = false;
       } else {
-        interfaceMap[entry.name] = true;
+        ok(!("pref" in entry), "Bogus pref annotation for " + entry.name);
+        if ((entry.nightly === !isNightly) ||
+            (entry.desktop === !isDesktop) ||
+            (entry.android === !isAndroid) ||
+            (entry.b2g === !isB2G) ||
+            (entry.release === !isRelease) ||
+            (entry.permission && !permissionMap[entry.permission])) {
+          interfaceMap[entry.name] = false;
+        } else {
+          interfaceMap[entry.name] = true;
+        }
       }
     }
   }
@@ -245,8 +249,8 @@ function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
   return interfaceMap;
 }
 
-function runTest(prefMap, permissionMap, version, userAgent, isB2G) {
-  var interfaceMap = createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G);
+function runTest(permissionMap, version, userAgent, isB2G) {
+  var interfaceMap = createInterfaceMap(permissionMap, version, userAgent, isB2G);
   for (var name of Object.getOwnPropertyNames(self)) {
     // An interface name should start with an upper case character.
     if (!/^[A-Z]/.test(name)) {
@@ -269,18 +273,6 @@ function runTest(prefMap, permissionMap, version, userAgent, isB2G) {
      "The following interface(s) are not enumerated: " + Object.keys(interfaceMap).join(", "));
 }
 
-function appendPrefs(prefs, interfaces) {
-  for (var entry of interfaces) {
-    if (entry.pref !== undefined && prefs.indexOf(entry.pref) === -1) {
-      prefs.push(entry.pref);
-    }
-  }
-}
-
-var prefs = [];
-appendPrefs(prefs, ecmaGlobals);
-appendPrefs(prefs, interfaceNamesInGlobalScope);
-
 function appendPermissions(permissions, interfaces) {
   for (var entry of interfaces) {
     if (entry.permission !== undefined &&
@@ -294,14 +286,12 @@ var permissions = [];
 appendPermissions(permissions, ecmaGlobals);
 appendPermissions(permissions, interfaceNamesInGlobalScope);
 
-workerTestGetPrefs(prefs, function(prefMap) {
-  workerTestGetPermissions(permissions, function(permissionMap) {
-    workerTestGetVersion(function(version) {
-      workerTestGetUserAgent(function(userAgent) {
-        workerTestGetIsB2G(function(isB2G) {
-          runTest(prefMap, permissionMap, version, userAgent, isB2G);
-          workerTestDone();
-	});
+workerTestGetPermissions(permissions, function(permissionMap) {
+  workerTestGetVersion(function(version) {
+    workerTestGetUserAgent(function(userAgent) {
+      workerTestGetIsB2G(function(isB2G) {
+        runTest(permissionMap, version, userAgent, isB2G);
+        workerTestDone();
       });
     });
   });
diff --git a/dom/workers/test/serviceworkers/test_serviceworkerregistrationinfo.xul b/dom/workers/test/serviceworkers/test_serviceworkerregistrationinfo.xul
index f46657215a..0c63a3b2cd 100644
--- a/dom/workers/test/serviceworkers/test_serviceworkerregistrationinfo.xul
+++ b/dom/workers/test/serviceworkers/test_serviceworkerregistrationinfo.xul
@@ -99,6 +99,9 @@
           iframe.contentWindow.postMessage("register", "*");
           yield promise;
 
+          iframe.contentWindow.postMessage("unregister", "*");
+          yield waitForUnregister(EXAMPLE_URL);
+
           SimpleTest.finish();
         });
       });
diff --git a/dom/workers/test/serviceworkers/test_strict_mode_warning.html b/dom/workers/test/serviceworkers/test_strict_mode_warning.html
index 173bbe8b86..025fc089e0 100644
--- a/dom/workers/test/serviceworkers/test_strict_mode_warning.html
+++ b/dom/workers/test/serviceworkers/test_strict_mode_warning.html
@@ -19,8 +19,11 @@
   function runTest() {
     navigator.serviceWorker
       .register("strict_mode_warning.js", {scope: "strict_mode_warning"})
-      .then(() => {
+      .then((reg) => {
         ok(true, "Registration should not fail for warnings");
+        return reg.unregister();
+      })
+      .then(() => {
         SimpleTest.finish();
       });
   }
diff --git a/dom/workers/test/serviceworkers/test_third_party_iframes.html b/dom/workers/test/serviceworkers/test_third_party_iframes.html
index a4cbf04d67..7c20a1f185 100644
--- a/dom/workers/test/serviceworkers/test_third_party_iframes.html
+++ b/dom/workers/test/serviceworkers/test_third_party_iframes.html
@@ -94,7 +94,7 @@ function testShouldIntercept(done) {
   }, {
     status: "swresponse",
     next: function() {
-      iframe.src = origin + basePath + "unregister.html";
+      iframe.src = thirdPartyOrigin + basePath + "unregister.html";
     }
   }, {
     status: "unregistrationdone",
@@ -121,7 +121,7 @@ function testShouldNotIntercept(done) {
   }, {
     status: "networkresponse",
     next: function() {
-      iframe.src = origin + basePath + "unregister.html";
+      iframe.src = thirdPartyOrigin + basePath + "unregister.html";
     }
   }, {
     status: "unregistrationdone",
diff --git a/dom/workers/test/serviceworkers/test_workerUpdate.html b/dom/workers/test/serviceworkers/test_workerUpdate.html
index a27e9cad61..7cfbde08f5 100644
--- a/dom/workers/test/serviceworkers/test_workerUpdate.html
+++ b/dom/workers/test/serviceworkers/test_workerUpdate.html
@@ -17,7 +17,9 @@
     return navigator.serviceWorker.register("worker_update.js", { scope: "workerUpdate/" });
   }
 
+  var registration;
   function waitForMessages(sw) {
+    registration = sw;
     var p = new Promise(function(resolve, reject) {
       window.onmessage = function(e) {
         if (e.data === "FINISH") {
@@ -40,6 +42,8 @@
   function runTest() {
     simpleRegister().then(waitForMessages).catch(function(e) {
       ok(false, "Something went wrong.");
+    }).then(function() {
+      return registration.unregister();
     }).then(function() {
       SimpleTest.finish();
     });
diff --git a/dom/workers/test/serviceworkers/thirdparty/unregister.html b/dom/workers/test/serviceworkers/thirdparty/unregister.html
index a054f3bd2c..2cb6ee0ce9 100644
--- a/dom/workers/test/serviceworkers/thirdparty/unregister.html
+++ b/dom/workers/test/serviceworkers/thirdparty/unregister.html
@@ -2,7 +2,6 @@
 <script>
   navigator.serviceWorker.getRegistration(".").then(function(registration) {
     if(!registration) {
-      window.parent.postMessage({status: "unregistrationdone"}, "*");
       return;
     }
     registration.unregister().then(() => {
diff --git a/dom/workers/test/test_worker_interfaces.js b/dom/workers/test/test_worker_interfaces.js
index c0f445697f..b3892dd2b8 100644
--- a/dom/workers/test/test_worker_interfaces.js
+++ b/dom/workers/test/test_worker_interfaces.js
@@ -81,9 +81,9 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "BroadcastChannel",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "Cache", release: false},
+    "Cache",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "CacheStorage", release: false},
+    "CacheStorage",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "DedicatedWorkerGlobalScope",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -114,6 +114,8 @@ var interfaceNamesInGlobalScope =
     "Headers",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "IDBCursor",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    "IDBCursorWithValue",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "IDBDatabase",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -167,7 +169,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Response",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "ServiceWorkerRegistration", b2g: false, android: false },
+    { name: "ServiceWorkerRegistration", b2g: false, releaseAndroid: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextDecoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -216,7 +218,7 @@ var interfaceNamesInGlobalScope =
   ];
 // IMPORTANT: Do not change the list above without review from a DOM peer!
 
-function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
+function createInterfaceMap(permissionMap, version, userAgent, isB2G) {
   var isNightly = version.endsWith("a1");
   var isRelease = !version.includes("a");
   var isDesktop = !/Mobile|Tablet/.test(userAgent);
@@ -229,17 +231,20 @@ function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
     for (var entry of interfaces) {
       if (typeof(entry) === "string") {
         interfaceMap[entry] = true;
-      } else if ((entry.nightly === !isNightly) ||
-                 (entry.desktop === !isDesktop) ||
-                 (entry.android === !isAndroid) ||
-                 (entry.b2g === !isB2G) ||
-                 (entry.release === !isRelease) ||
-                 (entry.pref && !prefMap[entry.pref])  ||
-                 (entry.permission && !permissionMap[entry.permission]) ||
-                 entry.disabled) {
-        interfaceMap[entry.name] = false;
       } else {
-        interfaceMap[entry.name] = true;
+        ok(!("pref" in entry), "Bogus pref annotation for " + entry.name);
+        if ((entry.nightly === !isNightly) ||
+            (entry.desktop === !isDesktop) ||
+            (entry.android === !isAndroid) ||
+            (entry.b2g === !isB2G) ||
+            (entry.release === !isRelease) ||
+            (entry.releaseAndroid === !(isAndroid && isRelease)) ||
+            (entry.permission && !permissionMap[entry.permission]) ||
+            entry.disabled) {
+          interfaceMap[entry.name] = false;
+        } else {
+          interfaceMap[entry.name] = true;
+        }
       }
     }
   }
@@ -250,8 +255,8 @@ function createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G) {
   return interfaceMap;
 }
 
-function runTest(prefMap, permissionMap, version, userAgent, isB2G) {
-  var interfaceMap = createInterfaceMap(prefMap, permissionMap, version, userAgent, isB2G);
+function runTest(permissionMap, version, userAgent, isB2G) {
+  var interfaceMap = createInterfaceMap(permissionMap, version, userAgent, isB2G);
   for (var name of Object.getOwnPropertyNames(self)) {
     // An interface name should start with an upper case character.
     if (!/^[A-Z]/.test(name)) {
@@ -274,18 +279,6 @@ function runTest(prefMap, permissionMap, version, userAgent, isB2G) {
      "The following interface(s) are not enumerated: " + Object.keys(interfaceMap).join(", "));
 }
 
-function appendPrefs(prefs, interfaces) {
-  for (var entry of interfaces) {
-    if (entry.pref !== undefined && prefs.indexOf(entry.pref) === -1) {
-      prefs.push(entry.pref);
-    }
-  }
-}
-
-var prefs = [];
-appendPrefs(prefs, ecmaGlobals);
-appendPrefs(prefs, interfaceNamesInGlobalScope);
-
 function appendPermissions(permissions, interfaces) {
   for (var entry of interfaces) {
     if (entry.permission !== undefined &&
@@ -299,14 +292,12 @@ var permissions = [];
 appendPermissions(permissions, ecmaGlobals);
 appendPermissions(permissions, interfaceNamesInGlobalScope);
 
-workerTestGetPrefs(prefs, function(prefMap) {
-  workerTestGetPermissions(permissions, function(permissionMap) {
-    workerTestGetVersion(function(version) {
-      workerTestGetUserAgent(function(userAgent) {
-        workerTestGetIsB2G(function(isB2G) {
-          runTest(prefMap, permissionMap, version, userAgent, isB2G);
-          workerTestDone();
-	});
+workerTestGetPermissions(permissions, function(permissionMap) {
+  workerTestGetVersion(function(version) {
+    workerTestGetUserAgent(function(userAgent) {
+      workerTestGetIsB2G(function(isB2G) {
+        runTest(permissionMap, version, userAgent, isB2G);
+        workerTestDone();
       });
     });
   });
diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp
index 2280fc388d..b858a6e273 100644
--- a/dom/xul/nsXULElement.cpp
+++ b/dom/xul/nsXULElement.cpp
@@ -52,7 +52,6 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIServiceManager.h"
 #include "mozilla/css/StyleRule.h"
-#include "nsIStyleSheet.h"
 #include "nsIURL.h"
 #include "nsViewManager.h"
 #include "nsIWidget.h"
diff --git a/editor/libeditor/nsStyleSheetTxns.cpp b/editor/libeditor/nsStyleSheetTxns.cpp
index b46cb41c6d..a7b2325ae8 100644
--- a/editor/libeditor/nsStyleSheetTxns.cpp
+++ b/editor/libeditor/nsStyleSheetTxns.cpp
@@ -19,10 +19,8 @@
 
 using namespace mozilla;
 
-class nsIStyleSheet;
-
 static void
-AddStyleSheet(nsIEditor* aEditor, nsIStyleSheet* aSheet)
+AddStyleSheet(nsIEditor* aEditor, CSSStyleSheet* aSheet)
 {
   nsCOMPtr<nsIDOMDocument> domDoc;
   aEditor->GetDocument(getter_AddRefs(domDoc));
@@ -35,7 +33,7 @@ AddStyleSheet(nsIEditor* aEditor, nsIStyleSheet* aSheet)
 }
 
 static void
-RemoveStyleSheet(nsIEditor *aEditor, nsIStyleSheet *aSheet)
+RemoveStyleSheet(nsIEditor* aEditor, CSSStyleSheet* aSheet)
 {
   nsCOMPtr<nsIDOMDocument> domDoc;
   aEditor->GetDocument(getter_AddRefs(domDoc));
diff --git a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
index 5038a3b121..3488e9fad3 100644
--- a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
+++ b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
@@ -3471,7 +3471,7 @@ nsWebBrowserPersist::FixupAnchor(nsIDOMNode *aNode)
 }
 
 nsresult
-nsWebBrowserPersist::StoreAndFixupStyleSheet(nsIStyleSheet *aStyleSheet)
+nsWebBrowserPersist::StoreAndFixupStyleSheet(mozilla::CSSStyleSheet *aStyleSheet)
 {
     // TODO go through the style sheet fixing up all links
     return NS_OK;
diff --git a/embedding/components/webbrowserpersist/nsWebBrowserPersist.h b/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
index f05de1767a..f2a091e245 100644
--- a/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
+++ b/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
@@ -16,13 +16,13 @@
 #include "nsIOutputStream.h"
 #include "nsIInputStream.h"
 #include "nsIChannel.h"
-#include "nsIStyleSheet.h"
 #include "nsIDocumentEncoder.h"
 #include "nsITransport.h"
 #include "nsIProgressEventSink.h"
 #include "nsIFile.h"
 #include "nsIWebProgressListener2.h"
 
+#include "mozilla/CSSStyleSheet.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
@@ -136,7 +136,7 @@ private:
     nsresult FixupXMLStyleSheetLink(nsIDOMProcessingInstruction *aPI, const nsAString &aHref);
     nsresult GetXMLStyleSheetLink(nsIDOMProcessingInstruction *aPI, nsAString &aHref);
 
-    nsresult StoreAndFixupStyleSheet(nsIStyleSheet *aStyleSheet);
+    nsresult StoreAndFixupStyleSheet(mozilla::CSSStyleSheet *aStyleSheet);
     nsresult SaveDocumentWithFixup(
         nsIDOMDocument *pDocument,
         nsIURI *aFile, bool aReplaceExisting, const nsACString &aFormatType,
diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp
index 52d17e560d..e87496bb25 100644
--- a/hal/gonk/GonkHal.cpp
+++ b/hal/gonk/GonkHal.cpp
@@ -627,27 +627,6 @@ GetCurrentBatteryInformation(hal::BatteryInformation* aBatteryInfo)
 
 namespace {
 
-/**
- * RAII class to help us remember to close file descriptors.
- */
-
-bool WriteToFile(const char *filename, const char *toWrite)
-{
-  int fd = open(filename, O_WRONLY);
-  ScopedClose autoClose(fd);
-  if (fd < 0) {
-    HAL_LOG("Unable to open file %s.", filename);
-    return false;
-  }
-
-  if (write(fd, toWrite, strlen(toWrite)) < 0) {
-    HAL_LOG("Unable to write to file %s.", filename);
-    return false;
-  }
-
-  return true;
-}
-
 // We can write to screenEnabledFilename to enable/disable the screen, but when
 // we read, we always get "mem"!  So we have to keep track ourselves whether
 // the screen is on or not.
@@ -760,7 +739,7 @@ UpdateCpuSleepState()
 
   sInternalLockCpuMonitor->AssertCurrentThreadOwns();
   bool allowed = sCpuSleepAllowed && !sInternalLockCpuCount;
-  WriteToFile(allowed ? wakeUnlockFilename : wakeLockFilename, "gecko");
+  WriteSysFile(allowed ? wakeUnlockFilename : wakeLockFilename, "gecko");
 }
 
 static void
@@ -1168,7 +1147,7 @@ public:
       mRegexes(nullptr)
   {
     // Enable timestamps in kernel's printk
-    WriteToFile("/sys/module/printk/parameters/time", "Y");
+    WriteSysFile("/sys/module/printk/parameters/time", "Y");
   }
 
   NS_DECL_ISUPPORTS
@@ -1466,16 +1445,16 @@ EnsureCpuCGroupExists(const nsACString &aGroup)
 
   nsAutoCString pathPrefix(kDevCpuCtl + aGroup + kSlash);
   nsAutoCString cpuSharesPath(pathPrefix + NS_LITERAL_CSTRING("cpu.shares"));
-  if (cpuShares && !WriteToFile(cpuSharesPath.get(),
-                                nsPrintfCString("%d", cpuShares).get())) {
+  if (cpuShares && !WriteSysFile(cpuSharesPath.get(),
+                                 nsPrintfCString("%d", cpuShares).get())) {
     HAL_LOG("Could not set the cpu share for group %s", cpuSharesPath.get());
     return false;
   }
 
   nsAutoCString notifyOnMigratePath(pathPrefix
     + NS_LITERAL_CSTRING("cpu.notify_on_migrate"));
-  if (!WriteToFile(notifyOnMigratePath.get(),
-                   nsPrintfCString("%d", cpuNotifyOnMigrate).get())) {
+  if (!WriteSysFile(notifyOnMigratePath.get(),
+                    nsPrintfCString("%d", cpuNotifyOnMigrate).get())) {
     HAL_LOG("Could not set the cpu migration notification flag for group %s",
             notifyOnMigratePath.get());
     return false;
@@ -1523,8 +1502,8 @@ EnsureMemCGroupExists(const nsACString &aGroup)
 
   nsAutoCString pathPrefix(kMemCtl + aGroup + kSlash);
   nsAutoCString memSwappinessPath(pathPrefix + NS_LITERAL_CSTRING("memory.swappiness"));
-  if (!WriteToFile(memSwappinessPath.get(),
-                   nsPrintfCString("%d", memSwappiness).get())) {
+  if (!WriteSysFile(memSwappinessPath.get(),
+                    nsPrintfCString("%d", memSwappiness).get())) {
     HAL_LOG("Could not set the memory.swappiness for group %s", memSwappinessPath.get());
     return false;
   }
@@ -1712,9 +1691,9 @@ EnsureKernelLowMemKillerParamsSet()
   adjParams.Cut(adjParams.Length() - 1, 1);
   minfreeParams.Cut(minfreeParams.Length() - 1, 1);
   if (!adjParams.IsEmpty() && !minfreeParams.IsEmpty()) {
-    WriteToFile("/sys/module/lowmemorykiller/parameters/adj", adjParams.get());
-    WriteToFile("/sys/module/lowmemorykiller/parameters/minfree",
-                minfreeParams.get());
+    WriteSysFile("/sys/module/lowmemorykiller/parameters/adj", adjParams.get());
+    WriteSysFile("/sys/module/lowmemorykiller/parameters/minfree",
+                 minfreeParams.get());
   }
 
   // Set the low-memory-notification threshold.
@@ -1724,7 +1703,7 @@ EnsureKernelLowMemKillerParamsSet()
         &lowMemNotifyThresholdKB))) {
 
     // notify_trigger is in pages.
-    WriteToFile("/sys/module/lowmemorykiller/parameters/notify_trigger",
+    WriteSysFile("/sys/module/lowmemorykiller/parameters/notify_trigger",
       nsPrintfCString("%ld", lowMemNotifyThresholdKB * 1024 / page_size).get());
   }
 
@@ -1759,11 +1738,11 @@ SetProcessPriority(int aPid, ProcessPriority aPriority, uint32_t aLRU)
 
   // We try the newer interface first, and fall back to the older interface
   // on failure.
-  if (!WriteToFile(nsPrintfCString("/proc/%d/oom_score_adj", aPid).get(),
-                   nsPrintfCString("%d", oomScoreAdj).get()))
+  if (!WriteSysFile(nsPrintfCString("/proc/%d/oom_score_adj", aPid).get(),
+                    nsPrintfCString("%d", oomScoreAdj).get()))
   {
-    WriteToFile(nsPrintfCString("/proc/%d/oom_adj", aPid).get(),
-                nsPrintfCString("%d", OomAdjOfOomScoreAdj(oomScoreAdj)).get());
+    WriteSysFile(nsPrintfCString("/proc/%d/oom_adj", aPid).get(),
+                 nsPrintfCString("%d", OomAdjOfOomScoreAdj(oomScoreAdj)).get());
   }
 
   HAL_LOG("Assigning pid %d to cgroup %s", aPid, pc->CGroup().get());
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 879a75f349..820c5fbe47 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -403,13 +403,18 @@ InitGlobalObjectOptions(JS::CompartmentOptions& aOptions,
     if (shouldDiscardSystemSource || extraWarningsForSystemJS)
         isSystem = nsContentUtils::IsSystemPrincipal(aPrincipal);
 
+    short status = aPrincipal->GetAppStatus();
+
+    // Enable the ECMA-402 experimental formatToParts in certified apps.
+    if (status == nsIPrincipal::APP_STATUS_CERTIFIED) {
+        aOptions.creationOptions()
+                .setExperimentalDateTimeFormatFormatToPartsEnabled(true);
+    }
+
     if (shouldDiscardSystemSource) {
-        bool discardSource = isSystem;
-        if (!discardSource) {
-            short status = aPrincipal->GetAppStatus();
-            discardSource = status == nsIPrincipal::APP_STATUS_PRIVILEGED ||
-                            status == nsIPrincipal::APP_STATUS_CERTIFIED;
-        }
+        bool discardSource = isSystem ||
+                             (status == nsIPrincipal::APP_STATUS_PRIVILEGED ||
+                              status == nsIPrincipal::APP_STATUS_CERTIFIED);
 
         aOptions.behaviors().setDiscardSource(discardSource);
     }
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 3d92c882e1..7637fa9050 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2250,22 +2250,6 @@ nsDocumentViewer::RequestWindowClose(bool* aCanClose)
   return NS_OK;
 }
 
-static bool
-AppendAgentSheet(nsIStyleSheet *aSheet, void *aData)
-{
-  nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
-  styleSet->AppendStyleSheet(SheetType::Agent, aSheet);
-  return true;
-}
-
-static bool
-PrependUserSheet(nsIStyleSheet *aSheet, void *aData)
-{
-  nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
-  styleSet->PrependStyleSheet(SheetType::User, aSheet);
-  return true;
-}
-
 nsresult
 nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument,
                                    nsStyleSet** aStyleSet)
@@ -2429,12 +2413,14 @@ nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument,
     }
   }
 
-  nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance();
+  nsStyleSheetService* sheetService = nsStyleSheetService::GetInstance();
   if (sheetService) {
-    sheetService->AgentStyleSheets()->EnumerateForwards(AppendAgentSheet,
-                                                        styleSet);
-    sheetService->UserStyleSheets()->EnumerateBackwards(PrependUserSheet,
-                                                        styleSet);
+    for (CSSStyleSheet* sheet : *sheetService->AgentStyleSheets()) {
+      styleSet->AppendStyleSheet(SheetType::Agent, sheet);
+    }
+    for (CSSStyleSheet* sheet : Reversed(*sheetService->UserStyleSheets())) {
+      styleSet->PrependStyleSheet(SheetType::User, sheet);
+    }
   }
 
   // Caller will handle calling EndUpdate, per contract.
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 505a35f7bf..f4774ceb81 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -61,13 +61,13 @@ class nsAString;
 class nsCaret;
 namespace mozilla {
 class AccessibleCaretEventHub;
+class CSSStyleSheet;
 } // namespace mozilla
 class nsFrameSelection;
 class nsFrameManager;
 class nsILayoutHistoryState;
 class nsIReflowCallback;
 class nsIDOMNode;
-class nsIStyleSheet;
 class nsCSSFrameConstructor;
 class nsISelection;
 template<class E> class nsCOMArray;
@@ -930,22 +930,24 @@ public:
   /**
    * Get the set of agent style sheets for this presentation
    */
-  virtual nsresult GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets) = 0;
+  virtual nsresult GetAgentStyleSheets(
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets) = 0;
 
   /**
    * Replace the set of agent style sheets
    */
-  virtual nsresult SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets) = 0;
+  virtual nsresult SetAgentStyleSheets(
+      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets) = 0;
 
   /**
    * Add an override style sheet for this presentation
    */
-  virtual nsresult AddOverrideStyleSheet(nsIStyleSheet *aSheet) = 0;
+  virtual nsresult AddOverrideStyleSheet(mozilla::CSSStyleSheet* aSheet) = 0;
 
   /**
    * Remove an override style sheet
    */
-  virtual nsresult RemoveOverrideStyleSheet(nsIStyleSheet *aSheet) = 0;
+  virtual nsresult RemoveOverrideStyleSheet(mozilla::CSSStyleSheet* aSheet) = 0;
 
   /**
    * Reconstruct frames for all elements in the document
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index ccc9c1e22d..040a6d3ca1 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1398,19 +1398,18 @@ PresShell::AddUserSheet(nsISupports* aSheet)
 
   mStyleSet->BeginUpdate();
 
-  nsStyleSheetService *sheetService = nsStyleSheetService::gInstance;
-  nsCOMArray<nsIStyleSheet> & userSheets = *sheetService->UserStyleSheets();
-  int32_t i;
+  nsStyleSheetService* sheetService = nsStyleSheetService::gInstance;
+  nsTArray<RefPtr<CSSStyleSheet>>& userSheets = *sheetService->UserStyleSheets();
   // Iterate forwards when removing so the searches for RemoveStyleSheet are as
   // short as possible.
-  for (i = 0; i < userSheets.Count(); ++i) {
-    mStyleSet->RemoveStyleSheet(SheetType::User, userSheets[i]);
+  for (CSSStyleSheet* sheet : userSheets) {
+    mStyleSet->RemoveStyleSheet(SheetType::User, sheet);
   }
 
   // Now iterate backwards, so that the order of userSheets will be the same as
   // the order of sheets from it in the style set.
-  for (i = userSheets.Count() - 1; i >= 0; --i) {
-    mStyleSet->PrependStyleSheet(SheetType::User, userSheets[i]);
+  for (CSSStyleSheet* sheet : Reversed(userSheets)) {
+    mStyleSet->PrependStyleSheet(SheetType::User, sheet);
   }
 
   mStyleSet->EndUpdate();
@@ -1423,7 +1422,7 @@ PresShell::AddAgentSheet(nsISupports* aSheet)
 {
   // Make sure this does what nsDocumentViewer::CreateStyleSet does
   // wrt ordering.
-  nsCOMPtr<nsIStyleSheet> sheet = do_QueryInterface(aSheet);
+  RefPtr<CSSStyleSheet> sheet = do_QueryObject(aSheet);
   if (!sheet) {
     return;
   }
@@ -1435,14 +1434,14 @@ PresShell::AddAgentSheet(nsISupports* aSheet)
 void
 PresShell::AddAuthorSheet(nsISupports* aSheet)
 {
-  nsCOMPtr<nsIStyleSheet> sheet = do_QueryInterface(aSheet);
+  RefPtr<CSSStyleSheet> sheet = do_QueryObject(aSheet);
   if (!sheet) {
     return;
   }
 
   // Document specific "additional" Author sheets should be stronger than the ones
   // added with the StyleSheetService.
-  nsIStyleSheet* firstAuthorSheet = mDocument->FirstAdditionalAuthorSheet();
+  CSSStyleSheet* firstAuthorSheet = mDocument->FirstAdditionalAuthorSheet();
   if (firstAuthorSheet) {
     mStyleSet->InsertStyleSheetBefore(SheetType::Doc, sheet, firstAuthorSheet);
   } else {
@@ -1455,7 +1454,7 @@ PresShell::AddAuthorSheet(nsISupports* aSheet)
 void
 PresShell::RemoveSheet(SheetType aType, nsISupports* aSheet)
 {
-  nsCOMPtr<nsIStyleSheet> sheet = do_QueryInterface(aSheet);
+  RefPtr<CSSStyleSheet> sheet = do_QueryObject(aSheet);
   if (!sheet) {
     return;
   }
@@ -4405,7 +4404,7 @@ nsIPresShell::ReconstructStyleDataExternal()
 }
 
 void
-PresShell::RecordStyleSheetChange(nsIStyleSheet* aStyleSheet)
+PresShell::RecordStyleSheetChange(CSSStyleSheet* aStyleSheet)
 {
   // too bad we can't check that the update is UPDATE_STYLE
   NS_ASSERTION(mUpdateCount != 0, "must be in an update");
@@ -4426,7 +4425,7 @@ PresShell::RecordStyleSheetChange(nsIStyleSheet* aStyleSheet)
 }
 
 void
-PresShell::StyleSheetAdded(nsIStyleSheet* aStyleSheet,
+PresShell::StyleSheetAdded(CSSStyleSheet* aStyleSheet,
                            bool aDocumentSheet)
 {
   // We only care when enabled sheets are added
@@ -4438,7 +4437,7 @@ PresShell::StyleSheetAdded(nsIStyleSheet* aStyleSheet,
 }
 
 void
-PresShell::StyleSheetRemoved(nsIStyleSheet* aStyleSheet,
+PresShell::StyleSheetRemoved(CSSStyleSheet* aStyleSheet,
                              bool aDocumentSheet)
 {
   // We only care when enabled sheets are removed
@@ -4450,7 +4449,7 @@ PresShell::StyleSheetRemoved(nsIStyleSheet* aStyleSheet,
 }
 
 void
-PresShell::StyleSheetApplicableStateChanged(nsIStyleSheet* aStyleSheet)
+PresShell::StyleSheetApplicableStateChanged(CSSStyleSheet* aStyleSheet)
 {
   if (aStyleSheet->HasRules()) {
     RecordStyleSheetChange(aStyleSheet);
@@ -4458,19 +4457,19 @@ PresShell::StyleSheetApplicableStateChanged(nsIStyleSheet* aStyleSheet)
 }
 
 void
-PresShell::StyleRuleChanged(nsIStyleSheet* aStyleSheet)
+PresShell::StyleRuleChanged(CSSStyleSheet* aStyleSheet)
 {
   RecordStyleSheetChange(aStyleSheet);
 }
 
 void
-PresShell::StyleRuleAdded(nsIStyleSheet* aStyleSheet)
+PresShell::StyleRuleAdded(CSSStyleSheet* aStyleSheet)
 {
   RecordStyleSheetChange(aStyleSheet);
 }
 
 void
-PresShell::StyleRuleRemoved(nsIStyleSheet* aStyleSheet)
+PresShell::StyleRuleRemoved(CSSStyleSheet* aStyleSheet)
 {
   RecordStyleSheetChange(aStyleSheet);
 }
@@ -8520,34 +8519,37 @@ PresShell::IsVisible()
 }
 
 nsresult
-PresShell::GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets)
+PresShell::GetAgentStyleSheets(nsTArray<RefPtr<CSSStyleSheet>>& aSheets)
 {
   aSheets.Clear();
   int32_t sheetCount = mStyleSet->SheetCount(SheetType::Agent);
 
+  if (!aSheets.SetCapacity(sheetCount, fallible)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   for (int32_t i = 0; i < sheetCount; ++i) {
-    nsIStyleSheet *sheet = mStyleSet->StyleSheetAt(SheetType::Agent, i);
-    if (!aSheets.AppendObject(sheet))
-      return NS_ERROR_OUT_OF_MEMORY;
+    CSSStyleSheet* sheet = mStyleSet->StyleSheetAt(SheetType::Agent, i);
+    aSheets.AppendElement(sheet);
   }
 
   return NS_OK;
 }
 
 nsresult
-PresShell::SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets)
+PresShell::SetAgentStyleSheets(const nsTArray<RefPtr<CSSStyleSheet>>& aSheets)
 {
   return mStyleSet->ReplaceSheets(SheetType::Agent, aSheets);
 }
 
 nsresult
-PresShell::AddOverrideStyleSheet(nsIStyleSheet *aSheet)
+PresShell::AddOverrideStyleSheet(CSSStyleSheet* aSheet)
 {
   return mStyleSet->PrependStyleSheet(SheetType::Override, aSheet);
 }
 
 nsresult
-PresShell::RemoveOverrideStyleSheet(nsIStyleSheet *aSheet)
+PresShell::RemoveOverrideStyleSheet(CSSStyleSheet* aSheet)
 {
   return mStyleSet->RemoveStyleSheet(SheetType::Override, aSheet);
 }
@@ -9645,7 +9647,7 @@ PresShell::CloneStyleSet(nsStyleSet* aSet)
 
   int32_t i, n = aSet->SheetCount(SheetType::Override);
   for (i = 0; i < n; i++) {
-    nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Override, i);
+    CSSStyleSheet* ss = aSet->StyleSheetAt(SheetType::Override, i);
     if (ss)
       clone->AppendStyleSheet(SheetType::Override, ss);
   }
@@ -9654,7 +9656,7 @@ PresShell::CloneStyleSet(nsStyleSet* aSet)
 #if 0
   n = aSet->SheetCount(SheetType::Doc);
   for (i = 0; i < n; i++) {
-    nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Doc, i);
+    CSSStyleSheet* ss = aSet->StyleSheetAt(SheetType::Doc, i);
     if (ss)
       clone->AddDocStyleSheet(ss, mDocument);
   }
@@ -9662,14 +9664,14 @@ PresShell::CloneStyleSet(nsStyleSet* aSet)
 
   n = aSet->SheetCount(SheetType::User);
   for (i = 0; i < n; i++) {
-    nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::User, i);
+    CSSStyleSheet* ss = aSet->StyleSheetAt(SheetType::User, i);
     if (ss)
       clone->AppendStyleSheet(SheetType::User, ss);
   }
 
   n = aSet->SheetCount(SheetType::Agent);
   for (i = 0; i < n; i++) {
-    nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Agent, i);
+    CSSStyleSheet* ss = aSet->StyleSheetAt(SheetType::Agent, i);
     if (ss)
       clone->AppendStyleSheet(SheetType::Agent, ss);
   }
diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h
index 30b66148b3..fba251a8f6 100644
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -154,11 +154,13 @@ public:
 
   virtual void UnsuppressPainting() override;
 
-  virtual nsresult GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets) override;
-  virtual nsresult SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets) override;
+  virtual nsresult GetAgentStyleSheets(
+      nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets) override;
+  virtual nsresult SetAgentStyleSheets(
+      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets) override;
 
-  virtual nsresult AddOverrideStyleSheet(nsIStyleSheet *aSheet) override;
-  virtual nsresult RemoveOverrideStyleSheet(nsIStyleSheet *aSheet) override;
+  virtual nsresult AddOverrideStyleSheet(mozilla::CSSStyleSheet* aSheet) override;
+  virtual nsresult RemoveOverrideStyleSheet(mozilla::CSSStyleSheet* aSheet) override;
 
   virtual nsresult HandleEventWithTarget(
                                  mozilla::WidgetEvent* aEvent,
@@ -499,7 +501,7 @@ protected:
   void ShowEventTargetDebug();
 #endif
 
-  void RecordStyleSheetChange(nsIStyleSheet* aStyleSheet);
+  void RecordStyleSheetChange(mozilla::CSSStyleSheet* aStyleSheet);
 
   void RemovePreferenceStyles();
 
diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp
index 579f743a6f..0817905fd6 100644
--- a/layout/base/nsStyleSheetService.cpp
+++ b/layout/base/nsStyleSheetService.cpp
@@ -7,7 +7,6 @@
 /* implementation of interface for managing user and user-agent style sheets */
 
 #include "nsStyleSheetService.h"
-#include "nsIStyleSheet.h"
 #include "mozilla/CSSStyleSheet.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/unused.h"
@@ -79,14 +78,14 @@ nsStyleSheetService::RegisterFromEnumerator(nsICategoryManager  *aManager,
 }
 
 int32_t
-nsStyleSheetService::FindSheetByURI(const nsCOMArray<nsIStyleSheet> &sheets,
-                                    nsIURI *sheetURI)
+nsStyleSheetService::FindSheetByURI(const nsTArray<RefPtr<CSSStyleSheet>>& aSheets,
+                                    nsIURI* aSheetURI)
 {
-  for (int32_t i = sheets.Count() - 1; i >= 0; i-- ) {
+  for (int32_t i = aSheets.Length() - 1; i >= 0; i-- ) {
     bool bEqual;
-    nsIURI* uri = sheets[i]->GetSheetURI();
+    nsIURI* uri = aSheets[i]->GetSheetURI();
     if (uri
-        && NS_SUCCEEDED(uri->Equals(sheetURI, &bEqual))
+        && NS_SUCCEEDED(uri->Equals(aSheetURI, &bEqual))
         && bEqual) {
       return i;
     }
@@ -153,8 +152,9 @@ nsStyleSheetService::LoadAndRegisterSheet(nsIURI *aSheetURI,
     if (serv) {
       // We're guaranteed that the new sheet is the last sheet in
       // mSheets[aSheetType]
-      const nsCOMArray<nsIStyleSheet> & sheets = mSheets[aSheetType];
-      serv->NotifyObservers(sheets[sheets.Count() - 1], message, nullptr);
+      CSSStyleSheet* sheet = mSheets[aSheetType].LastElement();
+      serv->NotifyObservers(NS_ISUPPORTS_CAST(nsIDOMCSSStyleSheet*, sheet),
+                            message, nullptr);
     }
 
     if (XRE_IsParentProcess()) {
@@ -208,9 +208,7 @@ nsStyleSheetService::LoadAndRegisterSheetInternal(nsIURI *aSheetURI,
                                       getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!mSheets[aSheetType].AppendObject(sheet)) {
-    rv = NS_ERROR_OUT_OF_MEMORY;
-  }
+  mSheets[aSheetType].AppendElement(sheet);
 
   return rv;
 }
@@ -275,8 +273,8 @@ nsStyleSheetService::UnregisterSheet(nsIURI *aSheetURI, uint32_t aSheetType)
 
   int32_t foundIndex = FindSheetByURI(mSheets[aSheetType], aSheetURI);
   NS_ENSURE_TRUE(foundIndex >= 0, NS_ERROR_INVALID_ARG);
-  nsCOMPtr<nsIStyleSheet> sheet = mSheets[aSheetType][foundIndex];
-  mSheets[aSheetType].RemoveObjectAt(foundIndex);
+  RefPtr<CSSStyleSheet> sheet = mSheets[aSheetType][foundIndex];
+  mSheets[aSheetType].RemoveElementAt(foundIndex);
 
   const char* message;
   switch (aSheetType) {
@@ -292,8 +290,10 @@ nsStyleSheetService::UnregisterSheet(nsIURI *aSheetURI, uint32_t aSheetType)
   }
 
   nsCOMPtr<nsIObserverService> serv = services::GetObserverService();
-  if (serv)
-    serv->NotifyObservers(sheet, message, nullptr);
+  if (serv) {
+    serv->NotifyObservers(NS_ISUPPORTS_CAST(nsIDOMCSSStyleSheet*, sheet),
+                          message, nullptr);
+  }
 
   if (XRE_IsParentProcess()) {
     nsTArray<dom::ContentParent*> children;
@@ -329,13 +329,6 @@ nsStyleSheetService::GetInstance()
   return gInstance;
 }
 
-static size_t
-SizeOfElementIncludingThis(nsIStyleSheet* aElement,
-                           MallocSizeOf aMallocSizeOf, void *aData)
-{
-  return aElement->SizeOfIncludingThis(aMallocSizeOf);
-}
-
 MOZ_DEFINE_MALLOC_SIZE_OF(StyleSheetServiceMallocSizeOf)
 
 NS_IMETHODIMP
@@ -352,13 +345,11 @@ size_t
 nsStyleSheetService::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
 {
   size_t n = aMallocSizeOf(this);
-  n += mSheets[AGENT_SHEET].SizeOfExcludingThis(SizeOfElementIncludingThis,
-                                                aMallocSizeOf);
-  n += mSheets[USER_SHEET].SizeOfExcludingThis(SizeOfElementIncludingThis,
-                                               aMallocSizeOf);
-  n += mSheets[AUTHOR_SHEET].SizeOfExcludingThis(SizeOfElementIncludingThis,
-                                                 aMallocSizeOf);
+  for (auto& sheetArray : mSheets) {
+    n += sheetArray.ShallowSizeOfExcludingThis(aMallocSizeOf);
+    for (CSSStyleSheet* sheet : sheetArray) {
+      n += sheet->SizeOfIncludingThis(aMallocSizeOf);
+    }
+  }
   return n;
 }
-
-
diff --git a/layout/base/nsStyleSheetService.h b/layout/base/nsStyleSheetService.h
index e670347486..ec128a6d6c 100644
--- a/layout/base/nsStyleSheetService.h
+++ b/layout/base/nsStyleSheetService.h
@@ -16,13 +16,16 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 
+namespace mozilla {
+class CSSStyleSheet;
+}
 class nsICategoryManager;
 class nsIMemoryReporter;
 class nsISimpleEnumerator;
-class nsIStyleSheet;
 
 #define NS_STYLESHEETSERVICE_CID \
-{0xfcca6f83, 0x9f7d, 0x44e4, {0xa7, 0x4b, 0xb5, 0x94, 0x33, 0xe6, 0xc8, 0xc3}}
+{ 0x3b55e72e, 0xab7e, 0x431b, \
+  { 0x89, 0xc0, 0x3b, 0x06, 0xa8, 0xb1, 0x40, 0x16 } }
 
 #define NS_STYLESHEETSERVICE_CONTRACTID \
   "@mozilla.org/content/style-sheet-service;1"
@@ -40,9 +43,18 @@ class nsStyleSheetService final
 
   nsresult Init();
 
-  nsCOMArray<nsIStyleSheet>* AgentStyleSheets() { return &mSheets[AGENT_SHEET]; }
-  nsCOMArray<nsIStyleSheet>* UserStyleSheets() { return &mSheets[USER_SHEET]; }
-  nsCOMArray<nsIStyleSheet>* AuthorStyleSheets() { return &mSheets[AUTHOR_SHEET]; }
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>>* AgentStyleSheets()
+  {
+    return &mSheets[AGENT_SHEET];
+  }
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>>* UserStyleSheets()
+  {
+    return &mSheets[USER_SHEET];
+  }
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>>* AuthorStyleSheets()
+  {
+    return &mSheets[AUTHOR_SHEET];
+  }
 
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
@@ -57,15 +69,15 @@ class nsStyleSheetService final
                                           nsISimpleEnumerator *aEnumerator,
                                           uint32_t             aSheetType);
 
-  int32_t FindSheetByURI(const nsCOMArray<nsIStyleSheet> &sheets,
-                                     nsIURI *sheetURI);
+  int32_t FindSheetByURI(const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aSheets,
+                         nsIURI* aSheetURI);
 
   // Like LoadAndRegisterSheet, but doesn't notify.  If successful, the
   // new sheet will be the last sheet in mSheets[aSheetType].
   nsresult LoadAndRegisterSheetInternal(nsIURI *aSheetURI,
                                         uint32_t aSheetType);
 
-  nsCOMArray<nsIStyleSheet> mSheets[3];
+  nsTArray<RefPtr<mozilla::CSSStyleSheet>> mSheets[3];
 };
 
 #endif
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 30006fd6fe..8f6f0b47ea 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -322,7 +322,8 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(QuotaManager,
                                          QuotaManager::FactoryCreate)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(ServiceWorkerManager,
                                          ServiceWorkerManager::GetInstance)
-NS_GENERIC_FACTORY_CONSTRUCTOR(WorkerDebuggerManager)
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(WorkerDebuggerManager,
+                                         WorkerDebuggerManager::GetInstance)
 
 #ifdef MOZ_WIDGET_GONK
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(SystemWorkerManager,
diff --git a/layout/inspector/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp
index bb0c1d6538..975efd0f43 100644
--- a/layout/inspector/inDOMUtils.cpp
+++ b/layout/inspector/inDOMUtils.cpp
@@ -74,7 +74,7 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength,
 {
   NS_ENSURE_ARG_POINTER(aDocument);
 
-  nsCOMArray<nsIStyleSheet> sheets;
+  nsTArray<RefPtr<CSSStyleSheet>> sheets;
 
   nsCOMPtr<nsIDocument> document = do_QueryInterface(aDocument);
   MOZ_ASSERT(document);
@@ -109,14 +109,14 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength,
     sheets.AppendElement(document->GetStyleSheetAt(i));
   }
 
-  nsISupports** ret = static_cast<nsISupports**>(NS_Alloc(sheets.Count() *
+  nsISupports** ret = static_cast<nsISupports**>(NS_Alloc(sheets.Length() *
                                                  sizeof(nsISupports*)));
 
-  for (int32_t i = 0; i < sheets.Count(); i++) {
-    NS_ADDREF(ret[i] = sheets[i]);
+  for (int32_t i = 0; i < sheets.Length(); i++) {
+    NS_ADDREF(ret[i] = NS_ISUPPORTS_CAST(nsIDOMCSSStyleSheet*, sheets[i]));
   }
 
-  *aLength = sheets.Count();
+  *aLength = sheets.Length();
   *aSheets = ret;
 
   return NS_OK;
diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp
index 1a82d3f14c..1b5fce9cc8 100644
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -1073,8 +1073,10 @@ size_t
 CSSStyleSheetInner::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
 {
   size_t n = aMallocSizeOf(this);
-  n += mOrderedRules.SizeOfExcludingThis(css::Rule::SizeOfCOMArrayElementIncludingThis,
-                                         aMallocSizeOf);
+  n += mOrderedRules.ShallowSizeOfExcludingThis(aMallocSizeOf);
+  for (size_t i = 0; i < mOrderedRules.Length(); i++) {
+    n += mOrderedRules[i]->SizeOfIncludingThis(aMallocSizeOf);
+  }
   n += mFirstChild ? mFirstChild->SizeOfIncludingThis(aMallocSizeOf) : 0;
 
   // Measurement of the following members may be added later if DMD finds it is
@@ -1272,7 +1274,7 @@ CSSStyleSheet::TraverseInner(nsCycleCollectionTraversalCallback &cb)
   RefPtr<CSSStyleSheet>* childSheetSlot = &mInner->mFirstChild;
   while (*childSheetSlot) {
     NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "child sheet");
-    cb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIStyleSheet*, childSheetSlot->get()));
+    cb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIDOMCSSStyleSheet*, childSheetSlot->get()));
     childSheetSlot = &(*childSheetSlot)->mNext;
   }
 
@@ -1286,11 +1288,10 @@ CSSStyleSheet::TraverseInner(nsCycleCollectionTraversalCallback &cb)
 // QueryInterface implementation for CSSStyleSheet
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSStyleSheet)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRY(nsIStyleSheet)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStyleSheet)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleSheet)
   NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleSheet)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCSSStyleSheet)
   if (aIID.Equals(NS_GET_IID(CSSStyleSheet)))
     foundInterface = reinterpret_cast<nsISupports*>(this);
   else
@@ -1390,19 +1391,19 @@ CSSStyleSheet::SetPrincipal(nsIPrincipal* aPrincipal)
   }
 }
 
-/* virtual */ nsIURI*
+nsIURI*
 CSSStyleSheet::GetSheetURI() const
 {
   return mInner->mSheetURI;
 }
 
-/* virtual */ nsIURI*
+nsIURI*
 CSSStyleSheet::GetBaseURI() const
 {
   return mInner->mBaseURI;
 }
 
-/* virtual */ void
+void
 CSSStyleSheet::GetType(nsString& aType) const
 {
   aType.AssignLiteral("text/css");
@@ -1425,19 +1426,19 @@ CSSStyleSheet::SetMedia(nsMediaList* aMedia)
   mMedia = aMedia;
 }
 
-/* virtual */ bool
+bool
 CSSStyleSheet::HasRules() const
 {
   return StyleRuleCount() != 0;
 }
 
-/* virtual */ bool
+bool
 CSSStyleSheet::IsApplicable() const
 {
   return !mDisabled && mInner->mComplete;
 }
 
-/* virtual */ void
+void
 CSSStyleSheet::SetEnabled(bool aEnabled)
 {
   // Internal method, so callers must handle BeginUpdate/EndUpdate
@@ -1453,13 +1454,13 @@ CSSStyleSheet::SetEnabled(bool aEnabled)
   }
 }
 
-/* virtual */ bool
+bool
 CSSStyleSheet::IsComplete() const
 {
   return mInner->mComplete;
 }
 
-/* virtual */ void
+void
 CSSStyleSheet::SetComplete()
 {
   NS_ASSERTION(!mDirty, "Can't set a dirty sheet complete!");
@@ -1479,19 +1480,19 @@ CSSStyleSheet::SetComplete()
   }
 }
 
-/* virtual */ nsIStyleSheet*
+CSSStyleSheet*
 CSSStyleSheet::GetParentSheet() const
 {
   return mParent;
 }
 
-/* virtual */ nsIDocument*
+nsIDocument*
 CSSStyleSheet::GetOwningDocument() const
 {
   return mDocument;
 }
 
-/* virtual */ void
+void
 CSSStyleSheet::SetOwningDocument(nsIDocument* aDocument)
 { // not ref counted
   mDocument = aDocument;
@@ -1519,12 +1520,9 @@ CSSStyleSheet::FindOwningWindowInnerID() const
   }
 
   if (windowID == 0 && mOwnerRule) {
-    nsCOMPtr<nsIStyleSheet> sheet = static_cast<css::Rule*>(mOwnerRule)->GetStyleSheet();
+    RefPtr<CSSStyleSheet> sheet = static_cast<css::Rule*>(mOwnerRule)->GetStyleSheet();
     if (sheet) {
-      RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(sheet);
-      if (cssSheet) {
-        windowID = cssSheet->FindOwningWindowInnerID();
-      }
+      windowID = sheet->FindOwningWindowInnerID();
     }
   }
 
@@ -1732,7 +1730,7 @@ struct ListEnumData {
   int32_t mIndent;
 };
 
-/* virtual */ void
+void
 CSSStyleSheet::List(FILE* out, int32_t aIndent) const
 {
 
@@ -1925,7 +1923,7 @@ CSSStyleSheet::GetHref(nsAString& aHref)
   return NS_OK;
 }
 
-/* virtual */ void
+void
 CSSStyleSheet::GetTitle(nsString& aTitle) const
 {
   aTitle = mTitle;
diff --git a/layout/style/CSSStyleSheet.h b/layout/style/CSSStyleSheet.h
index 940d7a78de..18c6300411 100644
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -18,7 +18,6 @@
 #include "nscore.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
-#include "nsIStyleSheet.h"
 #include "nsIDOMCSSStyleSheet.h"
 #include "nsICSSLoaderObserver.h"
 #include "nsTArrayForwardDeclare.h"
@@ -142,14 +141,13 @@ private:
 //
 
 // CID for the CSSStyleSheet class
-// ca926f30-2a7e-477e-8467-803fb32af20a
+// 7985c7ac-9ddc-444d-9899-0c86ec122f54
 #define NS_CSS_STYLE_SHEET_IMPL_CID     \
-{ 0xca926f30, 0x2a7e, 0x477e, \
- { 0x84, 0x67, 0x80, 0x3f, 0xb3, 0x2a, 0xf2, 0x0a } }
+{ 0x7985c7ac, 0x9ddc, 0x444d, \
+  { 0x98, 0x99, 0x0c, 0x86, 0xec, 0x12, 0x2f, 0x54 } }
 
 
-class CSSStyleSheet final : public nsIStyleSheet,
-                            public nsIDOMCSSStyleSheet,
+class CSSStyleSheet final : public nsIDOMCSSStyleSheet,
                             public nsICSSLoaderObserver,
                             public nsWrapperCache
 {
@@ -161,28 +159,50 @@ public:
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(CSSStyleSheet,
-                                                         nsIStyleSheet)
+                                                         nsIDOMCSSStyleSheet)
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_STYLE_SHEET_IMPL_CID)
 
-  // nsIStyleSheet interface
-  virtual nsIURI* GetSheetURI() const override;
-  virtual nsIURI* GetBaseURI() const override;
-  virtual void GetTitle(nsString& aTitle) const override;
-  virtual void GetType(nsString& aType) const override;
-  virtual bool HasRules() const override;
-  virtual bool IsApplicable() const override;
-  virtual void SetEnabled(bool aEnabled) override;
-  virtual bool IsComplete() const override;
-  virtual void SetComplete() override;
-  virtual nsIStyleSheet* GetParentSheet() const override;  // may be null
-  virtual nsIDocument* GetOwningDocument() const override;  // may be null
-  virtual void SetOwningDocument(nsIDocument* aDocument) override;
+  nsIURI* GetSheetURI() const;
+  nsIURI* GetBaseURI() const;
+  void GetTitle(nsString& aTitle) const;
+  void GetType(nsString& aType) const;
+  bool HasRules() const;
+
+  /**
+   * Whether the sheet is applicable.  A sheet that is not applicable
+   * should never be inserted into a style set.  A sheet may not be
+   * applicable for a variety of reasons including being disabled and
+   * being incomplete.
+   */
+  bool IsApplicable() const;
+
+  /**
+   * Set the stylesheet to be enabled.  This may or may not make it
+   * applicable.  Note that this WILL inform the sheet's document of
+   * its new applicable state if the state changes but WILL NOT call
+   * BeginUpdate() or EndUpdate() on the document -- calling those is
+   * the caller's responsibility.  This allows use of SetEnabled when
+   * batched updates are desired.  If you want updates handled for
+   * you, see nsIDOMStyleSheet::SetDisabled().
+   */
+  void SetEnabled(bool aEnabled);
+
+  /**
+   * Whether the sheet is complete.
+   */
+  bool IsComplete() const;
+  void SetComplete();
+
+  // style sheet owner info
+  CSSStyleSheet* GetParentSheet() const;  // may be null
+  nsIDocument* GetOwningDocument() const;  // may be null
+  void SetOwningDocument(nsIDocument* aDocument);
 
   // Find the ID of the owner inner window.
   uint64_t FindOwningWindowInnerID() const;
 #ifdef DEBUG
-  virtual void List(FILE* out = stdout, int32_t aIndent = 0) const override;
+  void List(FILE* out = stdout, int32_t aIndent = 0) const;
 #endif
 
   void AppendStyleSheet(CSSStyleSheet* aSheet);
@@ -286,7 +306,7 @@ public:
   // list after we clone a unique inner for ourselves.
   static bool RebuildChildList(css::Rule* aRule, void* aBuilder);
 
-  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
+  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 
   // Get this style sheet's CORS mode
   CORSMode GetCORSMode() const { return mInner->mCORSMode; }
@@ -304,7 +324,7 @@ public:
   }
 
   // WebIDL StyleSheet API
-  // Our nsIStyleSheet::GetType is a const method, so it ends up
+  // Our CSSStyleSheet::GetType is a const method, so it ends up
   // ambiguous with with the XPCOM version.  Just disambiguate.
   void GetType(nsString& aType) {
     const_cast<const CSSStyleSheet*>(this)->GetType(aType);
@@ -312,7 +332,7 @@ public:
   // Our XPCOM GetHref is fine for WebIDL
   nsINode* GetOwnerNode() const { return mOwningNode; }
   CSSStyleSheet* GetParentStyleSheet() const { return mParent; }
-  // Our nsIStyleSheet::GetTitle is a const method, so it ends up
+  // Our CSSStyleSheet::GetTitle is a const method, so it ends up
   // ambiguous with with the XPCOM version.  Just disambiguate.
   void GetTitle(nsString& aTitle) {
     const_cast<const CSSStyleSheet*>(this)->GetTitle(aTitle);
@@ -343,7 +363,7 @@ public:
       return dom::ParentObject(mOwningNode);
     }
 
-    return dom::ParentObject(static_cast<nsIStyleSheet*>(mParent), mParent);
+    return dom::ParentObject(static_cast<nsIDOMCSSStyleSheet*>(mParent), mParent);
   }
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index bb4f99a336..38fb977b4c 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1272,12 +1272,10 @@ Loader::InsertSheetInDoc(CSSStyleSheet* aSheet,
    */
   int32_t insertionPoint;
   for (insertionPoint = sheetCount - 1; insertionPoint >= 0; --insertionPoint) {
-    nsIStyleSheet *curSheet = aDocument->GetStyleSheetAt(insertionPoint);
+    CSSStyleSheet* curSheet = aDocument->GetStyleSheetAt(insertionPoint);
     NS_ASSERTION(curSheet, "There must be a sheet here!");
-    nsCOMPtr<nsIDOMStyleSheet> domSheet = do_QueryInterface(curSheet);
-    NS_ASSERTION(domSheet, "All the \"normal\" sheets implement nsIDOMStyleSheet");
     nsCOMPtr<nsIDOMNode> sheetOwner;
-    domSheet->GetOwnerNode(getter_AddRefs(sheetOwner));
+    curSheet->GetOwnerNode(getter_AddRefs(sheetOwner));
     if (sheetOwner && !aLinkingContent) {
       // Keep moving; all sheets with a sheetOwner come after all
       // sheets without a linkingNode
@@ -2502,7 +2500,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Loader)
          !iter.Done();
          iter.Next()) {
       NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "Sheet cache nsCSSLoader");
-      cb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIStyleSheet*, iter.UserData()));
+      cb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIDOMCSSStyleSheet*, iter.UserData()));
     }
   }
   nsTObserverArray<nsCOMPtr<nsICSSLoaderObserver>>::ForwardIterator
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 99c6d01a14..7a9ed55dea 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -123,11 +123,6 @@ public:
   virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
     const MOZ_MUST_OVERRIDE = 0;
 
-  // This is used to measure nsCOMArray<Rule>s.
-  static size_t SizeOfCOMArrayElementIncludingThis(css::Rule* aElement,
-                                                   mozilla::MallocSizeOf aMallocSizeOf,
-                                                   void* aData);
-
 protected:
   // This is sometimes null (e.g., for style attributes).
   CSSStyleSheet*    mSheet;
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 2833d04701..65490752e6 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -62,7 +62,6 @@ EXPORTS += [
     'nsICSSStyleRuleDOMWrapper.h',
     'nsIStyleRule.h',
     'nsIStyleRuleProcessor.h',
-    'nsIStyleSheet.h',
     'nsLayoutStylesheetCache.h',
     'nsRuleData.h',
     'nsRuleNode.h',
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 73961e12b3..3d19a5cc83 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -90,14 +90,6 @@ Rule::GetCSSRule()
   return this;
 }
 
-size_t
-Rule::SizeOfCOMArrayElementIncludingThis(css::Rule* aElement,
-                                         MallocSizeOf aMallocSizeOf,
-                                         void* aData)
-{
-  return aElement->SizeOfIncludingThis(aMallocSizeOf);
-}
-
 // -------------------------------
 // Style Rule List for group rules
 //
@@ -586,12 +578,15 @@ GroupRule::DeleteRule(uint32_t aIndex)
 /* virtual */ size_t
 GroupRule::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
-  return mRules.SizeOfExcludingThis(Rule::SizeOfCOMArrayElementIncludingThis,
-                                    aMallocSizeOf);
+  size_t n = mRules.ShallowSizeOfExcludingThis(aMallocSizeOf);
+  for (size_t i = 0; i < mRules.Length(); i++) {
+    n += mRules[i]->SizeOfIncludingThis(aMallocSizeOf);
+  }
 
   // Measurement of the following members may be added later if DMD finds it is
   // worthwhile:
   // - mRuleCollection
+  return n;
 }
 
 
diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp
index a6b7299cbd..a8ab190c19 100644
--- a/layout/style/nsDOMCSSDeclaration.cpp
+++ b/layout/style/nsDOMCSSDeclaration.cpp
@@ -310,9 +310,8 @@ nsDOMCSSDeclaration::RemoveProperty(const nsAString& aPropertyName,
 nsDOMCSSDeclaration::GetCSSParsingEnvironmentForRule(css::Rule* aRule,
                                                      CSSParsingEnvironment& aCSSParseEnv)
 {
-  nsIStyleSheet* sheet = aRule ? aRule->GetStyleSheet() : nullptr;
-  RefPtr<CSSStyleSheet> cssSheet(do_QueryObject(sheet));
-  if (!cssSheet) {
+  CSSStyleSheet* sheet = aRule ? aRule->GetStyleSheet() : nullptr;
+  if (!sheet) {
     aCSSParseEnv.mPrincipal = nullptr;
     return;
   }
@@ -320,7 +319,7 @@ nsDOMCSSDeclaration::GetCSSParsingEnvironmentForRule(css::Rule* aRule,
   nsIDocument* document = sheet->GetOwningDocument();
   aCSSParseEnv.mSheetURI = sheet->GetSheetURI();
   aCSSParseEnv.mBaseURI = sheet->GetBaseURI();
-  aCSSParseEnv.mPrincipal = cssSheet->Principal();
+  aCSSParseEnv.mPrincipal = sheet->Principal();
   aCSSParseEnv.mCSSLoader = document ? document->CSSLoader() : nullptr;
 }
 
diff --git a/layout/style/nsIStyleSheet.h b/layout/style/nsIStyleSheet.h
deleted file mode 100644
index 23ccb58fd5..0000000000
--- a/layout/style/nsIStyleSheet.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * interface representing a collection of style data attached to a
- * document, which may be or be combined into a style rule processor
- */
-
-#ifndef nsIStyleSheet_h___
-#define nsIStyleSheet_h___
-
-#include "mozilla/MemoryReporting.h"
-#include <stdio.h>
-#include "nsISupports.h"
-
-class nsString;
-class nsIURI;
-class nsIDocument;
-
-// IID for the nsIStyleSheet interface
-// 3eb34a60-04bd-41d9-9f60-882694e61c38
-#define NS_ISTYLE_SHEET_IID     \
-{ 0x3eb34a60, 0x04bd, 0x41d9,   \
- { 0x9f, 0x60, 0x88, 0x26, 0x94, 0xe6, 0x1c, 0x38 } }
-
-/**
- * A style sheet is a thing associated with a document that has style
- * rules.  Those style rules can be reached in one of two ways, depending
- * on which level of the nsStyleSet it is in:
- *   1) It can be |QueryInterface|d to nsIStyleRuleProcessor
- *   2) It can be |QueryInterface|d to CSSStyleSheet, with which the
- *      |nsStyleSet| uses an |nsCSSRuleProcessor| to access the rules.
- */
-class nsIStyleSheet : public nsISupports {
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISTYLE_SHEET_IID)
-
-  // basic style sheet data
-  virtual nsIURI* GetSheetURI() const = 0;
-  virtual nsIURI* GetBaseURI() const = 0;
-  virtual void GetTitle(nsString& aTitle) const = 0;
-  virtual void GetType(nsString& aType) const = 0;
-  virtual bool HasRules() const = 0;
-
-  /**
-   * Whether the sheet is applicable.  A sheet that is not applicable
-   * should never be inserted into a style set.  A sheet may not be
-   * applicable for a variety of reasons including being disabled and
-   * being incomplete.
-   *
-   */
-  virtual bool IsApplicable() const = 0;
-
-  /**
-   * Set the stylesheet to be enabled.  This may or may not make it
-   * applicable.  Note that this WILL inform the sheet's document of
-   * its new applicable state if the state changes but WILL NOT call
-   * BeginUpdate() or EndUpdate() on the document -- calling those is
-   * the caller's responsibility.  This allows use of SetEnabled when
-   * batched updates are desired.  If you want updates handled for
-   * you, see nsIDOMStyleSheet::SetDisabled().
-   */
-  virtual void SetEnabled(bool aEnabled) = 0;
-
-  /**
-   * Whether the sheet is complete.
-   */
-  virtual bool IsComplete() const = 0;
-  virtual void SetComplete() = 0;
-
-  // style sheet owner info
-  virtual nsIStyleSheet* GetParentSheet() const = 0;  // may be null
-  virtual nsIDocument* GetOwningDocument() const = 0; // may be null
-  virtual void SetOwningDocument(nsIDocument* aDocument) = 0;
-
-#ifdef DEBUG
-  virtual void List(FILE* out = stdout, int32_t aIndent = 0) const = 0;
-#endif
-
-  virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIStyleSheet, NS_ISTYLE_SHEET_IID)
-
-#endif /* nsIStyleSheet_h___ */
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 9e3ee75dde..f7e706af15 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -197,8 +197,8 @@ nsStyleSet::nsStyleSet()
 nsStyleSet::~nsStyleSet()
 {
   for (SheetType type : gCSSSheetTypes) {
-    for (uint32_t i = 0, n = mSheets[type].Length(); i < n; i++) {
-      static_cast<CSSStyleSheet*>(mSheets[type][i])->DropStyleSet(this);
+    for (CSSStyleSheet* sheet : mSheets[type]) {
+      sheet->DropStyleSet(this);
     }
   }
 
@@ -234,12 +234,9 @@ nsStyleSet::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
         n += mRuleProcessors[type]->SizeOfIncludingThis(aMallocSizeOf);
       }
     }
-    // mSheets is a C-style array of nsCOMArrays.  We do not own the sheets in
-    // the nsCOMArrays (either the nsLayoutStyleSheetCache singleton or our
-    // document owns them) so we do not count the sheets here (we pass nullptr
-    // as the aSizeOfElementIncludingThis argument).  All we're doing here is
-    // counting the size of the nsCOMArrays' buffers.
-    n += mSheets[type].SizeOfExcludingThis(nullptr, aMallocSizeOf);
+    // We don't own the sheets (either the nsLayoutStyleSheetCache singleton
+    // or our document owns them).
+    n += mSheets[type].ShallowSizeOfExcludingThis(aMallocSizeOf);
   }
 
   for (uint32_t i = 0; i < mScopedDocSheetRuleProcessors.Length(); i++) {
@@ -450,8 +447,7 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
     return NS_OK;
   }
   switch (aType) {
-    // handle the types for which have a rule processor that does not
-    // implement the style sheet interface.
+    // levels that do not contain CSS style sheets
     case SheetType::Animation:
       MOZ_ASSERT(mSheets[aType].IsEmpty());
       mRuleProcessors[aType] = PresContext()->EffectCompositor()->
@@ -480,17 +476,16 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
       // keep going
       break;
   }
+  MOZ_ASSERT(IsCSSSheetType(aType));
   if (aType == SheetType::ScopedDoc) {
     // Create a rule processor for each scope.
-    uint32_t count = mSheets[SheetType::ScopedDoc].Count();
+    uint32_t count = mSheets[SheetType::ScopedDoc].Length();
     if (count) {
       // Gather the scoped style sheets into an array as
       // CSSStyleSheets, and mark all of their scope elements
       // as scoped style roots.
       nsTArray<CSSStyleSheet*> sheets(count);
-      for (uint32_t i = 0; i < count; i++) {
-        RefPtr<CSSStyleSheet> sheet =
-          do_QueryObject(mSheets[SheetType::ScopedDoc].ObjectAt(i));
+      for (CSSStyleSheet* sheet : mSheets[SheetType::ScopedDoc]) {
         sheets.AppendElement(sheet);
 
         Element* scope = sheet->GetScopeElement();
@@ -539,27 +534,20 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
     }
     return NS_OK;
   }
-  if (mSheets[aType].Count()) {
+  if (!mSheets[aType].IsEmpty()) {
     switch (aType) {
       case SheetType::Agent:
       case SheetType::User: {
         // levels containing non-scoped CSS style sheets whose rule processors
         // we want to re-use
-        nsCOMArray<nsIStyleSheet>& sheets = mSheets[aType];
-        nsTArray<RefPtr<CSSStyleSheet>> cssSheets(sheets.Count());
-        for (int32_t i = 0, i_end = sheets.Count(); i < i_end; ++i) {
-          RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(sheets[i]);
-          NS_ASSERTION(cssSheet, "not a CSS sheet");
-          cssSheets.AppendElement(cssSheet);
-        }
-        nsTArray<CSSStyleSheet*> cssSheetsRaw(cssSheets.Length());
-        for (int32_t i = 0, i_end = cssSheets.Length(); i < i_end; ++i) {
-          cssSheetsRaw.AppendElement(cssSheets[i]);
+        nsTArray<CSSStyleSheet*> sheets(mSheets[aType].Length());
+        for (CSSStyleSheet* sheet : mSheets[aType]) {
+          sheets.AppendElement(sheet);
         }
         nsCSSRuleProcessor* rp =
-          RuleProcessorCache::GetRuleProcessor(cssSheetsRaw, PresContext());
+          RuleProcessorCache::GetRuleProcessor(sheets, PresContext());
         if (!rp) {
-          rp = new nsCSSRuleProcessor(cssSheets, aType, nullptr,
+          rp = new nsCSSRuleProcessor(mSheets[aType], aType, nullptr,
                                       static_cast<nsCSSRuleProcessor*>(
                                        oldRuleProcessor.get()),
                                       true /* aIsShared */);
@@ -567,7 +555,7 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
           nsDocumentRuleResultCacheKey cacheKey;
           rp->TakeDocumentRulesAndCacheKey(PresContext(),
                                            documentRules, cacheKey);
-          RuleProcessorCache::PutRuleProcessor(cssSheetsRaw,
+          RuleProcessorCache::PutRuleProcessor(sheets,
                                                Move(documentRules),
                                                cacheKey, rp);
         }
@@ -579,23 +567,14 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
       case SheetType::Override: {
         // levels containing non-scoped CSS stylesheets whose rule processors
         // we don't want to re-use
-        nsCOMArray<nsIStyleSheet>& sheets = mSheets[aType];
-        nsTArray<RefPtr<CSSStyleSheet>> cssSheets(sheets.Count());
-        for (int32_t i = 0, i_end = sheets.Count(); i < i_end; ++i) {
-          RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(sheets[i]);
-          NS_ASSERTION(cssSheet, "not a CSS sheet");
-          cssSheets.AppendElement(cssSheet);
-        }
         mRuleProcessors[aType] =
-          new nsCSSRuleProcessor(cssSheets, aType, nullptr,
+          new nsCSSRuleProcessor(mSheets[aType], aType, nullptr,
                                  static_cast<nsCSSRuleProcessor*>(
                                    oldRuleProcessor.get()));
       } break;
 
       default:
-        // levels containing non-CSS stylesheets
-        NS_ASSERTION(mSheets[aType].Count() == 1, "only one sheet per level");
-        mRuleProcessors[aType] = do_QueryInterface(mSheets[aType][0]);
+        MOZ_ASSERT_UNREACHABLE("non-CSS sheet types should be handled above");
         break;
     }
   }
@@ -603,58 +582,47 @@ nsStyleSet::GatherRuleProcessors(SheetType aType)
   return NS_OK;
 }
 
-static bool
-IsScopedStyleSheet(nsIStyleSheet* aSheet)
-{
-  RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(aSheet);
-  NS_ASSERTION(cssSheet, "expected aSheet to be a CSSStyleSheet");
-
-  return cssSheet->GetScopeElement();
-}
-
 nsresult
-nsStyleSet::AppendStyleSheet(SheetType aType, nsIStyleSheet *aSheet)
+nsStyleSet::AppendStyleSheet(SheetType aType, CSSStyleSheet* aSheet)
 {
   NS_PRECONDITION(aSheet, "null arg");
   NS_ASSERTION(aSheet->IsApplicable(),
                "Inapplicable sheet being placed in style set");
-  bool present = mSheets[aType].RemoveObject(aSheet);
-  if (!mSheets[aType].AppendObject(aSheet))
-    return NS_ERROR_OUT_OF_MEMORY;
+  bool present = mSheets[aType].RemoveElement(aSheet);
+  mSheets[aType].AppendElement(aSheet);
 
   if (!present && IsCSSSheetType(aType)) {
-    static_cast<CSSStyleSheet*>(aSheet)->AddStyleSet(this);
+    aSheet->AddStyleSet(this);
   }
 
   return DirtyRuleProcessors(aType);
 }
 
 nsresult
-nsStyleSet::PrependStyleSheet(SheetType aType, nsIStyleSheet *aSheet)
+nsStyleSet::PrependStyleSheet(SheetType aType, CSSStyleSheet* aSheet)
 {
   NS_PRECONDITION(aSheet, "null arg");
   NS_ASSERTION(aSheet->IsApplicable(),
                "Inapplicable sheet being placed in style set");
-  bool present = mSheets[aType].RemoveObject(aSheet);
-  if (!mSheets[aType].InsertObjectAt(aSheet, 0))
-    return NS_ERROR_OUT_OF_MEMORY;
+  bool present = mSheets[aType].RemoveElement(aSheet);
+  mSheets[aType].InsertElementAt(0, aSheet);
 
   if (!present && IsCSSSheetType(aType)) {
-    static_cast<CSSStyleSheet*>(aSheet)->AddStyleSet(this);
+    aSheet->AddStyleSet(this);
   }
 
   return DirtyRuleProcessors(aType);
 }
 
 nsresult
-nsStyleSet::RemoveStyleSheet(SheetType aType, nsIStyleSheet *aSheet)
+nsStyleSet::RemoveStyleSheet(SheetType aType, CSSStyleSheet* aSheet)
 {
   NS_PRECONDITION(aSheet, "null arg");
   NS_ASSERTION(aSheet->IsComplete(),
                "Incomplete sheet being removed from style set");
-  if (mSheets[aType].RemoveObject(aSheet)) {
+  if (mSheets[aType].RemoveElement(aSheet)) {
     if (IsCSSSheetType(aType)) {
-      static_cast<CSSStyleSheet*>(aSheet)->DropStyleSet(this);
+      aSheet->DropStyleSet(this);
     }
   }
 
@@ -663,22 +631,21 @@ nsStyleSet::RemoveStyleSheet(SheetType aType, nsIStyleSheet *aSheet)
 
 nsresult
 nsStyleSet::ReplaceSheets(SheetType aType,
-                          const nsCOMArray<nsIStyleSheet> &aNewSheets)
+                          const nsTArray<RefPtr<CSSStyleSheet>>& aNewSheets)
 {
   bool cssSheetType = IsCSSSheetType(aType);
   if (cssSheetType) {
-    for (uint32_t i = 0, n = mSheets[aType].Length(); i < n; i++) {
-      static_cast<CSSStyleSheet*>(mSheets[aType][i])->DropStyleSet(this);
+    for (CSSStyleSheet* sheet : mSheets[aType]) {
+      sheet->DropStyleSet(this);
     }
   }
 
   mSheets[aType].Clear();
-  if (!mSheets[aType].AppendObjects(aNewSheets))
-    return NS_ERROR_OUT_OF_MEMORY;
+  mSheets[aType].AppendElements(aNewSheets);
 
   if (cssSheetType) {
-    for (uint32_t i = 0, n = mSheets[aType].Length(); i < n; i++) {
-      static_cast<CSSStyleSheet*>(mSheets[aType][i])->AddStyleSet(this);
+    for (CSSStyleSheet* sheet : mSheets[aType]) {
+      sheet->AddStyleSet(this);
     }
   }
 
@@ -686,23 +653,22 @@ nsStyleSet::ReplaceSheets(SheetType aType,
 }
 
 nsresult
-nsStyleSet::InsertStyleSheetBefore(SheetType aType, nsIStyleSheet *aNewSheet,
-                                   nsIStyleSheet *aReferenceSheet)
+nsStyleSet::InsertStyleSheetBefore(SheetType aType, CSSStyleSheet* aNewSheet,
+                                   CSSStyleSheet* aReferenceSheet)
 {
   NS_PRECONDITION(aNewSheet && aReferenceSheet, "null arg");
   NS_ASSERTION(aNewSheet->IsApplicable(),
                "Inapplicable sheet being placed in style set");
 
-  bool present = mSheets[aType].RemoveObject(aNewSheet);
+  bool present = mSheets[aType].RemoveElement(aNewSheet);
   int32_t idx = mSheets[aType].IndexOf(aReferenceSheet);
   if (idx < 0)
     return NS_ERROR_INVALID_ARG;
 
-  if (!mSheets[aType].InsertObjectAt(aNewSheet, idx))
-    return NS_ERROR_OUT_OF_MEMORY;
+  mSheets[aType].InsertElementAt(idx, aNewSheet);
 
   if (!present && IsCSSSheetType(aType)) {
-    static_cast<CSSStyleSheet*>(aNewSheet)->AddStyleSet(this);
+    aNewSheet->AddStyleSet(this);
   }
 
   return DirtyRuleProcessors(aType);
@@ -747,27 +713,27 @@ nsStyleSet::SetAuthorStyleDisabled(bool aStyleDisabled)
 // -------- Doc Sheets
 
 nsresult
-nsStyleSet::AddDocStyleSheet(nsIStyleSheet* aSheet, nsIDocument* aDocument)
+nsStyleSet::AddDocStyleSheet(CSSStyleSheet* aSheet, nsIDocument* aDocument)
 {
   NS_PRECONDITION(aSheet && aDocument, "null arg");
   NS_ASSERTION(aSheet->IsApplicable(),
                "Inapplicable sheet being placed in style set");
 
-  SheetType type = IsScopedStyleSheet(aSheet) ?
+  SheetType type = aSheet->GetScopeElement() ?
                      SheetType::ScopedDoc :
                      SheetType::Doc;
-  nsCOMArray<nsIStyleSheet>& sheets = mSheets[type];
+  nsTArray<RefPtr<CSSStyleSheet>>& sheets = mSheets[type];
 
-  bool present = sheets.RemoveObject(aSheet);
+  bool present = sheets.RemoveElement(aSheet);
   nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance();
 
   // lowest index first
   int32_t newDocIndex = aDocument->GetIndexOfStyleSheet(aSheet);
 
-  int32_t count = sheets.Count();
+  int32_t count = sheets.Length();
   int32_t index;
   for (index = 0; index < count; index++) {
-    nsIStyleSheet* sheet = sheets.ObjectAt(index);
+    CSSStyleSheet* sheet = sheets[index];
     int32_t sheetDocIndex = aDocument->GetIndexOfStyleSheet(sheet);
     if (sheetDocIndex > newDocIndex)
       break;
@@ -776,27 +742,32 @@ nsStyleSet::AddDocStyleSheet(nsIStyleSheet* aSheet, nsIDocument* aDocument)
     // sheet registered at nsStyleSheetService or an additional author
     // sheet on the document, which means the new 
     // doc sheet should end up before it.
-    if (sheetDocIndex < 0 &&
-        ((sheetService &&
-        sheetService->AuthorStyleSheets()->IndexOf(sheet) >= 0) ||
-        sheet == aDocument->FirstAdditionalAuthorSheet()))
+    if (sheetDocIndex < 0) {
+      if (sheetService) {
+        auto& authorSheets = *sheetService->AuthorStyleSheets();
+        if (authorSheets.IndexOf(sheet) != authorSheets.NoIndex) {
+          break;
+        }
+      }
+      if (sheet == aDocument->FirstAdditionalAuthorSheet()) {
         break;
+      }
+    }
   }
-  if (!sheets.InsertObjectAt(aSheet, index))
-    return NS_ERROR_OUT_OF_MEMORY;
+
+  sheets.InsertElementAt(index, aSheet);
 
   if (!present) {
-    static_cast<CSSStyleSheet*>(aSheet)->AddStyleSet(this);
+    aSheet->AddStyleSet(this);
   }
 
   return DirtyRuleProcessors(type);
 }
 
 nsresult
-nsStyleSet::RemoveDocStyleSheet(nsIStyleSheet *aSheet)
+nsStyleSet::RemoveDocStyleSheet(CSSStyleSheet* aSheet)
 {
-  RefPtr<CSSStyleSheet> cssSheet = do_QueryObject(aSheet);
-  bool isScoped = cssSheet && cssSheet->GetScopeElement();
+  bool isScoped = aSheet->GetScopeElement();
   return RemoveStyleSheet(isScoped ? SheetType::ScopedDoc : SheetType::Doc,
                           aSheet);
 }
@@ -2519,10 +2490,8 @@ bool
 nsStyleSet::EnsureUniqueInnerOnCSSSheets()
 {
   AutoTArray<CSSStyleSheet*, 32> queue;
-  for (uint32_t i = 0; i < ArrayLength(gCSSSheetTypes); ++i) {
-    nsCOMArray<nsIStyleSheet> &sheets = mSheets[gCSSSheetTypes[i]];
-    for (uint32_t j = 0, j_end = sheets.Count(); j < j_end; ++j) {
-      CSSStyleSheet* sheet = static_cast<CSSStyleSheet*>(sheets[j]);
+  for (SheetType type : gCSSSheetTypes) {
+    for (CSSStyleSheet* sheet : mSheets[type]) {
       queue.AppendElement(sheet);
     }
   }
diff --git a/layout/style/nsStyleSet.h b/layout/style/nsStyleSet.h
index 7c8f68e07d..a05bcf210d 100644
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@@ -38,6 +38,7 @@ struct nsFontFaceRuleContainer;
 struct TreeMatchContext;
 
 namespace mozilla {
+class CSSStyleSheet;
 class EventStates;
 enum class CSSPseudoElementType : uint8_t;
 } // namespace mozilla
@@ -312,25 +313,29 @@ class nsStyleSet final
 
   // APIs to manipulate the style sheet lists.  The sheets in each
   // list are stored with the most significant sheet last.
-  nsresult AppendStyleSheet(mozilla::SheetType aType, nsIStyleSheet *aSheet);
-  nsresult PrependStyleSheet(mozilla::SheetType aType, nsIStyleSheet *aSheet);
-  nsresult RemoveStyleSheet(mozilla::SheetType aType, nsIStyleSheet *aSheet);
+  nsresult AppendStyleSheet(mozilla::SheetType aType,
+                            mozilla::CSSStyleSheet* aSheet);
+  nsresult PrependStyleSheet(mozilla::SheetType aType,
+                             mozilla::CSSStyleSheet* aSheet);
+  nsresult RemoveStyleSheet(mozilla::SheetType aType,
+                            mozilla::CSSStyleSheet* aSheet);
   nsresult ReplaceSheets(mozilla::SheetType aType,
-                         const nsCOMArray<nsIStyleSheet> &aNewSheets);
+                         const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aNewSheets);
   nsresult InsertStyleSheetBefore(mozilla::SheetType aType,
-                                  nsIStyleSheet *aNewSheet,
-                                  nsIStyleSheet *aReferenceSheet);
+                                  mozilla::CSSStyleSheet* aNewSheet,
+                                  mozilla::CSSStyleSheet* aReferenceSheet);
 
   // Enable/Disable entire author style level (Doc, ScopedDoc & PresHint levels)
   bool GetAuthorStyleDisabled() const;
   nsresult SetAuthorStyleDisabled(bool aStyleDisabled);
 
   int32_t SheetCount(mozilla::SheetType aType) const {
-    return mSheets[aType].Count();
+    return mSheets[aType].Length();
   }
 
-  nsIStyleSheet* StyleSheetAt(mozilla::SheetType aType, int32_t aIndex) const {
-    return mSheets[aType].ObjectAt(aIndex);
+  mozilla::CSSStyleSheet* StyleSheetAt(mozilla::SheetType aType,
+                                       int32_t aIndex) const {
+    return mSheets[aType][aIndex];
   }
 
   void AppendAllXBLStyleSheets(nsTArray<mozilla::CSSStyleSheet*>& aArray) const {
@@ -339,8 +344,9 @@ class nsStyleSet final
     }
   }
 
-  nsresult RemoveDocStyleSheet(nsIStyleSheet* aSheet);
-  nsresult AddDocStyleSheet(nsIStyleSheet* aSheet, nsIDocument* aDocument);
+  nsresult RemoveDocStyleSheet(mozilla::CSSStyleSheet* aSheet);
+  nsresult AddDocStyleSheet(mozilla::CSSStyleSheet* aSheet,
+                            nsIDocument* aDocument);
 
   void     BeginUpdate();
   nsresult EndUpdate();
@@ -474,7 +480,7 @@ private:
   // eAnimationSheet and eSVGAttrAnimationSheet are always empty.
   // (FIXME:  We should reduce the storage needed for them.)
   mozilla::EnumeratedArray<mozilla::SheetType, mozilla::SheetType::Count,
-                           nsCOMArray<nsIStyleSheet>> mSheets;
+                           nsTArray<RefPtr<mozilla::CSSStyleSheet>>> mSheets;
 
   // mRuleProcessors[eScopedDocSheet] is always null; rule processors
   // for scoped style sheets are stored in mScopedDocSheetRuleProcessors.
diff --git a/modules/libjar/InterceptedJARChannel.cpp b/modules/libjar/InterceptedJARChannel.cpp
deleted file mode 100644
index 1609afb739..0000000000
--- a/modules/libjar/InterceptedJARChannel.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set expandtab ts=2 sw=2 sts=2 cin: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "InterceptedJARChannel.h"
-#include "nsIPipe.h"
-#include "mozilla/dom/ChannelInfo.h"
-
-using namespace mozilla::net;
-
-NS_IMPL_ISUPPORTS(InterceptedJARChannel, nsIInterceptedChannel)
-
-InterceptedJARChannel::InterceptedJARChannel(nsJARChannel* aChannel,
-                                             nsINetworkInterceptController* aController)
-: mController(aController)
-, mChannel(aChannel)
-{
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::GetResponseBody(nsIOutputStream** aStream)
-{
-  NS_IF_ADDREF(*aStream = mResponseBody);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::GetInternalContentPolicyType(nsContentPolicyType* aPolicyType)
-{
-  NS_ENSURE_ARG(aPolicyType);
-  nsCOMPtr<nsILoadInfo> loadInfo;
-  nsresult rv = mChannel->GetLoadInfo(getter_AddRefs(loadInfo));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *aPolicyType = loadInfo->InternalContentPolicyType();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::GetChannel(nsIChannel** aChannel)
-{
-  NS_IF_ADDREF(*aChannel = mChannel);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::GetSecureUpgradedChannelURI(nsIURI** aURI)
-{
-  return mChannel->GetURI(aURI);
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::ResetInterception()
-{
-  if (!mChannel) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  mResponseBody = nullptr;
-  mSynthesizedInput = nullptr;
-
-  mChannel->ResetInterception();
-  mReleaseHandle = nullptr;
-  mChannel = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::SynthesizeStatus(uint16_t aStatus,
-                                        const nsACString& aReason)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::SynthesizeHeader(const nsACString& aName,
-                                        const nsACString& aValue)
-{
-  if (aName.LowerCaseEqualsLiteral("content-type")) {
-    mContentType = aValue;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::FinishSynthesizedResponse(const nsACString& aFinalURLSpec)
-{
-  if (NS_WARN_IF(!mChannel)) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  if (!aFinalURLSpec.IsEmpty()) {
-    // We don't support rewriting responses for JAR channels where the principal
-    // needs to be modified.
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
-  mChannel->OverrideWithSynthesizedResponse(mSynthesizedInput, mContentType);
-
-  mResponseBody = nullptr;
-  mReleaseHandle = nullptr;
-  mChannel = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::Cancel(nsresult aStatus)
-{
-  MOZ_ASSERT(NS_FAILED(aStatus));
-
-  if (!mChannel) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsresult rv = mChannel->Cancel(aStatus);
-  NS_ENSURE_SUCCESS(rv, rv);
-  mResponseBody = nullptr;
-  mReleaseHandle = nullptr;
-  mChannel = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::SetChannelInfo(mozilla::dom::ChannelInfo* aChannelInfo)
-{
-  if (!mChannel) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return aChannelInfo->ResurrectInfoOnChannel(mChannel);
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::GetConsoleReportCollector(nsIConsoleReportCollector**)
-{
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-InterceptedJARChannel::SetReleaseHandle(nsISupports* aHandle)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!mReleaseHandle);
-  MOZ_ASSERT(aHandle);
-  mReleaseHandle = aHandle;
-  return NS_OK;
-}
-
-void
-InterceptedJARChannel::NotifyController()
-{
-  nsresult rv = NS_NewPipe(getter_AddRefs(mSynthesizedInput),
-                           getter_AddRefs(mResponseBody),
-                           0, UINT32_MAX, true, true);
-  NS_ENSURE_SUCCESS_VOID(rv);
-
-  rv = mController->ChannelIntercepted(this);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    rv = ResetInterception();
-    NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-        "Failed to resume intercepted network request");
-  }
-  mController = nullptr;
-}
diff --git a/modules/libjar/InterceptedJARChannel.h b/modules/libjar/InterceptedJARChannel.h
deleted file mode 100644
index 63fc79ba93..0000000000
--- a/modules/libjar/InterceptedJARChannel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set expandtab ts=2 sw=2 sts=2 cin: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef InterceptedJARChannel_h
-#define InterceptedJARChannel_h
-
-#include "nsJAR.h"
-#include "nsJARChannel.h"
-#include "nsIInputStream.h"
-#include "nsIInputStreamPump.h"
-#include "nsINetworkInterceptController.h"
-#include "nsIOutputStream.h"
-#include "mozilla/RefPtr.h"
-
-#include "mozilla/Maybe.h"
-
-class nsIStreamListener;
-class nsJARChannel;
-
-namespace mozilla {
-namespace net {
-
-// An object representing a channel that has been intercepted. This avoids
-// complicating the actual channel implementation with the details of
-// synthesizing responses.
-class InterceptedJARChannel : public nsIInterceptedChannel
-{
-  // The interception controller to notify about the successful channel
-  // interception.
-  nsCOMPtr<nsINetworkInterceptController> mController;
-
-  // The actual channel being intercepted.
-  RefPtr<nsJARChannel> mChannel;
-
-  // Reader-side of the synthesized response body.
-  nsCOMPtr<nsIInputStream> mSynthesizedInput;
-
-  // The stream to write the body of the synthesized response.
-  nsCOMPtr<nsIOutputStream> mResponseBody;
-
-  nsCOMPtr<nsISupports> mReleaseHandle;
-
-  // The content type of the synthesized response.
-  nsCString mContentType;
-
-  virtual ~InterceptedJARChannel() {};
-public:
-  InterceptedJARChannel(nsJARChannel* aChannel,
-                        nsINetworkInterceptController* aController);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIINTERCEPTEDCHANNEL
-
-  void NotifyController();
-};
-
-} // namespace net
-} // namespace mozilla
-
-#endif // InterceptedJARChannel_h
diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build
index c4f86a4849..1647afe66d 100644
--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -23,14 +23,12 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'jar'
 
 EXPORTS += [
-    'InterceptedJARChannel.h',
     'nsJARURI.h',
     'nsZipArchive.h',
     'zipstruct.h',
 ]
 
 UNIFIED_SOURCES += [
-    'InterceptedJARChannel.cpp',
     'nsJARProtocolHandler.cpp',
     'nsJARURI.cpp',
 ]
diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp
index 6e3e62a128..9a563f16b8 100644
--- a/modules/libjar/nsJARChannel.cpp
+++ b/modules/libjar/nsJARChannel.cpp
@@ -25,8 +25,6 @@
 #include "mozilla/net/RemoteOpenFileChild.h"
 #include "nsITabChild.h"
 #include "private/pprio.h"
-#include "nsINetworkInterceptController.h"
-#include "InterceptedJARChannel.h"
 #include "nsInputStreamPump.h"
 
 using namespace mozilla;
@@ -203,7 +201,6 @@ nsJARChannel::nsJARChannel()
     , mIsPending(false)
     , mIsUnsafe(true)
     , mOpeningRemote(false)
-    , mSynthesizedStreamLength(0)
     , mBlockRemoteFiles(false)
 {
     if (!gJarProtocolLog)
@@ -521,8 +518,6 @@ nsJARChannel::GetStatus(nsresult *status)
 {
     if (mPump && NS_SUCCEEDED(mStatus))
         mPump->GetStatus(status);
-    else if (mSynthesizedResponsePump && NS_SUCCEEDED(mStatus))
-        mSynthesizedResponsePump->GetStatus(status);
     else
         *status = mStatus;
     return NS_OK;
@@ -534,8 +529,6 @@ nsJARChannel::Cancel(nsresult status)
     mStatus = status;
     if (mPump)
         return mPump->Cancel(status);
-    if (mSynthesizedResponsePump)
-        return mSynthesizedResponsePump->Cancel(status);
 
     NS_ASSERTION(!mIsPending, "need to implement cancel when downloading");
     return NS_OK;
@@ -546,8 +539,6 @@ nsJARChannel::Suspend()
 {
     if (mPump)
         return mPump->Suspend();
-    if (mSynthesizedResponsePump)
-        return mSynthesizedResponsePump->Suspend();
 
     NS_ASSERTION(!mIsPending, "need to implement suspend when downloading");
     return NS_OK;
@@ -558,8 +549,6 @@ nsJARChannel::Resume()
 {
     if (mPump)
         return mPump->Resume();
-    if (mSynthesizedResponsePump)
-        return mSynthesizedResponsePump->Resume();
 
     NS_ASSERTION(!mIsPending, "need to implement resume when downloading");
     return NS_OK;
@@ -676,8 +665,6 @@ nsJARChannel::OverrideSecurityInfo(nsISupports* aSecurityInfo)
                      "This can only be called when we don't have a security info object already");
   MOZ_RELEASE_ASSERT(aSecurityInfo,
                      "This can only be called with a valid security info object");
-  MOZ_RELEASE_ASSERT(ShouldIntercept(),
-                     "This can only be called on channels that can be intercepted");
   mSecurityInfo = aSecurityInfo;
   return NS_OK;
 }
@@ -687,8 +674,6 @@ nsJARChannel::OverrideURI(nsIURI* aRedirectedURI)
 {
   MOZ_RELEASE_ASSERT(mLoadFlags & LOAD_REPLACE,
                      "This can only happen if the LOAD_REPLACE flag is set");
-  MOZ_RELEASE_ASSERT(ShouldIntercept(),
-                     "This can only be called on channels that can be intercepted");
   mAppURI = aRedirectedURI;
 }
 
@@ -867,76 +852,6 @@ nsJARChannel::Open2(nsIInputStream** aStream)
     return Open(aStream);
 }
 
-bool
-nsJARChannel::BypassServiceWorker() const
-{
-  return mLoadFlags & LOAD_BYPASS_SERVICE_WORKER;
-}
-
-bool
-nsJARChannel::ShouldIntercept()
-{
-    LOG(("nsJARChannel::ShouldIntercept [this=%x]\n", this));
-    // We only intercept app:// requests
-    if (!mAppURI) {
-      return false;
-    }
-
-    nsCOMPtr<nsINetworkInterceptController> controller;
-    NS_QueryNotificationCallbacks(mCallbacks, mLoadGroup,
-                                  NS_GET_IID(nsINetworkInterceptController),
-                                  getter_AddRefs(controller));
-    bool shouldIntercept = false;
-    if (controller && !BypassServiceWorker() && mLoadInfo) {
-      nsresult rv = controller->ShouldPrepareForIntercept(mAppURI,
-                                                          nsContentUtils::IsNonSubresourceRequest(this),
-                                                          &shouldIntercept);
-      NS_ENSURE_SUCCESS(rv, false);
-    }
-
-    return shouldIntercept;
-}
-
-void nsJARChannel::ResetInterception()
-{
-    LOG(("nsJARChannel::ResetInterception [this=%x]\n", this));
-
-    // Continue with the original request.
-    nsresult rv = ContinueAsyncOpen();
-    NS_ENSURE_SUCCESS_VOID(rv);
-}
-
-void
-nsJARChannel::OverrideWithSynthesizedResponse(nsIInputStream* aSynthesizedInput,
-                                              const nsACString& aContentType)
-{
-    // In our current implementation, the FetchEvent handler will copy the
-    // response stream completely into the pipe backing the input stream so we
-    // can treat the available as the length of the stream.
-    uint64_t available;
-    nsresult rv = aSynthesizedInput->Available(&available);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      mSynthesizedStreamLength = -1;
-    } else {
-      mSynthesizedStreamLength = int64_t(available);
-    }
-
-    rv = nsInputStreamPump::Create(getter_AddRefs(mSynthesizedResponsePump),
-                                   aSynthesizedInput,
-                                   int64_t(-1), int64_t(-1), 0, 0, true);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      aSynthesizedInput->Close();
-      return;
-    }
-
-    SetContentType(aContentType);
-
-    FinishAsyncOpen();
-
-    rv = mSynthesizedResponsePump->AsyncRead(this, nullptr);
-    NS_ENSURE_SUCCESS_VOID(rv);
-}
-
 NS_IMETHODIMP
 nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx)
 {
@@ -963,48 +878,6 @@ nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx)
     mListenerContext = ctx;
     mIsPending = true;
 
-// Bug 1171651 -  Disable the interception of app:// URIs in service workers
-//                on release builds
-#ifndef RELEASE_BUILD
-    // Check if this channel should intercept the network request and prepare
-    // for a possible synthesized response instead.
-    if (ShouldIntercept()) {
-      nsCOMPtr<nsINetworkInterceptController> controller;
-      NS_QueryNotificationCallbacks(mCallbacks, mLoadGroup,
-                                    NS_GET_IID(nsINetworkInterceptController),
-                                    getter_AddRefs(controller));
-
-      RefPtr<InterceptedJARChannel> intercepted =
-        new InterceptedJARChannel(this, controller);
-      intercepted->NotifyController();
-
-      // We get the JAREntry so we can infer the content type later in case
-      // that it isn't provided along with the synthesized response.
-      nsresult rv = mJarURI->GetJAREntry(mJarEntry);
-      if (NS_FAILED(rv)) {
-          return rv;
-      }
-
-      return NS_OK;
-    }
-#endif
-
-    return ContinueAsyncOpen();
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncOpen2(nsIStreamListener *aListener)
-{
-  nsCOMPtr<nsIStreamListener> listener = aListener;
-  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return AsyncOpen(listener, nullptr);
-}
-
-nsresult
-nsJARChannel::ContinueAsyncOpen()
-{
-    LOG(("nsJARChannel::ContinueAsyncOpen [this=%x]\n", this));
     nsresult rv = LookupFile(true);
     if (NS_FAILED(rv)) {
         mIsPending = false;
@@ -1059,19 +932,21 @@ nsJARChannel::ContinueAsyncOpen()
         return rv;
     }
 
-
-    FinishAsyncOpen();
-
-    return NS_OK;
-}
-
-void
-nsJARChannel::FinishAsyncOpen()
-{
     if (mLoadGroup)
         mLoadGroup->AddRequest(this, nullptr);
 
     mOpened = true;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsJARChannel::AsyncOpen2(nsIStreamListener *aListener)
+{
+  nsCOMPtr<nsIStreamListener> listener = aListener;
+  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return AsyncOpen(listener, nullptr);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/modules/libjar/nsJARChannel.h b/modules/libjar/nsJARChannel.h
index 8c5d6f6ab6..f78d34c7b5 100644
--- a/modules/libjar/nsJARChannel.h
+++ b/modules/libjar/nsJARChannel.h
@@ -10,7 +10,6 @@
 #include "nsIJARChannel.h"
 #include "nsIJARURI.h"
 #include "nsIInputStreamPump.h"
-#include "InterceptedJARChannel.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIProgressEventSink.h"
 #include "nsIStreamListener.h"
@@ -30,12 +29,6 @@
 class nsJARInputThunk;
 class nsInputStreamPump;
 
-namespace mozilla {
-namespace net {
-  class InterceptedJARChannel;
-} // namespace net
-} // namespace mozilla
-
 //-----------------------------------------------------------------------------
 
 class nsJARChannel final : public nsIJARChannel
@@ -80,23 +73,6 @@ private:
                                     mozilla::net::MemoryDownloader::Data aData)
         override;
 
-    bool BypassServiceWorker() const;
-
-    // Returns true if this channel should intercept the network request and
-    // prepare for a possible synthesized response instead.
-    bool ShouldIntercept();
-
-    nsresult ContinueAsyncOpen();
-    void FinishAsyncOpen();
-
-    // Discard the prior interception and continue with the original network
-    // request.
-    void ResetInterception();
-    // Override this channel's pending response with a synthesized one. The
-    // content will be asynchronously read from the pump.
-    void OverrideWithSynthesizedResponse(nsIInputStream* aSynthesizedInput,
-                                         const nsACString& aContentType);
-
     nsCString                       mSpec;
 
     bool                            mOpened;
@@ -135,12 +111,8 @@ private:
     nsCString                       mJarEntry;
     nsCString                       mInnerJarEntry;
 
-    RefPtr<nsInputStreamPump>     mSynthesizedResponsePump;
-    int64_t                         mSynthesizedStreamLength;
-
     // True if this channel should not download any remote files.
     bool                            mBlockRemoteFiles;
-    friend class mozilla::net::InterceptedJARChannel;
 };
 
 #endif // nsJARChannel_h__
diff --git a/modules/libjar/nsZipArchive.h b/modules/libjar/nsZipArchive.h
index 73a524e991..d29325b67b 100644
--- a/modules/libjar/nsZipArchive.h
+++ b/modules/libjar/nsZipArchive.h
@@ -27,7 +27,7 @@
   __except(GetExceptionCode()==EXCEPTION_IN_PAGE_ERROR ?            \
            EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)   \
   {                                                                 \
-    NS_WARNING("EXCEPTION_IN_PAGE_ERROR in " __FUNCTION__);         \
+    NS_WARNING("unexpected EXCEPTION_IN_PAGE_ERROR");               \
     cmd;                                                            \
   }
 #else
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 840a0784d4..5ca5b20b48 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -798,8 +798,7 @@ pref("canvas.hitregions.enabled", false);
 pref("canvas.filters.enabled", false);
 // Add support for canvas path objects
 pref("canvas.path.enabled", true);
-// captureStream() on canvas disabled by default
-pref("canvas.capturestream.enabled", false);
+pref("canvas.capturestream.enabled", true);
 
 // We want the ability to forcibly disable platform a11y, because
 // some non-a11y-related components attempt to bring it up.  See bug
@@ -5037,8 +5036,12 @@ pref("dom.browserElement.maxScreenshotDelayMS", 2000);
 // Whether we should show the placeholder when the element is focused but empty.
 pref("dom.placeholder.show_on_focus", true);
 
-// VR is disabled by default
+// VR is disabled by default in release and enabled for nightly and aurora
+#ifdef RELEASE_BUILD
 pref("dom.vr.enabled", false);
+#else
+pref("dom.vr.enabled", true);
+#endif
 // Oculus > 0.5
 pref("dom.vr.oculus.enabled", true);
 // Oculus <= 0.5; will only trigger if > 0.5 is not used or found
@@ -5046,7 +5049,7 @@ pref("dom.vr.oculus050.enabled", true);
 // Cardboard VR device is disabled by default
 pref("dom.vr.cardboard.enabled", false);
 // 0 = never; 1 = only if real devices aren't there; 2 = always
-pref("dom.vr.add-test-devices", 1);
+pref("dom.vr.add-test-devices", 0);
 // Pose prediction reduces latency effects by returning future predicted HMD
 // poses to callers of the WebVR API.  This currently only has an effect for
 // Oculus Rift on SDK 0.8 or greater.  It is disabled by default for now due to
diff --git a/netwerk/protocol/app/AppProtocolHandler.cpp b/netwerk/protocol/app/AppProtocolHandler.cpp
index 0c7b40cb63..a7291a8a58 100644
--- a/netwerk/protocol/app/AppProtocolHandler.cpp
+++ b/netwerk/protocol/app/AppProtocolHandler.cpp
@@ -15,6 +15,7 @@
 #include "nsXULAppAPI.h"
 #include "nsPrincipal.h"
 #include "nsContentSecurityManager.h"
+#include "nsContentUtils.h"
 
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/Preferences.h"
diff --git a/testing/eslint-plugin-mozilla/docs/import-browserjs-globals.rst b/testing/eslint-plugin-mozilla/docs/import-browserjs-globals.rst
new file mode 100644
index 0000000000..ce6d44d32b
--- /dev/null
+++ b/testing/eslint-plugin-mozilla/docs/import-browserjs-globals.rst
@@ -0,0 +1,12 @@
+.. _import-browserjs-globals:
+
+========================
+import-browserjs-globals
+========================
+
+Rule Details
+------------
+
+When included files from the main browser UI scripts will be loaded and any
+declared globals will be defined for the current file. This is mostly useful for
+browser-chrome mochitests that call browser functions.
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
new file mode 100644
index 0000000000..d6b65a7a67
--- /dev/null
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
@@ -0,0 +1,83 @@
+/**
+ * @fileoverview Import globals from browser.js.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+"use strict";
+
+// -----------------------------------------------------------------------------
+// Rule Definition
+// -----------------------------------------------------------------------------
+
+var fs = require("fs");
+var path = require("path");
+var helpers = require("../helpers");
+
+const SCRIPTS = [
+  //"browser/base/content/nsContextMenu.js",
+  "toolkit/content/contentAreaUtils.js",
+  "browser/components/places/content/editBookmarkOverlay.js",
+  "toolkit/components/printing/content/printUtils.js",
+  "toolkit/content/viewZoomOverlay.js",
+  "browser/components/places/content/browserPlacesViews.js",
+  "browser/base/content/browser.js",
+  "browser/components/downloads/content/downloads.js",
+  "browser/components/downloads/content/indicator.js",
+  "browser/components/customizableui/content/panelUI.js",
+  "toolkit/obsolete/content/inlineSpellCheckUI.js",
+  "toolkit/components/viewsource/content/viewSourceUtils.js",
+  "browser/base/content/browser-addons.js",
+  "browser/base/content/browser-ctrlTab.js",
+  "browser/base/content/browser-customization.js",
+  "browser/base/content/browser-devedition.js",
+  "browser/base/content/browser-eme.js",
+  "browser/base/content/browser-feeds.js",
+  "browser/base/content/browser-fullScreen.js",
+  "browser/base/content/browser-fullZoom.js",
+  "browser/base/content/browser-gestureSupport.js",
+  "browser/base/content/browser-places.js",
+  "browser/base/content/browser-plugins.js",
+  "browser/base/content/browser-refreshblocker.js",
+  "browser/base/content/browser-safebrowsing.js",
+  "browser/base/content/browser-sidebar.js",
+  "browser/base/content/browser-social.js",
+  "browser/base/content/browser-syncui.js",
+  "browser/base/content/browser-tabsintitlebar.js",
+  "browser/base/content/browser-thumbnails.js",
+  "browser/base/content/browser-trackingprotection.js",
+  "browser/base/content/browser-data-submission-info-bar.js",
+  "browser/base/content/browser-fxaccounts.js"
+];
+
+module.exports = function(context) {
+  return {
+    Program: function(node) {
+      if (!helpers.getIsBrowserMochitest(this) &&
+          !helpers.getIsHeadFile(this)) {
+        return;
+      }
+
+      let root = helpers.getRootDir(context);
+      for (let script of SCRIPTS) {
+        let fileName = path.join(root, script);
+        try {
+          let globals = helpers.getGlobalsForFile(fileName);
+          helpers.addGlobals(globals, context);
+        }
+        catch (e) {
+          context.report(
+            node,
+            "Could not load globals from file {{filePath}}: {{error}}",
+            {
+              filePath: path.relative(root, fileName),
+              error: e
+            }
+          );
+        }
+      }
+    }
+  };
+};
diff --git a/testing/mochitest/tests/Harness_sanity/empty.js b/testing/mochitest/tests/Harness_sanity/empty.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/testing/mochitest/tests/Harness_sanity/mochitest.ini b/testing/mochitest/tests/Harness_sanity/mochitest.ini
index 104e7fe274..113a307eec 100644
--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -8,6 +8,10 @@ skip-if = true #depends on fix for bug 1048446
 [test_sanityException.html]
 [test_sanityException2.html]
 [test_sanityParams.html]
+[test_sanityRegisteredServiceWorker.html]
+support-files = empty.js
+[test_sanityRegisteredServiceWorker2.html]
+support-files = empty.js
 [test_sanityWindowSnapshot.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_SpecialPowersExtension.html]
diff --git a/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker.html b/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker.html
new file mode 100644
index 0000000000..277485b75f
--- /dev/null
+++ b/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test that service worker registrations not cleaned up in mochitests cause failures</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+</head>
+<body>
+<script>
+SimpleTest.waitForExplicitFinish();
+SimpleTest.expectRegisteredServiceWorker();
+SpecialPowers.pushPrefEnv({"set": [
+  ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+  ["dom.serviceWorkers.interception.enabled", true],
+  ["dom.serviceWorkers.enabled", true],
+  ["dom.serviceWorkers.testing.enabled", true]
+]}, function() {
+  navigator.serviceWorker.register("empty.js", {scope: "scope"})
+    .then(function(registration) {
+      ok(registration, "Registration succeeded");
+      SimpleTest.finish();
+    });
+});
+</script>
+</body>
+</html>
diff --git a/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker2.html b/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker2.html
new file mode 100644
index 0000000000..468b948a44
--- /dev/null
+++ b/testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker2.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test that service worker registrations not cleaned up in mochitests cause failures</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+</head>
+<body>
+<script>
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({"set": [
+  ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+  ["dom.serviceWorkers.interception.enabled", true],
+  ["dom.serviceWorkers.enabled", true],
+  ["dom.serviceWorkers.testing.enabled", true]
+]}, function() {
+  navigator.serviceWorker.getRegistration("scope")
+    .then(function(registration) {
+      ok(registration, "Registration successfully obtained");
+      return registration.unregister();
+    }).then(function() {
+      SimpleTest.finish();
+    });
+});
+</script>
+</body>
+</html>
diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index 70b8e5e18a..e9a56eef49 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -1021,6 +1021,15 @@ SimpleTest.finish = function() {
                                + "SimpleTest.waitForExplicitFinish() if you need "
                                + "it.)");
         }
+        if (SimpleTest._expectingRegisteredServiceWorker) {
+            if (!SpecialPowers.isServiceWorkerRegistered()) {
+                SimpleTest.ok(false, "This test is expected to leave a service worker registered");
+            }
+        } else {
+            if (SpecialPowers.isServiceWorkerRegistered()) {
+                SimpleTest.ok(false, "This test left a service worker registered without cleaning it up");
+            }
+        }
 
         if (parentRunner) {
             /* We're running in an iframe, and the parent has a TestRunner */
@@ -1241,6 +1250,14 @@ SimpleTest.isIgnoringAllUncaughtExceptions = function () {
     return SimpleTest._ignoringAllUncaughtExceptions;
 };
 
+/**
+ * Indicates to the test framework that this test is expected to leave a
+ * service worker registered when it finishes.
+ */
+SimpleTest.expectRegisteredServiceWorker = function () {
+    SimpleTest._expectingRegisteredServiceWorker = true;
+};
+
 /**
  * Resets any state this SimpleTest object has.  This is important for
  * browser chrome mochitests, which reuse the same SimpleTest object
@@ -1249,6 +1266,7 @@ SimpleTest.isIgnoringAllUncaughtExceptions = function () {
 SimpleTest.reset = function () {
     SimpleTest._ignoringAllUncaughtExceptions = false;
     SimpleTest._expectingUncaughtException = false;
+    SimpleTest._expectingRegisteredServiceWorker = false;
     SimpleTest._bufferedMessages = [];
 };
 
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index fa905fdfa5..ea52eb1e4d 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -283,7 +283,6 @@ user_pref("browser.search.countryCode", "US");
 user_pref("browser.selfsupport.url", "https://%(server)s/selfsupport-dummy/");
 
 user_pref("media.eme.enabled", true);
-user_pref("media.eme.apiVisible", true);
 
 #if defined(XP_WIN)
 user_pref("media.decoder.heuristic.dormant.timeout", 0);
diff --git a/testing/specialpowers/content/specialpowers.js b/testing/specialpowers/content/specialpowers.js
index 1e0e0714b8..fe09d04cb1 100644
--- a/testing/specialpowers/content/specialpowers.js
+++ b/testing/specialpowers/content/specialpowers.js
@@ -220,6 +220,12 @@ SpecialPowers.prototype.nestedFrameSetup = function() {
   }, "remote-browser-shown", false);
 };
 
+SpecialPowers.prototype.isServiceWorkerRegistered = function() {
+  var swm = Components.classes["@mozilla.org/serviceworkers/manager;1"]
+                      .getService(Components.interfaces.nsIServiceWorkerManager);
+  return swm.getAllRegistrations().length != 0;
+};
+
 // Attach our API to the window.
 function attachSpecialPowersToWindow(aWindow) {
   try {
diff --git a/testing/web-platform/meta/IndexedDB/interfaces.worker.js.ini b/testing/web-platform/meta/IndexedDB/interfaces.worker.js.ini
index 7a5477f39d..6b87d141aa 100644
--- a/testing/web-platform/meta/IndexedDB/interfaces.worker.js.ini
+++ b/testing/web-platform/meta/IndexedDB/interfaces.worker.js.ini
@@ -2,19 +2,3 @@
   type: testharness
   [WorkerUtils interface: attribute indexedDB]
     expected: FAIL
-
-  [IDBCursorWithValue interface: existence and properties of interface object]
-    expected: FAIL
-
-  [IDBCursorWithValue interface object length]
-    expected: FAIL
-
-  [IDBCursorWithValue interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [IDBCursorWithValue interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [IDBCursorWithValue interface: attribute value]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/dom/historical.html.ini b/testing/web-platform/meta/dom/historical.html.ini
index a642e999f6..52decf4acc 100644
--- a/testing/web-platform/meta/dom/historical.html.ini
+++ b/testing/web-platform/meta/dom/historical.html.ini
@@ -9,9 +9,6 @@
   [Historical DOM features must be removed: createCDATASection]
     expected: FAIL
 
-  [DocumentType member must be nuked: internalSubset]
-    expected: FAIL
-
   [Node member must be nuked: namespaceURI]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-03.html.ini b/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-03.html.ini
deleted file mode 100644
index 243eb5ef85..0000000000
--- a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-03.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[document.title-03.html]
-  type: testharness
-  [ document.title  and space normalization  ]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-04.xhtml.ini b/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-04.xhtml.ini
deleted file mode 100644
index 03f4e66254..0000000000
--- a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-04.xhtml.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[document.title-04.xhtml]
-  type: testharness
-  [ document.title  and space normalization  ]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini b/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini
deleted file mode 100644
index 841e7805dc..0000000000
--- a/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[document.title-07.html]
-  type: testharness
-  [createHTMLDocument test 6: "foo\\f\\fbar baz","foo\\f\\fbar baz","foo bar baz"]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/the-option-element/option-text-spaces.html.ini b/testing/web-platform/meta/html/semantics/forms/the-option-element/option-text-spaces.html.ini
deleted file mode 100644
index f29529ca20..0000000000
--- a/testing/web-platform/meta/html/semantics/forms/the-option-element/option-text-spaces.html.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-[option-text-spaces.html]
-  type: testharness
-  [option.text should strip leading space characters ("\\f")]
-    expected: FAIL
-
-  [option.text should strip trailing space characters ("\\f")]
-    expected: FAIL
-
-  [option.text should strip leading and trailing space characters ("\\f")]
-    expected: FAIL
-
-  [option.text should replace single internal space characters ("\\f")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters (" ", "\\f")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\t", "\\f")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\n", "\\f")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\f", " ")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\f", "\\t")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\f", "\\n")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\f", "\\f")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\f", "\\r")]
-    expected: FAIL
-
-  [option.text should replace multiple internal space characters ("\\r", "\\f")]
-    expected: FAIL
-
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini
deleted file mode 100644
index 790e1fe402..0000000000
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[update.https.html]
-  type: testharness
-  [Update a registration on ServiceWorkerGlobalScope]
-    expected: FAIL
-
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
index e5da8f09fe..2402f8e510 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
@@ -1,2 +1,3 @@
 [update-after-oneday.https.html]
+  type: testharness
   prefs: [dom.serviceWorkers.testUpdateOverOneDay: true]
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/clients-get.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/clients-get.https.html
index 848c2a9e35..af38502dd9 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/clients-get.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/clients-get.https.html
@@ -7,9 +7,10 @@
 <script>
 var host_info = get_host_info();
 
-var scope = 'resources/blank.html?clients-get';
+var scope = 'resources/clients-get-frame.html';
 var t = async_test('Test Clients.get()');
 var clientIds = [];
+var frame;
 t.step(function() {
     service_worker_unregister_and_register(
         t, 'resources/clients-get-worker.js', scope)
@@ -20,21 +21,38 @@ t.step(function() {
           return with_iframe(scope + '#1');
         })
       .then(function(frame1) {
-          clientIds.push(frame1.contentDocument.body.textContent);
           frame1.focus();
+          return wait_for_clientId();
+        })
+      .then(function(clientId) {
+          clientIds.push(clientId);
           return with_iframe(scope + '#2');
         })
       .then(function(frame2) {
-          clientIds.push(frame2.contentDocument.body.textContent);
+          frame = frame2;
+          return wait_for_clientId();
+        })
+      .then(function(clientId) {
+          clientIds.push(clientId);
           var channel = new MessageChannel();
           channel.port1.onmessage = t.step_func(on_message);
-          frame2.contentWindow.navigator.serviceWorker.controller.postMessage(
+          frame.contentWindow.navigator.serviceWorker.controller.postMessage(
               {port:channel.port2, clientIds:clientIds,
                message: 'get_client_ids'}, [channel.port2]);
         })
       .catch(unreached_rejection(t));
   });
 
+function wait_for_clientId() {
+  return new Promise(function(resolve, reject) {
+      function get_client_id(e) {
+        window.removeEventListener("message", get_client_id);
+        resolve(e.data.clientId);
+      }
+      window.addEventListener("message", get_client_id, false);
+    });
+}
+
 var expected = [
     /* visibilityState, focused, url, frameType */
     ['visible', true, new URL(scope + '#1', location).toString(), 'nested'],
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-event.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-event.https.html
index cd13df313d..dc0dba38a5 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-event.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-event.https.html
@@ -71,7 +71,6 @@ async_test(function(t) {
 async_test(function(t) {
     var scope = 'resources/simple.html?clientId';
     var frame;
-    var initial_client_id;
     service_worker_unregister_and_register(t, worker, scope)
       .then(function(reg) {
           return wait_for_state(t, reg.installing, 'activated');
@@ -80,10 +79,9 @@ async_test(function(t) {
       .then(function(f) {
           frame = f;
           assert_equals(
-            frame.contentDocument.body.textContent.substr(0, 15),
-            'Client ID Found',
+            frame.contentDocument.body.textContent,
+            'Client ID Not Found',
             'Service Worker should respond to fetch with a client id');
-          initial_client_id = frame.contentDocument.body.textContent.substr(17);
           return frame.contentWindow.fetch('resources/other.html?clientId');
         })
       .then(function(response) { return response.text(); })
@@ -93,10 +91,6 @@ async_test(function(t) {
             response_text.substr(0, 15),
             'Client ID Found',
             'Service Worker should respond to fetch with an existing client id');
-          assert_equals(
-            initial_client_id,
-            new_client_id,
-            'Service Worker should observe the correct client ID for a controlled document');
           frame.remove();
           return service_worker_unregister_and_done(t, scope);
         })
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-frame.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-frame.html
new file mode 100644
index 0000000000..27143d4b99
--- /dev/null
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-frame.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script>
+
+  fetch("clientId")
+    .then(function(response) {
+        return response.text();
+      })
+    .then(function(text) {
+        parent.postMessage({clientId: text}, "*");
+      });
+
+</script>
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-worker.js b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-worker.js
index 48ad770934..9ac2c22645 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-worker.js
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/clients-get-worker.js
@@ -1,4 +1,12 @@
 self.onfetch = function(e) {
+  if (e.request.url.indexOf("clients-get-frame.html") >= 0) {
+    if (e.clientId === null) {
+      e.respondWith(fetch(e.request));
+    } else {
+      e.respondWith(Response.error());
+    }
+    return;
+  }
   e.respondWith(new Response(e.clientId));
 };
 
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-event-test-worker.js b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-event-test-worker.js
index b56602e0fa..1443681f41 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-event-test-worker.js
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-event-test-worker.js
@@ -13,7 +13,7 @@ function handleReferrer(event) {
 
 function handleClientId(event) {
   var body;
-  if (event.clientId !== '') {
+  if (event.clientId !== null) {
     body = 'Client ID Found: ' + event.clientId;
   } else {
     body = 'Client ID Not Found';
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/interfaces-worker.sub.js b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/interfaces-worker.sub.js
index 9c97319d43..2ed7ef4bdf 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/interfaces-worker.sub.js
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/interfaces-worker.sub.js
@@ -71,36 +71,36 @@ promise_test(function(t) {
   }, 'Cache');
 
 test(function() {
+    var req = new Request('http://{{host}}/',
+                          {method: 'POST',
+                           headers: [['Content-Type', 'Text/Html']]});
     assert_equals(
       new ExtendableEvent('ExtendableEvent').type,
       'ExtendableEvent', 'Type of ExtendableEvent should be ExtendableEvent');
     assert_equals(
-      new FetchEvent('FetchEvent').type,
+      new FetchEvent('FetchEvent', {request: req}).type,
       'FetchEvent', 'Type of FetchEvent should be FetchEvent');
     assert_equals(
-      new FetchEvent('FetchEvent').cancelable,
+      new FetchEvent('FetchEvent', {request: req}).cancelable,
       false, 'Default FetchEvent.cancelable should be false');
     assert_equals(
-      new FetchEvent('FetchEvent').bubbles,
+      new FetchEvent('FetchEvent', {request: req}).bubbles,
       false, 'Default FetchEvent.bubbles should be false');
     assert_equals(
-      new FetchEvent('FetchEvent').clientId,
+      new FetchEvent('FetchEvent', {request: req}).clientId,
       null, 'Default FetchEvent.clientId should be null');
     assert_equals(
-      new FetchEvent('FetchEvent').isReload,
+      new FetchEvent('FetchEvent', {request: req}).isReload,
       false, 'Default FetchEvent.isReload should be false');
     assert_equals(
-      new FetchEvent('FetchEvent', {cancelable: false}).cancelable,
+      new FetchEvent('FetchEvent', {request: req, cancelable: false}).cancelable,
       false, 'FetchEvent.cancelable should be false');
     assert_equals(
-      new FetchEvent('FetchEvent', {clientId : 'test-client-id'}).clientId, 'test-client-id',
+      new FetchEvent('FetchEvent', {request: req, clientId : 'test-client-id'}).clientId, 'test-client-id',
       'FetchEvent.clientId with option {clientId : "test-client-id"} should be "test-client-id"');
     assert_equals(
-      new FetchEvent('FetchEvent', {isReload : true}).isReload, true,
+      new FetchEvent('FetchEvent', {request: req, isReload : true}).isReload, true,
       'FetchEvent.isReload with option {isReload : true} should be true');
-    var req = new Request('http://{{host}}/',
-                          {method: 'POST',
-                           headers: [['Content-Type', 'Text/Html']]});
     assert_equals(
       new FetchEvent('FetchEvent', {request : req, isReload : true}).request.url,
       'http://{{host}}/',
diff --git a/toolkit/components/crashes/CrashManager.jsm b/toolkit/components/crashes/CrashManager.jsm
index f38be87c18..5752d1fb0d 100644
--- a/toolkit/components/crashes/CrashManager.jsm
+++ b/toolkit/components/crashes/CrashManager.jsm
@@ -14,6 +14,7 @@ Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/Timer.jsm", this);
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://services-common/utils.js", this);
+Cu.import("resource://gre/modules/KeyValueParser.jsm");
 
 this.EXPORTED_SYMBOLS = [
   "CrashManager",
@@ -267,19 +268,20 @@ this.CrashManager.prototype = Object.freeze({
                 Cu.reportError("Unhandled crash event file return code. Please " +
                                "file a bug: " + result);
             }
-          } catch (ex if ex instanceof OS.File.Error) {
-            this._log.warn("I/O error reading " + entry.path + ": " +
-                           CommonUtils.exceptionStr(ex));
           } catch (ex) {
-            // We should never encounter an exception. This likely represents
-            // a coding error because all errors should be detected and
-            // converted to return codes.
-            //
-            // If we get here, report the error and delete the source file
-            // so we don't see it again.
-            Cu.reportError("Exception when processing crash event file: " +
-                           CommonUtils.exceptionStr(ex));
-            deletePaths.push(entry.path);
+            if (ex instanceof OS.File.Error) {
+              this._log.warn("I/O error reading " + entry.path, ex);
+            } else {
+              // We should never encounter an exception. This likely represents
+              // a coding error because all errors should be detected and
+              // converted to return codes.
+              //
+              // If we get here, report the error and delete the source file
+              // so we don't see it again.
+              Cu.reportError("Exception when processing crash event file: " +
+                             Log.exceptionStr(ex));
+              deletePaths.push(entry.path);
+            }
           }
         }
 
@@ -292,8 +294,7 @@ this.CrashManager.prototype = Object.freeze({
           try {
             yield OS.File.remove(path);
           } catch (ex) {
-            this._log.warn("Error removing event file (" + path + "): " +
-                           CommonUtils.exceptionStr(ex));
+            this._log.warn("Error removing event file (" + path + ")", ex);
           }
         }
 
@@ -522,11 +523,7 @@ this.CrashManager.prototype = Object.freeze({
           // fall-through
         case "crash.main.2":
           let crashID = lines[0];
-          let metadata = {};
-          for (let i = 1; i < lines.length; i++) {
-            let [key, val] = lines[i].split("=");
-            metadata[key] = val;
-          }
+          let metadata = parseKeyValuePairsFromLines(lines.slice(1));
           store.addCrash(this.PROCESS_TYPE_MAIN, this.CRASH_TYPE_CRASH,
                          crashID, date, metadata);
           break;
@@ -569,8 +566,11 @@ this.CrashManager.prototype = Object.freeze({
     return Task.spawn(function* () {
       try {
         yield OS.File.stat(path);
-      } catch (ex if ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
-          return [];
+      } catch (ex) {
+        if (!(ex instanceof OS.File.Error) || !ex.becauseNoSuchFile) {
+          throw ex;
+        }
+        return [];
       }
 
       let it = new OS.File.DirectoryIterator(path);
@@ -860,16 +860,17 @@ CrashStore.prototype = Object.freeze({
             this._countsByDay.get(day).set(type, count);
           }
         }
-      } catch (ex if ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
-        // Missing files (first use) are allowed.
       } catch (ex) {
-        // If we can't load for any reason, mark a corrupt date in the instance
-        // and swallow the error.
-        //
-        // The marking of a corrupted file is intentionally not persisted to
-        // disk yet. Instead, we wait until the next save(). This is to give
-        // non-permanent failures the opportunity to recover on their own.
-        this._data.corruptDate = new Date();
+        // Missing files (first use) are allowed.
+        if (!(ex instanceof OS.File.Error) || !ex.becauseNoSuchFile) {
+          // If we can't load for any reason, mark a corrupt date in the instance
+          // and swallow the error.
+          //
+          // The marking of a corrupted file is intentionally not persisted to
+          // disk yet. Instead, we wait until the next save(). This is to give
+          // non-permanent failures the opportunity to recover on their own.
+          this._data.corruptDate = new Date();
+        }
       }
     }.bind(this));
   },
diff --git a/toolkit/components/crashmonitor/CrashMonitor.jsm b/toolkit/components/crashmonitor/CrashMonitor.jsm
index a2319886f1..34f4f26d14 100644
--- a/toolkit/components/crashmonitor/CrashMonitor.jsm
+++ b/toolkit/components/crashmonitor/CrashMonitor.jsm
@@ -98,7 +98,10 @@ var CrashMonitorInternal = {
       let data;
       try {
         data = yield OS.File.read(CrashMonitorInternal.path, { encoding: "utf-8" });
-      } catch (ex if ex instanceof OS.File.Error) {
+      } catch (ex) {
+        if (!(ex instanceof OS.File.Error)) {
+          throw ex;
+        }
         if (!ex.becauseNoSuchFile) {
           Cu.reportError("Error while loading crash monitor data: " + ex.toString());
         }
@@ -187,7 +190,7 @@ this.CrashMonitor = {
       // If this is the first time this notification is received,
       // remember it and write it to file
       CrashMonitorInternal.checkpoints[aTopic] = true;
-      Task.spawn(function() {
+      Task.spawn(function* () {
         try {
           let data = JSON.stringify(CrashMonitorInternal.checkpoints);
 
diff --git a/toolkit/components/crashmonitor/test/unit/.eslintrc b/toolkit/components/crashmonitor/test/unit/.eslintrc
new file mode 100644
index 0000000000..8a895f93bd
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "../../../../../testing/xpcshell/xpcshell.eslintrc"
+  ]
+}
diff --git a/toolkit/components/crashmonitor/test/unit/head.js b/toolkit/components/crashmonitor/test/unit/head.js
index 52fd3bb01d..6d7d50d0ca 100644
--- a/toolkit/components/crashmonitor/test/unit/head.js
+++ b/toolkit/components/crashmonitor/test/unit/head.js
@@ -7,7 +7,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm");
 
-let sessionCheckpointsPath;
+var sessionCheckpointsPath;
 
 /**
  * Start the tasks of the different tests
diff --git a/toolkit/components/crashmonitor/test/unit/test_invalid_file.js b/toolkit/components/crashmonitor/test/unit/test_invalid_file.js
index 3ce5e4b36d..cc55a2755a 100644
--- a/toolkit/components/crashmonitor/test/unit/test_invalid_file.js
+++ b/toolkit/components/crashmonitor/test/unit/test_invalid_file.js
@@ -6,7 +6,7 @@
 /**
  * Test with sessionCheckpoints.json containing invalid data
  */
-add_task(function test_invalid_file() {
+add_task(function* test_invalid_file() {
   // Write bogus data to checkpoint file
   let data = "1234";
   yield OS.File.writeAtomic(sessionCheckpointsPath, data,
diff --git a/toolkit/components/crashmonitor/test/unit/test_invalid_json.js b/toolkit/components/crashmonitor/test/unit/test_invalid_json.js
index 4281bed0b2..f3b05208ac 100644
--- a/toolkit/components/crashmonitor/test/unit/test_invalid_json.js
+++ b/toolkit/components/crashmonitor/test/unit/test_invalid_json.js
@@ -6,7 +6,7 @@
 /**
  * Test with sessionCheckpoints.json containing invalid JSON data
  */
-add_task(function test_invalid_file() {
+add_task(function* test_invalid_file() {
   // Write bogus data to checkpoint file
   let data = "[}";
   yield OS.File.writeAtomic(sessionCheckpointsPath, data,
diff --git a/toolkit/components/crashmonitor/test/unit/test_missing_file.js b/toolkit/components/crashmonitor/test/unit/test_missing_file.js
index ed25718832..9ce31da954 100644
--- a/toolkit/components/crashmonitor/test/unit/test_missing_file.js
+++ b/toolkit/components/crashmonitor/test/unit/test_missing_file.js
@@ -6,7 +6,7 @@
 /**
  * Test with non-existing sessionCheckpoints.json
  */
-add_task(function test_missing_file() {
+add_task(function* test_missing_file() {
   CrashMonitor.init();
   let checkpoints = yield CrashMonitor.previousCheckpoints;
   do_check_eq(checkpoints, null);
diff --git a/toolkit/components/crashmonitor/test/unit/test_valid_file.js b/toolkit/components/crashmonitor/test/unit/test_valid_file.js
index 0145226c19..d2f214cc05 100644
--- a/toolkit/components/crashmonitor/test/unit/test_valid_file.js
+++ b/toolkit/components/crashmonitor/test/unit/test_valid_file.js
@@ -6,7 +6,7 @@
 /**
  * Test with sessionCheckpoints.json containing valid data
  */
-add_task(function test_valid_file() {
+add_task(function* test_valid_file() {
   // Write valid data to checkpoint file
   let data = JSON.stringify({"final-ui-startup": true});
   yield OS.File.writeAtomic(sessionCheckpointsPath, data,
diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp
index f03eb8a35c..989f006673 100644
--- a/toolkit/components/downloads/ApplicationReputation.cpp
+++ b/toolkit/components/downloads/ApplicationReputation.cpp
@@ -28,11 +28,12 @@
 #include "nsIX509CertDB.h"
 #include "nsIX509CertList.h"
 
+#include "mozilla/ErrorNames.h"
+#include "mozilla/LoadContext.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/LoadContext.h"
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
@@ -68,6 +69,12 @@ using safe_browsing::ClientDownloadRequest_SignatureInfo;
 #define PREF_DOWNLOAD_BLOCK_TABLE "urlclassifier.downloadBlockTable"
 #define PREF_DOWNLOAD_ALLOW_TABLE "urlclassifier.downloadAllowTable"
 
+// Preferences that are needed to action the verdict.
+#define PREF_BLOCK_DANGEROUS            "browser.safebrowsing.downloads.remote.block_dangerous"
+#define PREF_BLOCK_DANGEROUS_HOST       "browser.safebrowsing.downloads.remote.block_dangerous_host"
+#define PREF_BLOCK_POTENTIALLY_UNWANTED "browser.safebrowsing.downloads.remote.block_potentially_unwanted"
+#define PREF_BLOCK_UNCOMMON             "browser.safebrowsing.downloads.remote.block_uncommon"
+
 // NSPR_LOG_MODULES=ApplicationReputation:5
 PRLogModuleInfo *ApplicationReputationService::prlog = nullptr;
 #define LOG(args) MOZ_LOG(ApplicationReputationService::prlog, mozilla::LogLevel::Debug, args)
@@ -386,6 +393,10 @@ PendingLookup::IsBinaryFile()
        NS_ConvertUTF16toUTF8(fileName).get(), this));
   return
     // From https://code.google.com/p/chromium/codesearch#chromium/src/chrome/common/safe_browsing/download_protection_util.cc&l=14
+    // Archives _may_ contain binaries
+#ifdef XP_WIN // disable on Mac/Linux, see 1167493
+    StringEndsWith(fileName, NS_LITERAL_STRING(".zip")) ||
+#endif
     // Android extensions
     StringEndsWith(fileName, NS_LITERAL_STRING(".apk")) ||
     // Windows extensions
@@ -406,9 +417,7 @@ PendingLookup::IsBinaryFile()
     StringEndsWith(fileName, NS_LITERAL_STRING(".app")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".dmg")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".osx")) ||
-    StringEndsWith(fileName, NS_LITERAL_STRING(".pkg")) ||
-    // Archives _may_ contain binaries
-    StringEndsWith(fileName, NS_LITERAL_STRING(".zip"));
+    StringEndsWith(fileName, NS_LITERAL_STRING(".pkg"));
 }
 
 ClientDownloadRequest::DownloadType
@@ -751,6 +760,13 @@ PendingLookup::DoLookupInternal()
 nsresult
 PendingLookup::OnComplete(bool shouldBlock, nsresult rv)
 {
+  if (NS_FAILED(rv)) {
+    nsAutoCString errorName;
+    mozilla::GetErrorName(rv, errorName);
+    LOG(("Failed sending remote query for application reputation "
+         "[rv = %s, this = %p]", errorName.get(), this));
+  }
+
   if (mTimeoutTimer) {
     mTimeoutTimer->Cancel();
     mTimeoutTimer = nullptr;
@@ -837,8 +853,6 @@ PendingLookup::SendRemoteQuery()
 {
   nsresult rv = SendRemoteQueryInternal();
   if (NS_FAILED(rv)) {
-    LOG(("Failed sending remote query for application reputation "
-         "[this = %p]", this));
     return OnComplete(false, rv);
   }
   // SendRemoteQueryInternal has fired off the query and we call OnComplete in
@@ -858,27 +872,34 @@ PendingLookup::SendRemoteQueryInternal()
   nsCString serviceUrl;
   NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_SB_APP_REP_URL, &serviceUrl),
                     NS_ERROR_NOT_AVAILABLE);
-  if (serviceUrl.EqualsLiteral("")) {
+  if (serviceUrl.IsEmpty()) {
     LOG(("Remote lookup URL is empty [this = %p]", this));
     return NS_ERROR_NOT_AVAILABLE;
   }
 
   // If the blocklist or allowlist is empty (so we couldn't do local lookups),
   // bail
-  nsCString table;
-  NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_DOWNLOAD_BLOCK_TABLE, &table),
-                    NS_ERROR_NOT_AVAILABLE);
-  if (table.EqualsLiteral("")) {
-    LOG(("Blocklist is empty [this = %p]", this));
-    return NS_ERROR_NOT_AVAILABLE;
+  {
+    nsAutoCString table;
+    NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_DOWNLOAD_BLOCK_TABLE,
+                                              &table),
+                      NS_ERROR_NOT_AVAILABLE);
+    if (table.IsEmpty()) {
+      LOG(("Blocklist is empty [this = %p]", this));
+      return NS_ERROR_NOT_AVAILABLE;
+    }
   }
 #ifdef XP_WIN
   // The allowlist is only needed to do signature verification on Windows
-  NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_DOWNLOAD_ALLOW_TABLE, &table),
-                    NS_ERROR_NOT_AVAILABLE);
-  if (table.EqualsLiteral("")) {
-    LOG(("Allowlist is empty [this = %p]", this));
-    return NS_ERROR_NOT_AVAILABLE;
+  {
+    nsAutoCString table;
+    NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_DOWNLOAD_ALLOW_TABLE,
+                                              &table),
+                      NS_ERROR_NOT_AVAILABLE);
+    if (table.IsEmpty()) {
+      LOG(("Allowlist is empty [this = %p]", this));
+      return NS_ERROR_NOT_AVAILABLE;
+    }
   }
 #endif
 
@@ -951,7 +972,7 @@ PendingLookup::SendRemoteQueryInternal()
                         nullptr, // aLoadingNode
                         nsContentUtils::GetSystemPrincipal(),
                         nullptr, // aTriggeringPrincipal
-                        nsILoadInfo::SEC_NORMAL,
+                        nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                         nsIContentPolicy::TYPE_OTHER,
                         getter_AddRefs(mChannel));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -979,7 +1000,7 @@ PendingLookup::SendRemoteQueryInternal()
   mTimeoutTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
   mTimeoutTimer->InitWithCallback(this, timeoutMs, nsITimer::TYPE_ONE_SHOT);
 
-  rv = mChannel->AsyncOpen(this, nullptr);
+  rv = mChannel->AsyncOpen2(this);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -1082,8 +1103,6 @@ PendingLookup::OnStopRequestInternal(nsIRequest *aRequest,
     return NS_ERROR_CANNOT_CONVERT_DATA;
   }
 
-  // There are several more verdicts, but we only respect DANGEROUS and
-  // DANGEROUS_HOST for now and treat everything else as SAFE.
   Accumulate(mozilla::Telemetry::APPLICATION_REPUTATION_SERVER,
     SERVER_RESPONSE_VALID);
   // Clamp responses 0-7, we only know about 0-4 for now.
@@ -1091,10 +1110,19 @@ PendingLookup::OnStopRequestInternal(nsIRequest *aRequest,
     std::min<uint32_t>(response.verdict(), 7));
   switch(response.verdict()) {
     case safe_browsing::ClientDownloadResponse::DANGEROUS:
+      *aShouldBlock = Preferences::GetBool(PREF_BLOCK_DANGEROUS, true);
+      break;
     case safe_browsing::ClientDownloadResponse::DANGEROUS_HOST:
-      *aShouldBlock = true;
+      *aShouldBlock = Preferences::GetBool(PREF_BLOCK_DANGEROUS_HOST, true);
+      break;
+    case safe_browsing::ClientDownloadResponse::POTENTIALLY_UNWANTED:
+      *aShouldBlock = Preferences::GetBool(PREF_BLOCK_POTENTIALLY_UNWANTED, false);
+      break;
+    case safe_browsing::ClientDownloadResponse::UNCOMMON:
+      *aShouldBlock = Preferences::GetBool(PREF_BLOCK_UNCOMMON, false);
       break;
     default:
+      // Treat everything else as safe
       break;
   }
 
diff --git a/toolkit/components/downloads/ApplicationReputation.h b/toolkit/components/downloads/ApplicationReputation.h
new file mode 100644
index 0000000000..7ae0208a6b
--- /dev/null
+++ b/toolkit/components/downloads/ApplicationReputation.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef ApplicationReputation_h__
+#define ApplicationReputation_h__
+
+#include "nsIApplicationReputation.h"
+#include "nsIRequestObserver.h"
+#include "nsIStreamListener.h"
+#include "nsISupports.h"
+
+#include "nsCOMPtr.h"
+#include "nsString.h"
+
+class nsIRequest;
+class PendingDBLookup;
+class PendingLookup;
+struct PRLogModuleInfo;
+
+class ApplicationReputationService final :
+  public nsIApplicationReputationService {
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIAPPLICATIONREPUTATIONSERVICE
+
+public:
+  static ApplicationReputationService* GetSingleton();
+
+private:
+  friend class PendingLookup;
+  friend class PendingDBLookup;
+  /**
+   * Global singleton object for holding this factory service.
+   */
+  static ApplicationReputationService* gApplicationReputationService;
+  /**
+   * NSPR_LOG_MODULES=ApplicationReputation:5
+   */
+  static PRLogModuleInfo* prlog;
+  /**
+   * This is a singleton, so disallow construction.
+   */
+  ApplicationReputationService();
+  ~ApplicationReputationService();
+  /**
+   * Wrapper function for QueryReputation that makes it easier to ensure the
+   * callback is called.
+   */
+  nsresult QueryReputationInternal(nsIApplicationReputationQuery* aQuery,
+                                   nsIApplicationReputationCallback* aCallback);
+};
+#endif /* ApplicationReputation_h__ */
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
index 08e769be2c..8f853d947b 100644
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -4,12 +4,26 @@
 # 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/.
 
+with Files('*'):
+    BUG_COMPONENT = ('Toolkit', 'Download Manager')
+
+with Files('ApplicationReputation.*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+with Files('csd.pb.*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+with Files('generate_csd.sh'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+with Files('nsIApplicationReputation.idl'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 if not CONFIG['MOZ_JSDOWNLOADS']:
     XPCSHELL_TESTS_MANIFESTS += ['test/schema_migration/xpcshell.ini']
     BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
-    MOCHITEST_MANIFESTS += ['test/browser/mochitest.ini']
 
 XPIDL_SOURCES += [
     'nsIApplicationReputation.idl',
@@ -30,6 +44,12 @@ SOURCES += [
     'SQLFunctions.cpp',
 ]
 
+if CONFIG['MOZ_URL_CLASSIFIER']:
+    UNIFIED_SOURCES += [
+        'ApplicationReputation.cpp',
+        'csd.pb.cc'
+    ]
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     # Can't build unified because we need CreateEvent which some IPC code
     # included in LoadContext ends up undefining.
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index 22bffb8d0f..f344a49708 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -1,7 +1,6 @@
-# -*- indent-tabs-mode: nil; js-indent-level: 2 -*- 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -23,6 +22,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
+                                  "resource://gre/modules/Deprecated.jsm");
+
 var ContentAreaUtils = {
 
   // this is for backwards compatibility.
@@ -98,16 +100,69 @@ function saveURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache,
 const imgICache = Components.interfaces.imgICache;
 const nsISupportsCString = Components.interfaces.nsISupportsCString;
 
+/**
+ * Offers to save an image URL to the file system.
+ *
+ * @param aURL (string)
+ *        The URL of the image to be saved.
+ * @param aFileName (string)
+ *        The suggested filename for the saved file.
+ * @param aFilePickerTitleKey (string, optional)
+ *        Localized string key for an alternate title for the file
+ *        picker. If set to null, this will default to something sensible.
+ * @param aShouldBypassCache (bool)
+ *        If true, the image will always be retrieved from the server instead
+ *        of the network or image caches.
+ * @param aSkipPrompt (bool)
+ *        If true, we will attempt to save the file with the suggested
+ *        filename to the default downloads folder without showing the
+ *        file picker.
+ * @param aReferrer (nsIURI, optional)
+ *        The referrer URI object (not a URL string) to use, or null
+ *        if no referrer should be sent.
+ * @param aDoc (nsIDocument, deprecated, optional)
+ *        The content document that the save is being initiated from. If this
+ *        is omitted, then aIsContentWindowPrivate must be provided.
+ * @param aContentType (string, optional)
+ *        The content type of the image.
+ * @param aContentDisp (string, optional)
+ *        The content disposition of the image.
+ * @param aIsContentWindowPrivate (bool)
+ *        Whether or not the containing window is in private browsing mode.
+ *        Does not need to be provided is aDoc is passed.
+ */
 function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache,
-                      aSkipPrompt, aReferrer, aDoc)
+                      aSkipPrompt, aReferrer, aDoc, aContentType, aContentDisp,
+                      aIsContentWindowPrivate)
 {
   forbidCPOW(aURL, "saveImageURL", "aURL");
   forbidCPOW(aReferrer, "saveImageURL", "aReferrer");
-  // Allow aSourceDocument to be a CPOW.
 
   var contentType = null;
   var contentDisposition = null;
-  if (!aShouldBypassCache) {
+  if (aDoc && aIsContentWindowPrivate == undefined) {
+    if (Components.utils.isCrossProcessWrapper(aDoc)) {
+      Deprecated.warning("saveImageURL should not be passed document CPOWs. " +
+                         "The caller should pass in the content type and " +
+                         "disposition themselves",
+                         "https://bugzilla.mozilla.org/show_bug.cgi?id=1243643");
+    }
+    // This will definitely not work for in-browser code or multi-process compatible
+    // add-ons due to bug 1233497, which makes unsafe CPOW usage throw by default.
+    Deprecated.warning("saveImageURL should be passed the private state of " +
+                       "the containing window.",
+                       "https://bugzilla.mozilla.org/show_bug.cgi?id=1243643");
+    aIsContentWindowPrivate =
+      PrivateBrowsingUtils.isContentWindowPrivate(aDoc.defaultView);
+  }
+
+  // We'd better have the private state by now.
+  if (aIsContentWindowPrivate == undefined) {
+    throw new Error("saveImageURL couldn't compute private state of content window");
+  }
+
+  if (!aShouldBypassCache && (aDoc && !Components.utils.isCrossProcessWrapper(aDoc)) &&
+      (!aContentType && !aContentDisp)) {
     try {
       var imageCache = Components.classes["@mozilla.org/image/tools;1"]
                                  .getService(Components.interfaces.imgITools)
@@ -123,9 +178,10 @@ function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache,
       // Failure to get type and content-disposition off the image is non-fatal
     }
   }
+
   internalSave(aURL, null, aFileName, contentDisposition, contentType,
                aShouldBypassCache, aFilePickerTitleKey, null, aReferrer,
-               aDoc, aSkipPrompt, null);
+               null, aSkipPrompt, null, aIsContentWindowPrivate);
 }
 
 function saveDocument(aDocument, aSkipPrompt)
@@ -210,8 +266,10 @@ DownloadListener.prototype = {
 }
 
 const kSaveAsType_Complete = 0; // Save document with attached objects.
+XPCOMUtils.defineConstant(this, "kSaveAsType_Complete", 0);
 // const kSaveAsType_URL      = 1; // Save document or URL by itself.
 const kSaveAsType_Text     = 2; // Save document, converting to plain text.
+XPCOMUtils.defineConstant(this, "kSaveAsType_Text", kSaveAsType_Text);
 
 /**
  * internalSave: Used when saving a document or URL.
@@ -243,7 +301,7 @@ const kSaveAsType_Text     = 2; // Save document, converting to plain text.
  * @param aDocument
  *        The document to be saved
  * @param aDefaultFileName
- *        The caller-provided suggested filename if we don't 
+ *        The caller-provided suggested filename if we don't
  *        find a better one
  * @param aContentDisposition
  *        The caller-provided content-disposition header to use.
@@ -472,7 +530,7 @@ function AutoChosen(aFileAutoChosen, aUriAutoChosen) {
  * Structure for holding info about a URL and the target filename it should be
  * saved to. This structure is populated by initFileInfo(...).
  * @param aSuggestedFileName This is used by initFileInfo(...) when it
- *        cannot 'discover' the filename from the url 
+ *        cannot 'discover' the filename from the url
  * @param aFileName The target filename
  * @param aFileBaseName The filename without the file extension
  * @param aFileExt The extension of the filename
@@ -531,7 +589,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
   }
 }
 
-/** 
+/**
  * Given the Filepicker Parameters (aFpP), show the file picker dialog,
  * prompting the user to confirm (or change) the fileName.
  * @param aFpP
@@ -546,7 +604,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
  *        is set, but ask for the target explicitly.
  * @param aRelatedURI
  *        An nsIURI associated with the download. The last used
- *        directory of the picker is retrieved from/stored in the 
+ *        directory of the picker is retrieved from/stored in the
  *        Content Pref Service using this URI.
  * @return Promise
  * @resolve a boolean. When true, it indicates that the file picker dialog
@@ -554,7 +612,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
  */
 function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRelatedURI)
 {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let downloadLastDir = new DownloadLastDir(window);
     let prefBranch = Services.prefs.getBranch("browser.download.");
     let useDownloadDir = prefBranch.getBoolPref("useDownloadDir");
@@ -572,7 +630,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
       dir.append(getNormalizedLeafName(aFpP.fileInfo.fileName,
                                        aFpP.fileInfo.fileExt));
       aFpP.file = uniqueFile(dir);
-      throw new Task.Result(true);
+      return true;
     }
 
     // We must prompt for the file name explicitly.
@@ -627,7 +685,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
     });
     let result = yield deferComplete.promise;
     if (result == Components.interfaces.nsIFilePicker.returnCancel || !fp.file) {
-      throw new Task.Result(false);
+      return false;
     }
 
     if (aFpP.saveMode != SAVEMODE_FILEONLY)
@@ -642,7 +700,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
     aFpP.file = fp.file;
     aFpP.fileURL = fp.fileURL;
 
-    throw new Task.Result(true);
+    return true;
   });
 }
 
@@ -724,10 +782,13 @@ function DownloadURL(aURL, aFileName, aInitiatingDocument) {
 
 // We have no DOM, and can only save the URL as is.
 const SAVEMODE_FILEONLY      = 0x00;
+XPCOMUtils.defineConstant(this, "SAVEMODE_FILEONLY", SAVEMODE_FILEONLY);
 // We have a DOM and can save as complete.
 const SAVEMODE_COMPLETE_DOM  = 0x01;
+XPCOMUtils.defineConstant(this, "SAVEMODE_COMPLETE_DOM", SAVEMODE_COMPLETE_DOM);
 // We have a DOM which we can serialize as text.
 const SAVEMODE_COMPLETE_TEXT = 0x02;
+XPCOMUtils.defineConstant(this, "SAVEMODE_COMPLETE_TEXT", SAVEMODE_COMPLETE_TEXT);
 
 // If we are able to save a complete DOM, the 'save as complete' filter
 // must be the first filter appended.  The 'save page only' counterpart
diff --git a/toolkit/devtools/server/DominatorTree.cpp b/toolkit/devtools/server/DominatorTree.cpp
index 9e4df041b9..e53c196cf3 100644
--- a/toolkit/devtools/server/DominatorTree.cpp
+++ b/toolkit/devtools/server/DominatorTree.cpp
@@ -102,6 +102,21 @@ DominatorTree::GetImmediatelyDominated(uint64_t aNodeId,
   }
 }
 
+dom::Nullable<uint64_t>
+DominatorTree::GetImmediateDominator(uint64_t aNodeId) const
+{
+  JS::ubi::Node::Id id(aNodeId);
+  Maybe<JS::ubi::Node> node = mHeapSnapshot->getNodeById(id);
+  if (node.isNothing())
+    return dom::Nullable<uint64_t>();
+
+  JS::ubi::Node dominator = mDominatorTree.getImmediateDominator(*node);
+  if (!dominator || dominator == *node)
+    return dom::Nullable<uint64_t>();
+
+  return dom::Nullable<uint64_t>(dominator.identifier());
+}
+
 
 /*** Cycle Collection Boilerplate *****************************************************************/
 
diff --git a/toolkit/devtools/server/DominatorTree.h b/toolkit/devtools/server/DominatorTree.h
index 75eec8ad20..f785d49166 100644
--- a/toolkit/devtools/server/DominatorTree.h
+++ b/toolkit/devtools/server/DominatorTree.h
@@ -56,6 +56,9 @@ public:
   // [Throws] sequence<NodeId>? getImmediatelyDominated(NodeId node);
   void GetImmediatelyDominated(uint64_t aNodeId, dom::Nullable<nsTArray<uint64_t>>& aOutDominated,
                                ErrorResult& aRv);
+
+  // NodeId? getImmediateDominator(NodeId node);
+  dom::Nullable<uint64_t> GetImmediateDominator(uint64_t aNodeId) const;
 };
 
 } // namespace devtools
diff --git a/toolkit/devtools/server/HeapSnapshot.cpp b/toolkit/devtools/server/HeapSnapshot.cpp
index b7167dcfe0..cdfc5cf66d 100644
--- a/toolkit/devtools/server/HeapSnapshot.cpp
+++ b/toolkit/devtools/server/HeapSnapshot.cpp
@@ -14,6 +14,7 @@
 #include "js/UbiNodeBreadthFirst.h"
 #include "js/UbiNodeCensus.h"
 #include "js/UbiNodeDominatorTree.h"
+#include "js/UbiNodeShortestPaths.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/devtools/AutoMemMap.h"
@@ -54,6 +55,7 @@ using ::google::protobuf::io::GzipInputStream;
 using ::google::protobuf::io::ZeroCopyInputStream;
 
 using JS::ubi::AtomOrTwoByteChars;
+using JS::ubi::ShortestPaths;
 
 MallocSizeOf
 GetCurrentThreadDebuggerMallocSizeOf()
@@ -572,7 +574,7 @@ HeapSnapshot::ComputeDominatorTree(ErrorResult& rv)
     maybeTree = JS::ubi::DominatorTree::Create(rt, nogc, getRoot());
   }
 
-  if (maybeTree.isNothing()) {
+  if (NS_WARN_IF(maybeTree.isNothing())) {
     rv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
@@ -580,6 +582,142 @@ HeapSnapshot::ComputeDominatorTree(ErrorResult& rv)
   return MakeAndAddRef<DominatorTree>(Move(*maybeTree), this, mParent);
 }
 
+void
+HeapSnapshot::ComputeShortestPaths(JSContext*cx, uint64_t start,
+                                   const Sequence<uint64_t>& targets,
+                                   uint64_t maxNumPaths,
+                                   JS::MutableHandleObject results,
+                                   ErrorResult& rv)
+{
+  // First ensure that our inputs are valid.
+
+  if (NS_WARN_IF(maxNumPaths == 0)) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  Maybe<JS::ubi::Node> startNode = getNodeById(start);
+  if (NS_WARN_IF(startNode.isNothing())) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  if (NS_WARN_IF(targets.Length() == 0)) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  // Aggregate the targets into a set and make sure that they exist in the heap
+  // snapshot.
+
+  JS::ubi::NodeSet targetsSet;
+  if (NS_WARN_IF(!targetsSet.init())) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  for (const auto& target : targets) {
+    Maybe<JS::ubi::Node> targetNode = getNodeById(target);
+    if (NS_WARN_IF(targetNode.isNothing())) {
+      rv.Throw(NS_ERROR_INVALID_ARG);
+      return;
+    }
+
+    if (NS_WARN_IF(!targetsSet.put(*targetNode))) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+  }
+
+  // Walk the heap graph and find the shortest paths.
+
+  Maybe<ShortestPaths> maybeShortestPaths;
+  {
+    auto ccrt = CycleCollectedJSRuntime::Get();
+    MOZ_ASSERT(ccrt);
+    auto rt = ccrt->Runtime();
+    MOZ_ASSERT(rt);
+    JS::AutoCheckCannotGC nogc(rt);
+    maybeShortestPaths = ShortestPaths::Create(rt, nogc, maxNumPaths, *startNode,
+                                               Move(targetsSet));
+  }
+
+  if (NS_WARN_IF(maybeShortestPaths.isNothing())) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  auto& shortestPaths = *maybeShortestPaths;
+
+  // Convert the results into a Map object mapping target node IDs to arrays of
+  // paths found.
+
+  RootedObject resultsMap(cx, JS::NewMapObject(cx));
+  if (NS_WARN_IF(!resultsMap)) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  for (auto range = shortestPaths.eachTarget(); !range.empty(); range.popFront()) {
+    JS::RootedValue key(cx, JS::NumberValue(range.front().identifier()));
+    JS::AutoValueVector paths(cx);
+
+    bool ok = shortestPaths.forEachPath(range.front(), [&](JS::ubi::Path& path) {
+      JS::AutoValueVector pathValues(cx);
+
+      for (JS::ubi::BackEdge* edge : path) {
+        JS::RootedObject pathPart(cx, JS_NewPlainObject(cx));
+        if (!pathPart) {
+          return false;
+        }
+
+        JS::RootedValue predecessor(cx, NumberValue(edge->predecessor().identifier()));
+        if (!JS_DefineProperty(cx, pathPart, "predecessor", predecessor, JSPROP_ENUMERATE)) {
+          return false;
+        }
+
+        RootedValue edgeNameVal(cx, NullValue());
+        if (edge->name()) {
+          RootedString edgeName(cx, JS_AtomizeUCString(cx, edge->name().get()));
+          if (!edgeName) {
+            return false;
+          }
+          edgeNameVal = StringValue(edgeName);
+        }
+
+        if (!JS_DefineProperty(cx, pathPart, "edge", edgeNameVal, JSPROP_ENUMERATE)) {
+          return false;
+        }
+
+        if (!pathValues.append(ObjectValue(*pathPart))) {
+          return false;
+        }
+      }
+
+      RootedObject pathObj(cx, JS_NewArrayObject(cx, pathValues));
+      return pathObj && paths.append(ObjectValue(*pathObj));
+    });
+
+    if (NS_WARN_IF(!ok)) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+
+    JS::RootedObject pathsArray(cx, JS_NewArrayObject(cx, paths));
+    if (NS_WARN_IF(!pathsArray)) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+
+    JS::RootedValue pathsVal(cx, ObjectValue(*pathsArray));
+    if (NS_WARN_IF(!JS::MapSet(cx, resultsMap, key, pathsVal))) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+  }
+
+  results.set(resultsMap);
+}
 
 /*** Saving Heap Snapshots ************************************************************************/
 
diff --git a/toolkit/devtools/server/HeapSnapshot.h b/toolkit/devtools/server/HeapSnapshot.h
index efc80c25cc..8e591d9c90 100644
--- a/toolkit/devtools/server/HeapSnapshot.h
+++ b/toolkit/devtools/server/HeapSnapshot.h
@@ -164,6 +164,12 @@ public:
 
   already_AddRefed<DominatorTree> ComputeDominatorTree(ErrorResult& rv);
 
+  void ComputeShortestPaths(JSContext*cx, uint64_t start,
+                            const dom::Sequence<uint64_t>& targets,
+                            uint64_t maxNumPaths,
+                            JS::MutableHandleObject results,
+                            ErrorResult& rv);
+
   dom::Nullable<uint64_t> GetCreationTime() {
     static const uint64_t maxTime = uint64_t(1) << 53;
     if (timestamp.isSome() && timestamp.ref() <= maxTime) {
diff --git a/toolkit/devtools/server/actors/storage.js b/toolkit/devtools/server/actors/storage.js
index 774c7368b2..114ae17087 100644
--- a/toolkit/devtools/server/actors/storage.js
+++ b/toolkit/devtools/server/actors/storage.js
@@ -748,6 +748,130 @@ StorageActors.createActor({
 }, getObjectForLocalOrSessionStorage("sessionStorage"));
 
 
+let CacheAttributes = [
+  "url",
+  "status",
+];
+types.addDictType("cacheobject", {
+  "url": "string",
+  "status": "string"
+});
+
+// Array of Cache store objects
+types.addDictType("cachestoreobject", {
+  total: "number",
+  offset: "number",
+  data: "array:nullable:cacheobject"
+});
+
+StorageActors.createActor({
+  typeName: "Cache",
+  storeObjectType: "cachestoreobject"
+}, {
+  getCachesForHost: Task.async(function*(host) {
+    let uri = Services.io.newURI(host, null, null);
+    let principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(uri);
+
+    // The first argument tells if you want to get |content| cache or |chrome| cache.
+    // The |content| cache is the cache explicitely named by the web content
+    // (service worker or web page).
+    // The |chrome| cache is the cache implicitely cached by the platform, hosting the
+    // source file of the service worker.
+    let { CacheStorage } = this.storageActor.window;
+    let cache = new CacheStorage("content", principal);
+    return cache;
+  }),
+
+  preListStores: Task.async(function*() {
+    for (let host of this.hosts) {
+      yield this.populateStoresForHost(host);
+    }
+  }),
+
+  form: function(form, detail) {
+    if (detail === "actorid") {
+      return this.actorID;
+    }
+
+    let hosts = {};
+    for (let host of this.hosts) {
+      hosts[host] = this.getNamesForHost(host);
+    }
+
+    return {
+      actor: this.actorID,
+      hosts: hosts
+    };
+  },
+
+  getNamesForHost: function(host) {
+    // UI code expect each name to be a JSON string of an array :/
+    return [...this.hostVsStores.get(host).keys()].map(a => JSON.stringify([a]));
+  },
+
+  getValuesForHost: Task.async(function*(host, name) {
+    if (!name) return [];
+    // UI is weird and expect a JSON stringified array... and pass it back :/
+    name = JSON.parse(name)[0];
+
+    let cache = this.hostVsStores.get(host).get(name);
+    let requests = yield cache.keys();
+    let results = [];
+    for(let request of requests) {
+      let response = yield cache.match(request);
+      // Unwrap the response to get access to all its properties if the
+      // response happen to be 'opaque', when it is a Cross Origin Request.
+      response = response.cloneUnfiltered();
+      results.push(yield this.processEntry(request, response));
+    }
+    return results;
+  }),
+
+  processEntry: Task.async(function*(request, response) {
+    return {
+      url: String(request.url),
+      status: String(response.statusText),
+    };
+  }),
+
+  getHostName: function(location) {
+    if (!location.host) {
+      return location.href;
+    }
+    return location.protocol + "//" + location.host;
+  },
+
+  populateStoresForHost: Task.async(function*(host, window) {
+    let storeMap = new Map();
+    let caches = yield this.getCachesForHost(host);
+    for (let name of (yield caches.keys())) {
+      storeMap.set(name, (yield caches.open(name)));
+    }
+    this.hostVsStores.set(host, storeMap);
+  }),
+
+  /**
+   * This method is overriden and left blank as for Cache Storage, this
+   * operation cannot be performed synchronously. Thus, the preListStores
+   * method exists to do the same task asynchronously.
+   */
+  populateStoresForHosts: function() {
+    this.hostVsStores = new Map();
+  },
+
+  /**
+   * Given a url, correctly determine its protocol + hostname part.
+   */
+  getSchemaAndHost: function(url) {
+    let uri = Services.io.newURI(url, null, null);
+    return uri.scheme + "://" + uri.hostPort;
+  },
+
+  toStoreObject: function(item) {
+    return item;
+  },
+});
+
 /**
  * Code related to the Indexed DB actor and front
  */
diff --git a/toolkit/devtools/server/tests/unit/test_DominatorTree_05.js b/toolkit/devtools/server/tests/unit/test_DominatorTree_05.js
index af2f3e2025..c07cee9944 100644
--- a/toolkit/devtools/server/tests/unit/test_DominatorTree_05.js
+++ b/toolkit/devtools/server/tests/unit/test_DominatorTree_05.js
@@ -17,6 +17,9 @@ function run_test() {
   // overflow the log size.
 
   var root = dominatorTree.root;
+  equal(dominatorTree.getImmediateDominator(root), null,
+        "The root should not have a parent");
+
   var seen = new Set();
   var stack = [root];
   while (stack.length > 0) {
@@ -44,6 +47,10 @@ function run_test() {
         ok(false, "Every dominated id should be a number");
       }
 
+      if (dominatorTree.getImmediateDominator(newNodes[i]) !== top) {
+        ok(false, "child's parent should be the expected parent");
+      }
+
       var thisSize = dominatorTree.getRetainedSize(newNodes[i]);
 
       if (thisSize >= topSize) {
diff --git a/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js b/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
new file mode 100644
index 0000000000..2ec577bd00
--- /dev/null
+++ b/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
@@ -0,0 +1,69 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Sanity test that we can compute shortest paths.
+//
+// Because the actual heap graph is too unpredictable and likely to drastically
+// change as various implementation bits change, we don't test exact paths
+// here. See js/src/jsapi-tests/testUbiNode.cpp for such tests, where we can
+// control the specific graph shape and structure and so testing exact paths is
+// reliable.
+
+function run_test() {
+  const path = ChromeUtils.saveHeapSnapshot({ runtime: true });
+  const snapshot = ChromeUtils.readHeapSnapshot(path);
+
+  const dominatorTree = snapshot.computeDominatorTree();
+  const dominatedByRoot = dominatorTree.getImmediatelyDominated(dominatorTree.root)
+                                       .slice(0, 10);
+  ok(dominatedByRoot);
+  ok(dominatedByRoot.length);
+
+  const targetSet = new Set(dominatedByRoot);
+
+  const shortestPaths = snapshot.computeShortestPaths(dominatorTree.root, dominatedByRoot, 2);
+  ok(shortestPaths);
+  ok(shortestPaths instanceof Map);
+  ok(shortestPaths.size === targetSet.size);
+
+  for (let [target, paths] of shortestPaths) {
+    ok(targetSet.has(target),
+       "We should only get paths for our targets");
+    targetSet.delete(target);
+
+    ok(paths.length > 0,
+       "We must have at least one path, since the target is dominated by the root");
+    ok(paths.length <= 2,
+       "Should not have recorded more paths than the max requested");
+
+    dumpn("---------------------");
+    dumpn("Shortest paths for 0x" + target.toString(16) + ":");
+    for (let path of paths) {
+      dumpn("    path =");
+      for (let part of path) {
+        dumpn("        predecessor: 0x" + part.predecessor.toString(16) +
+              "; edge: " + part.edge);
+      }
+    }
+    dumpn("---------------------");
+
+    for (let path of paths) {
+      ok(path.length > 0, "Cannot have zero length paths");
+      ok(path[0].predecessor === dominatorTree.root,
+         "The first predecessor is always our start node");
+
+      for (let part of path) {
+        ok(part.predecessor, "Each part of a path has a predecessor");
+        ok(!!snapshot.describeNode({ by: "count", count: true, bytes: true},
+                                   part.predecessor),
+           "The predecessor is in the heap snapshot");
+        ok("edge" in part, "Each part has an (potentially null) edge property");
+      }
+    }
+  }
+
+  ok(targetSet.size === 0,
+     "We found paths for all of our targets");
+
+  do_test_finished();
+}
diff --git a/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js b/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
new file mode 100644
index 0000000000..04fe58733b
--- /dev/null
+++ b/toolkit/devtools/server/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
@@ -0,0 +1,47 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test computing shortest paths with invalid arguments.
+
+function run_test() {
+  const path = ChromeUtils.saveHeapSnapshot({ runtime: true });
+  const snapshot = ChromeUtils.readHeapSnapshot(path);
+
+  const dominatorTree = snapshot.computeDominatorTree();
+  const target = dominatorTree.getImmediatelyDominated(dominatorTree.root).pop();
+  ok(target);
+
+  let threw = false;
+  try {
+    snapshot.computeShortestPaths(0, [target], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "invalid start node should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [0], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "invalid target nodes should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "empty target nodes should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [target], 0);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "0 max paths should throw");
+
+  do_test_finished();
+}
diff --git a/toolkit/devtools/server/tests/unit/xpcshell.ini b/toolkit/devtools/server/tests/unit/xpcshell.ini
index 50c7a60403..5493af5756 100644
--- a/toolkit/devtools/server/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/server/tests/unit/xpcshell.ini
@@ -45,6 +45,8 @@ support-files =
 [test_nsjsinspector.js]
 [test_SaveHeapSnapshot.js]
 [test_HeapSnapshot_describeNode_01.js]
+[test_HeapSnapshot_computeShortestPaths_01.js]
+[test_HeapSnapshot_computeShortestPaths_02.js]
 [test_HeapSnapshot_takeCensus_01.js]
 [test_HeapSnapshot_takeCensus_02.js]
 [test_HeapSnapshot_takeCensus_03.js]
diff --git a/toolkit/devtools/storage/test/.eslintrc b/toolkit/devtools/storage/test/.eslintrc
new file mode 100644
index 0000000000..044c3e4f49
--- /dev/null
+++ b/toolkit/devtools/storage/test/.eslintrc
@@ -0,0 +1,4 @@
+{
+  // Extend from the shared list of defined globals for mochitests.
+  "extends": "../../../.eslintrc.mochitests"
+}
diff --git a/toolkit/devtools/storage/test/browser.ini b/toolkit/devtools/storage/test/browser.ini
index 864f7e0c51..2c88599cad 100644
--- a/toolkit/devtools/storage/test/browser.ini
+++ b/toolkit/devtools/storage/test/browser.ini
@@ -1,7 +1,5 @@
 [DEFAULT]
-# Bug 1049888 - storage actors do not work in e10s for now
-# Bug 1105803 - permafailing on debug release builds since devedition landed
-skip-if = e10s || debug
+tags = devtools
 subsuite = devtools
 support-files =
   storage-complex-values.html
diff --git a/toolkit/devtools/storage/test/browser_storage_basic.js b/toolkit/devtools/storage/test/browser_storage_basic.js
index b1e3ce02dc..aad4852f20 100644
--- a/toolkit/devtools/storage/test/browser_storage_basic.js
+++ b/toolkit/devtools/storage/test/browser_storage_basic.js
@@ -17,7 +17,10 @@
 // These entries are formed by the cookies, local storage, session storage and
 // indexedDB entries created in storage-listings.html,
 // storage-secured-iframe.html and storage-unsecured-iframe.html
-const storeItems = [
+
+"use strict";
+
+const testCases = [
   [["cookies", "test1.example.org"],
    ["c1", "cs2", "c3", "uc1"]],
   [["cookies", "sectest1.example.org"],
@@ -58,6 +61,9 @@ const storeItems = [
    [6, 7]],
   [["indexedDB", "https://sectest1.example.org", "idb-s2", "obj-s2"],
    [16]],
+  [["Cache", "http://test1.example.org", "plop"],
+   [MAIN_DOMAIN + "404_cached_file.js", MAIN_DOMAIN + "browser_storage_basic.js"]],
+
 ];
 
 /**
@@ -65,7 +71,7 @@ const storeItems = [
  */
 function testTree() {
   let doc = gPanelWindow.document;
-  for (let item of storeItems) {
+  for (let item of testCases) {
     ok(doc.querySelector("[data-id='" + JSON.stringify(item[0]) + "']"),
        "Tree item " + item[0] + " should be present in the storage tree");
   }
@@ -74,21 +80,20 @@ function testTree() {
 /**
  * Test that correct table entries are shown for each of the tree item
  */
-let testTables = Task.async(function*() {
+function* testTables() {
   let doc = gPanelWindow.document;
   // Expand all nodes so that the synthesized click event actually works
   gUI.tree.expandAll();
 
   // First tree item is already selected so no clicking and waiting for update
-  for (let id of storeItems[0][1]) {
+  for (let id of testCases[0][1]) {
     ok(doc.querySelector(".table-widget-cell[data-id='" + id + "']"),
        "Table item " + id + " should be present");
   }
 
   // Click rest of the tree items and wait for the table to be updated
-  for (let item of storeItems.slice(1)) {
-    selectTreeItem(item[0]);
-    yield gUI.once("store-objects-updated");
+  for (let item of testCases.slice(1)) {
+    yield selectTreeItem(item[0]);
 
     // Check whether correct number of items are present in the table
     is(doc.querySelectorAll(
@@ -101,14 +106,13 @@ let testTables = Task.async(function*() {
          "Table item " + id + " should be present");
     }
   }
-});
+}
+
+add_task(function*() {
+  yield openTabAndSetupStorage(MAIN_DOMAIN + "storage-listings.html");
 
-let startTest = Task.async(function*() {
   testTree();
   yield testTables();
-  finishTests();
-});
 
-function test() {
-  openTabAndSetupStorage(MAIN_DOMAIN + "storage-listings.html").then(startTest);
-}
+  yield finishTests();
+});
diff --git a/toolkit/devtools/storage/test/browser_storage_dynamic_updates.js b/toolkit/devtools/storage/test/browser_storage_dynamic_updates.js
index 14fc88581b..e72b1e6748 100644
--- a/toolkit/devtools/storage/test/browser_storage_dynamic_updates.js
+++ b/toolkit/devtools/storage/test/browser_storage_dynamic_updates.js
@@ -2,7 +2,10 @@
  * 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/. */
 
-let testUpdates = Task.async(function*() {
+"use strict";
+
+add_task(function*() {
+  yield openTabAndSetupStorage(MAIN_DOMAIN + "storage-updates.html");
 
   let $ = id => gPanelWindow.document.querySelector(id);
   let $$ = sel => gPanelWindow.document.querySelectorAll(sel);
@@ -10,14 +13,13 @@ let testUpdates = Task.async(function*() {
   gUI.tree.expandAll();
 
   ok(gUI.sidebar.hidden, "Sidebar is initially hidden");
-  selectTableItem("c1");
-  yield gUI.once("sidebar-updated");
+  yield selectTableItem("c1");
 
   // test that value is something initially
   let initialValue = [[
     {name: "c1", value: "1.2.3.4.5.6.7"},
     {name: "c1.path", value: "/browser"}
-  ],[
+  ], [
     {name: "c1", value: "Array"},
     {name: "c1.0", value: "1"},
     {name: "c1.6", value: "7"}
@@ -27,7 +29,7 @@ let testUpdates = Task.async(function*() {
   let finalValue = [[
     {name: "c1", value: '{"foo": 4,"bar":6}'},
     {name: "c1.path", value: "/browser"}
-  ],[
+  ], [
     {name: "c1", value: "Object"},
     {name: "c1.foo", value: "4"},
     {name: "c1.bar", value: "6"}
@@ -44,9 +46,10 @@ let testUpdates = Task.async(function*() {
 
   yield findVariableViewProperties(finalValue[0], false);
   yield findVariableViewProperties(finalValue[1], true);
-  ok($("#value [data-id='c1'].table-widget-cell"), "cell is present after update");
+  ok($("#value [data-id='c1'].table-widget-cell"),
+     "cell is present after update");
   is($("#value [data-id='c1'].table-widget-cell").value, '{"foo": 4,"bar":6}',
-       "correct final value in table");
+     "correct final value in table");
 
   // Add a new entry
   is($$("#value .table-widget-cell").length, 2,
@@ -116,8 +119,7 @@ let testUpdates = Task.async(function*() {
   ok(gUI.sidebar.hidden, "Sidebar is hidden when no rows");
 
   // Testing in local storage
-  selectTreeItem(["localStorage", "http://test1.example.org"]);
-  yield gUI.once("store-objects-updated");
+  yield selectTreeItem(["localStorage", "http://test1.example.org"]);
 
   is($$("#value .table-widget-cell").length, 7,
      "Correct number of rows after delete update 7");
@@ -153,9 +155,7 @@ let testUpdates = Task.async(function*() {
       "Value got updated for local storage");
 
   // Testing in session storage
-  selectTreeItem(["sessionStorage", "http://test1.example.org"]);
-
-  yield gUI.once("store-objects-updated");
+  yield selectTreeItem(["sessionStorage", "http://test1.example.org"]);
 
   is($$("#value .table-widget-cell").length, 3,
      "Correct number of rows for session storage");
@@ -181,9 +181,7 @@ let testUpdates = Task.async(function*() {
   is($$("#value .table-widget-cell").length, 2,
      "Correct number of rows after removing items from session storage");
 
-  selectTableItem("ss2");
-
-  yield gUI.once("sidebar-updated");
+  yield selectTableItem("ss2");
 
   ok(!gUI.sidebar.hidden, "sidebar is visible");
 
@@ -199,13 +197,13 @@ let testUpdates = Task.async(function*() {
 
   yield findVariableViewProperties([{name: "ss2", value: "changed=ss2"}]);
 
-});
+  // Clearing items
+  yield gWindow.clear();
 
-let startTest = Task.async(function*() {
-  yield testUpdates();
-  finishTests();
-});
+  yield gUI.once("store-objects-cleared");
 
-function test() {
-  openTabAndSetupStorage(MAIN_DOMAIN + "storage-updates.html").then(startTest);
-}
+  is($$("#value .table-widget-cell").length, 0,
+     "Table should be cleared");
+
+  yield finishTests();
+});
diff --git a/toolkit/devtools/storage/test/browser_storage_sidebar.js b/toolkit/devtools/storage/test/browser_storage_sidebar.js
index 26926fc7ef..1212a006be 100644
--- a/toolkit/devtools/storage/test/browser_storage_sidebar.js
+++ b/toolkit/devtools/storage/test/browser_storage_sidebar.js
@@ -11,57 +11,115 @@
 //   <do we wait for the async "sidebar-updated" event>,
 //   <is the sidebar open>
 // ]
+
+"use strict";
+
 const testCases = [
-  [["cookies", "sectest1.example.org"], 0, 0],
-  ["cs2", 1, 1],
-  [null, 0, 0],
-  ["cs2", 1, 1],
-  ["uc1", 1, 1],
-  ["uc1", 0, 1],
-  [["localStorage", "http://sectest1.example.org"], 0, 0],
-  ["iframe-u-ls1", 1, 1],
-  ["iframe-u-ls1", 0, 1],
-  [null, 0, 0],
-  [["sessionStorage", "http://test1.example.org"], 0, 0],
-  ["ss1", 1, 1],
-  [null, 0, 0],
-  [["indexedDB", "http://test1.example.org"], 0, 0],
-  ["idb2", 1, 1],
-  [["indexedDB", "http://test1.example.org", "idb2", "obj3"], 0, 0],
-  [["indexedDB", "https://sectest1.example.org", "idb-s2"], 0, 0],
-  ["obj-s2", 1, 1],
-  [null, 0, 0],
-  [null, 0, 0],
-  ["obj-s2", 1, 1],
-  [null, 0, 0],
+  {
+    location: ["cookies", "sectest1.example.org"],
+    sidebarHidden: true
+  },
+  {
+    location: "cs2",
+    sidebarHidden: false
+  },
+  {
+    sendEscape: true
+  },
+  {
+    location: "cs2",
+    sidebarHidden: false
+  },
+  {
+    location: "uc1",
+    sidebarHidden: false
+  },
+  {
+    location: "uc1",
+    sidebarHidden: false
+  },
+
+  {
+    location: ["localStorage", "http://sectest1.example.org"],
+    sidebarHidden: true
+  },
+  {
+    location: "iframe-u-ls1",
+    sidebarHidden: false
+  },
+  {
+    location: "iframe-u-ls1",
+    sidebarHidden: false
+  },
+  {
+    sendEscape: true
+  },
+
+  {
+    location: ["sessionStorage", "http://test1.example.org"],
+    sidebarHidden: true
+  },
+  {
+    location: "ss1",
+    sidebarHidden: false
+  },
+  {
+    sendEscape: true
+  },
+
+  {
+    location: ["indexedDB", "http://test1.example.org"],
+    sidebarHidden: true
+  },
+  {
+    location: "idb2",
+    sidebarHidden: false
+  },
+
+  {
+    location: ["indexedDB", "http://test1.example.org", "idb2", "obj3"],
+    sidebarHidden: true
+  },
+
+  {
+    location: ["indexedDB", "https://sectest1.example.org", "idb-s2"],
+    sidebarHidden: true
+  },
+  {
+    location: "obj-s2",
+    sidebarHidden: false
+  },
+  {
+    sendEscape: true
+  }, {
+    location: "obj-s2",
+    sidebarHidden: false
+  }
 ];
 
-let testSidebar = Task.async(function*() {
-  let doc = gPanelWindow.document;
-  for (let item of testCases) {
-    info("clicking for item " + item);
-    if (Array.isArray(item[0])) {
-      selectTreeItem(item[0]);
-      yield gUI.once("store-objects-updated");
+add_task(function*() {
+  yield openTabAndSetupStorage(MAIN_DOMAIN + "storage-listings.html");
+
+  for (let test of testCases) {
+    let { location, sidebarHidden, sendEscape } = test;
+
+    info("running " + JSON.stringify(test));
+
+    if (Array.isArray(location)) {
+      yield selectTreeItem(location);
+    } else if (location) {
+      yield selectTableItem(location);
     }
-    else if (item[0]) {
-      selectTableItem(item[0]);
-    }
-    else {
+
+    if (sendEscape) {
       EventUtils.sendKey("ESCAPE", gPanelWindow);
+    } else {
+      is(gUI.sidebar.hidden, sidebarHidden,
+        "correct visibility state of sidebar.");
     }
-    if (item[1]) {
-      yield gUI.once("sidebar-updated");
-    }
-    is(!item[2], gUI.sidebar.hidden, "Correct visibility state of sidebar");
+
+    info("-".repeat(80));
   }
-});
 
-let startTest = Task.async(function*() {
-  yield testSidebar();
-  finishTests();
+  yield finishTests();
 });
-
-function test() {
-  openTabAndSetupStorage(MAIN_DOMAIN + "storage-listings.html").then(startTest);
-}
diff --git a/toolkit/devtools/storage/test/browser_storage_values.js b/toolkit/devtools/storage/test/browser_storage_values.js
index 3e8e4f9bd9..1c1f078f71 100644
--- a/toolkit/devtools/storage/test/browser_storage_values.js
+++ b/toolkit/devtools/storage/test/browser_storage_values.js
@@ -11,6 +11,9 @@
 //     which will be asserted to exist in the storage sidebar,
 //   true if the check is to be made in the parsed value section
 // ]
+
+"use strict";
+
 const testCases = [
   ["cs2", [
     {name: "cs2", value: "sessionCookie"},
@@ -27,10 +30,10 @@ const testCases = [
     {name: "c1.isDomain", value: "false"},
     {name: "c1.isHttpOnly", value: "false"},
     {name: "c1.host", value: "test1.example.org"},
-    {name: "c1.expires", value: new Date(2000000000000).toUTCString()},
+    {name: "c1.expires", value: new Date(2000000000000).toLocaleString()},
     {name: "c1.isSecure", value: "false"},
   ]],
-  [/*"c1"*/, [
+  [null, [
     {name: "c1", value: "Array"},
     {name: "c1.0", value: "foo"},
     {name: "c1.1", value: "Bar"},
@@ -48,7 +51,7 @@ const testCases = [
         nobody: "cares"
       }]})}
   ]],
-  [/*ls1*/, [
+  [null, [
     {name: "ls1", value: "Object"},
     {name: "ls1.es6", value: "for"},
     {name: "ls1.the", value: "win"},
@@ -63,14 +66,14 @@ const testCases = [
   ["ls3", [
     {name: "ls3", "value": "http://foobar.com/baz.php"}
   ]],
-  [/*ls3*/, [
+  [null, [
     {name: "ls3", "value": "http://foobar.com/baz.php", dontMatch: true}
   ], true],
   [["sessionStorage", "http://test1.example.org"]],
   ["ss1", [
     {name: "ss1", value: "This#is#an#array"}
   ]],
-  [/*ss1*/, [
+  [null, [
     {name: "ss1", value: "Array"},
     {name: "ss1.0", value: "This"},
     {name: "ss1.1", value: "is"},
@@ -94,7 +97,7 @@ const testCases = [
   [1, [
     {name: 1, value: JSON.stringify({id: 1, name: "foo", email: "foo@bar.com"})}
   ]],
-  [/*1*/, [
+  [null, [
     {name: "1.id", value: "1"},
     {name: "1.name", value: "foo"},
     {name: "1.email", value: "foo@bar.com"},
@@ -105,7 +108,7 @@ const testCases = [
       id2: 1, name: "foo", email: "foo@bar.com", extra: "baz"
     })}
   ]],
-  [/*1*/, [
+  [null, [
     {name: "1.id2", value: "1"},
     {name: "1.name", value: "foo"},
     {name: "1.email", value: "foo@bar.com"},
@@ -113,31 +116,23 @@ const testCases = [
   ], true]
 ];
 
-let testValues = Task.async(function*() {
+add_task(function*() {
+  yield openTabAndSetupStorage(MAIN_DOMAIN + "storage-complex-values.html");
+
   gUI.tree.expandAll();
-  let doc = gPanelWindow.document;
+
   for (let item of testCases) {
     info("clicking for item " + item);
+
     if (Array.isArray(item[0])) {
-      selectTreeItem(item[0]);
-      yield gUI.once("store-objects-updated");
+      yield selectTreeItem(item[0]);
       continue;
+    } else if (item[0]) {
+      yield selectTableItem(item[0]);
     }
-    else if (item[0]) {
-      selectTableItem(item[0]);
-    }
-    if (item[0] && item[1]) {
-      yield gUI.once("sidebar-updated");
-    }
+
     yield findVariableViewProperties(item[1], item[2]);
   }
-});
 
-let startTest = Task.async(function*() {
-  yield testValues();
-  finishTests();
+  yield finishTests();
 });
-
-function test() {
-  openTabAndSetupStorage(MAIN_DOMAIN + "storage-complex-values.html").then(startTest);
-}
diff --git a/toolkit/devtools/storage/test/head.js b/toolkit/devtools/storage/test/head.js
index d7d7bc4479..c7c895377d 100644
--- a/toolkit/devtools/storage/test/head.js
+++ b/toolkit/devtools/storage/test/head.js
@@ -4,35 +4,41 @@
 
 "use strict";
 
-let tempScope = {};
-Cu.import("resource://gre/modules/devtools/Loader.jsm", tempScope);
-Cu.import("resource://gre/modules/devtools/Console.jsm", tempScope);
-const console = tempScope.console;
-const devtools = tempScope.devtools;
-tempScope = null;
-const require = devtools.require;
-const TargetFactory = devtools.TargetFactory;
+var { console } = Cu.import("resource://gre/modules/Console.jsm", {});
+var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+var { TargetFactory } = require("devtools/client/framework/target");
+var promise = require("promise");
+var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 const SPLIT_CONSOLE_PREF = "devtools.toolbox.splitconsoleEnabled";
 const STORAGE_PREF = "devtools.storage.enabled";
-const PATH = "browser/browser/devtools/storage/test/";
+const DUMPEMIT_PREF = "devtools.dump.emit";
+const DEBUGGERLOG_PREF = "devtools.debugger.log";
+// Allows Cache API to be working on usage `http` test page
+const CACHES_ON_HTTP_PREF = "dom.caches.testing.enabled";
+const PATH = "browser/devtools/client/storage/test/";
 const MAIN_DOMAIN = "http://test1.example.org/" + PATH;
 const ALT_DOMAIN = "http://sectest1.example.org/" + PATH;
 const ALT_DOMAIN_SECURED = "https://sectest1.example.org:443/" + PATH;
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-
 waitForExplicitFinish();
 
-let gToolbox, gPanelWindow, gWindow, gUI;
+var gToolbox, gPanelWindow, gWindow, gUI;
+
+// Services.prefs.setBoolPref(DUMPEMIT_PREF, true);
+// Services.prefs.setBoolPref(DEBUGGERLOG_PREF, true);
 
 Services.prefs.setBoolPref(STORAGE_PREF, true);
-gDevTools.testing = true;
+Services.prefs.setBoolPref(CACHES_ON_HTTP_PREF, true);
+DevToolsUtils.testing = true;
 registerCleanupFunction(() => {
   gToolbox = gPanelWindow = gWindow = gUI = null;
   Services.prefs.clearUserPref(STORAGE_PREF);
   Services.prefs.clearUserPref(SPLIT_CONSOLE_PREF);
-  gDevTools.testing = false;
+  Services.prefs.clearUserPref(DUMPEMIT_PREF);
+  Services.prefs.clearUserPref(DEBUGGERLOG_PREF);
+  Services.prefs.clearUserPref(CACHES_ON_HTTP_PREF);
+  DevToolsUtils.testing = false;
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
@@ -70,50 +76,34 @@ function addTab(url) {
 }
 
 /**
- * Opens the given url in a new tab, then sets up the page by waiting for
- * all cookies, indexedDB items etc. to be created; Then opens the storage
- * inspector and waits for the storage tree and table to be populated
+ * This generator function opens the given url in a new tab, then sets up the
+ * page by waiting for all cookies, indexedDB items etc. to be created; Then
+ * opens the storage inspector and waits for the storage tree and table to be
+ * populated.
  *
  * @param url {String} The url to be opened in the new tab
  *
  * @return {Promise} A promise that resolves after storage inspector is ready
  */
-let openTabAndSetupStorage = Task.async(function*(url) {
-  /**
-   * This method iterates over iframes in a window and setups the indexed db
-   * required for this test.
-   */
-  let setupIDBInFrames = (w, i, c) => {
-    if (w[i] && w[i].idbGenerator) {
-      w[i].setupIDB = w[i].idbGenerator(() => setupIDBInFrames(w, i + 1, c));
-      w[i].setupIDB.next();
-    }
-    else if (w[i] && w[i + 1]) {
-      setupIDBInFrames(w, i + 1, c);
-    }
-    else {
-      c();
-    }
-  };
-
+function* openTabAndSetupStorage(url) {
   let content = yield addTab(url);
 
-  let def = promise.defer();
-  // Setup the indexed db in main window.
   gWindow = content.wrappedJSObject;
-  if (gWindow.idbGenerator) {
-    gWindow.setupIDB = gWindow.idbGenerator(() => {
-      setupIDBInFrames(gWindow, 0, () => {
-        def.resolve();
-      });
-    });
-    gWindow.setupIDB.next();
-    yield def.promise;
+
+  // Setup the async storages in main window and for all its iframes
+  let callSetup = function*(win) {
+    if (typeof(win.setup) == "function") {
+      yield win.setup();
+    }
+    for(var i = 0; i < win.frames.length; i++) {
+      yield callSetup(win.frames[i]);
+    }
   }
+  yield callSetup(gWindow);
 
   // open storage inspector
   return yield openStoragePanel();
-});
+}
 
 /**
  * Open the toolbox, with the storage tool visible.
@@ -123,7 +113,7 @@ let openTabAndSetupStorage = Task.async(function*(url) {
  *
  * @return {Promise} a promise that resolves when the storage inspector is ready
  */
-let openStoragePanel = Task.async(function*(cb) {
+var openStoragePanel = Task.async(function*(cb) {
   info("Opening the storage inspector");
   let target = TargetFactory.forTab(gBrowser.selectedTab);
 
@@ -142,12 +132,12 @@ let openStoragePanel = Task.async(function*(cb) {
       info("Toolbox and storage already open");
       if (cb) {
         return cb(storage, toolbox);
-      } else {
-        return {
-          toolbox: toolbox,
-          storage: storage
-        };
       }
+
+      return {
+        toolbox: toolbox,
+        storage: storage
+      };
     }
   }
 
@@ -165,12 +155,12 @@ let openStoragePanel = Task.async(function*(cb) {
 
   if (cb) {
     return cb(storage, toolbox);
-  } else {
-    return {
-      toolbox: toolbox,
-      storage: storage
-    };
   }
+
+  return {
+    toolbox: toolbox,
+    storage: storage
+  };
 });
 
 /**
@@ -199,46 +189,61 @@ function forceCollections() {
 }
 
 /**
- * Cleans up and finishes the test
+ * Get all windows including frames recursively.
+ *
+ * @param {Window} [baseWindow]
+ *        The base window at which to start looking for child windows
+ *        (optional).
+ * @return {Set}
+ *         A set of windows.
  */
-function finishTests() {
-  // Cleanup so that indexed db created from this test do not interfere next ones
+function getAllWindows(baseWindow=gWindow) {
+  let windows = new Set();
 
-  /**
-   * This method iterates over iframes in a window and clears the indexed db
-   * created by this test.
-   */
-  let clearIDB = (w, i, c) => {
-    if (w[i] && w[i].clear) {
-      w[i].clearIterator = w[i].clear(() => clearIDB(w, i + 1, c));
-      w[i].clearIterator.next();
-    }
-    else if (w[i] && w[i + 1]) {
-      clearIDB(w, i + 1, c);
-    }
-    else {
-      c();
+  let _getAllWindows = function(win) {
+    windows.add(win);
+
+    for (let i = 0; i < win.length; i++) {
+      _getAllWindows(win[i]);
     }
   };
+  _getAllWindows(baseWindow);
 
-  gWindow.clearIterator = gWindow.clear(() => {
-    clearIDB(gWindow, 0, () => {
-      // Forcing GC/CC to get rid of docshells and windows created by this test.
-      forceCollections();
-      finish();
-    });
-  });
-  gWindow.clearIterator.next();
+  return windows;
+}
+
+/**
+ * Cleans up and finishes the test
+ */
+function* finishTests() {
+  for (let win of getAllWindows()) {
+    if (win.clear) {
+      console.log("Clearing cookies, localStorage and indexedDBs from " +
+                  win.document.location);
+      yield win.clear();
+    }
+  }
+
+  forceCollections();
+  finish();
 }
 
 // Sends a click event on the passed DOM node in an async manner
-function click(node) {
+function* click(node) {
+  let def = promise.defer();
+
   node.scrollIntoView();
-  executeSoon(() => EventUtils.synthesizeMouseAtCenter(node, {}, gPanelWindow));
+
+  // We need setTimeout here to allow any scrolling to complete before clicking
+  // the node.
+  setTimeout(() => {
+    node.click();
+    def.resolve();
+  }, 200);
+
+  return def;
 }
 
-
-
 /**
  * Recursively expand the variables view up to a given property.
  *
@@ -268,18 +273,13 @@ function variablesViewExpandTo(aOptions) {
       if (newProp && newProp.expand) {
         newProp.expand();
         getNext(newProp);
-      }
-      else {
-        lastDeferred.reject(aProp);
-      }
-    }
-    else {
-      if (newProp) {
-        lastDeferred.resolve(newProp);
-      }
-      else {
+      } else {
         lastDeferred.reject(aProp);
       }
+    } else if (newProp) {
+      lastDeferred.resolve(newProp);
+    } else {
+      lastDeferred.reject(aProp);
     }
   }
 
@@ -290,9 +290,8 @@ function variablesViewExpandTo(aOptions) {
   if (root && root.expand) {
     root.expand();
     getNext(root);
-  }
-  else {
-    lastDeferred.resolve(root)
+  } else {
+    lastDeferred.resolve(root);
   }
 
   return lastDeferred.promise;
@@ -325,7 +324,7 @@ function findVariableViewProperties(aRules, aParsed) {
     // Thus, adding a blank parent to each name
     if (aParsed) {
       aRules = aRules.map(({name, value, dontMatch}) => {
-        return {name: "." + name, value, dontMatch}
+        return {name: "." + name, value, dontMatch};
       });
     }
     // Separate out the rules that require expanding properties throughout the
@@ -361,10 +360,10 @@ function findVariableViewProperties(aRules, aParsed) {
     }
   }
 
-  function finder(aRules, aView, aPromises) {
+  function finder(rules, aView, aPromises) {
     for (let scope of aView) {
-      for (let [id, prop] of scope) {
-        for (let rule of aRules) {
+      for (let [, prop] of scope) {
+        for (let rule of rules) {
           let matcher = matchVariablesViewProperty(prop, rule);
           aPromises.push(matcher.then(onMatch.bind(null, prop, rule)));
         }
@@ -372,15 +371,15 @@ function findVariableViewProperties(aRules, aParsed) {
     }
   }
 
-  function processExpandRules(aRules) {
-    let rule = aRules.shift();
+  function processExpandRules(rules) {
+    let rule = rules.shift();
     if (!rule) {
       return promise.resolve(null);
     }
 
     let deferred = promise.defer();
     let expandOptions = {
-      rootVariable: gUI.view.getScopeAtIndex(aParsed ? 1: 0),
+      rootVariable: gUI.view.getScopeAtIndex(aParsed ? 1 : 0),
       expandTo: rule.name
     };
 
@@ -395,28 +394,26 @@ function findVariableViewProperties(aRules, aParsed) {
       });
     }, function onFailure() {
       return promise.resolve(null);
-    }).then(processExpandRules.bind(null, aRules)).then(function() {
+    }).then(processExpandRules.bind(null, rules)).then(function() {
       deferred.resolve(null);
     });
 
     return deferred.promise;
   }
 
-  function onAllRulesMatched(aRules) {
-    for (let rule of aRules) {
+  function onAllRulesMatched(rules) {
+    for (let rule of rules) {
       let matched = rule.matchedProp;
       if (matched && !rule.dontMatch) {
         ok(true, "rule " + rule.name + " matched for property " + matched.name);
-      }
-      else if (matched && rule.dontMatch) {
+      } else if (matched && rule.dontMatch) {
         ok(false, "rule " + rule.name + " should not match property " +
            matched.name);
-      }
-      else {
+      } else {
         ok(rule.dontMatch, "rule " + rule.name + " did not match any property");
       }
     }
-    return aRules;
+    return rules;
   }
 
   return init();
@@ -465,7 +462,7 @@ function matchVariablesViewProperty(aProp, aRule) {
                 displayValue == aRule.value;
     if (!match) {
       info("rule " + aRule.name + " did not match value, expected '" +
-           aRule.value + "', found '" + displayValue  + "'");
+           aRule.value + "', found '" + displayValue + "'");
       return resolve(false);
     }
   }
@@ -479,39 +476,18 @@ function matchVariablesViewProperty(aProp, aRule) {
  * @param {[String]} ids
  *        The array id of the item in the tree
  */
-function selectTreeItem(ids) {
+function* selectTreeItem(ids) {
   // Expand tree as some/all items could be collapsed leading to click on an
   // incorrect tree item
   gUI.tree.expandAll();
-  let target = gPanelWindow.document.querySelector(
-                 "[data-id='" + JSON.stringify(ids) + "'] > .tree-widget-item");
 
-  // Look for an animating list
-  //
-  // If the list is still expanding we won't be able to click the requested
-  // item. We detect if a list (or one of its ancestor lists) is animating
-  // by checking if max-height is set. If the animation effect in
-  // widgets.inc.css changes this will likely break but until the Web
-  // Animations API is available (specifically, bug 1074630 and bug 1112422)
-  // there is no reliable way to detect if animations are running, particularly
-  // in the face of interactions that can cancel an animation without triggering
-  // an animationend event.
-  let animatingList = target.nextElementSibling;
-  while (animatingList) {
-    if (window.getComputedStyle(animatingList).maxHeight != "none") {
-      break;
-    }
-    animatingList = animatingList.parentNode.closest(".tree-widget-item + ul");
-  }
+  let selector = "[data-id='" + JSON.stringify(ids) + "'] > .tree-widget-item";
+  let target = gPanelWindow.document.querySelector(selector);
 
-  if (animatingList) {
-    animatingList.addEventListener("animationend", function animationend() {
-      animatingList.removeEventListener("animationend", animationend);
-      click(target);
-    });
-  } else {
-    click(target);
-  }
+  let updated = gUI.once("store-objects-updated");
+
+  yield click(target);
+  yield updated;
 }
 
 /**
@@ -520,7 +496,40 @@ function selectTreeItem(ids) {
  * @param {String} id
  *        The id of the row in the table widget
  */
-function selectTableItem(id) {
-  click(gPanelWindow.document.querySelector(".table-widget-cell[data-id='" +
-        id + "']"));
+function* selectTableItem(id) {
+  let selector = ".table-widget-cell[data-id='" + id + "']";
+  let target = gPanelWindow.document.querySelector(selector);
+
+  yield click(target);
+  yield gUI.once("sidebar-updated");
+}
+
+/**
+ * Wait for eventName on target.
+ * @param {Object} target An observable object that either supports on/off or
+ * addEventListener/removeEventListener
+ * @param {String} eventName
+ * @param {Boolean} [useCapture] for addEventListener/removeEventListener
+ * @return A promise that resolves when the event has been handled
+ */
+function once(target, eventName, useCapture=false) {
+  info("Waiting for event: '" + eventName + "' on " + target + ".");
+
+  let deferred = promise.defer();
+
+  for (let [add, remove] of [
+    ["addEventListener", "removeEventListener"],
+    ["addListener", "removeListener"],
+    ["on", "off"]
+  ]) {
+    if ((add in target) && (remove in target)) {
+      target[add](eventName, function onEvent(...aArgs) {
+        target[remove](eventName, onEvent, useCapture);
+        deferred.resolve.apply(deferred, aArgs);
+      }, useCapture);
+      break;
+    }
+  }
+
+  return deferred.promise;
 }
diff --git a/toolkit/devtools/storage/test/storage-complex-values.html b/toolkit/devtools/storage/test/storage-complex-values.html
index d7a3d6fd9e..011343291c 100644
--- a/toolkit/devtools/storage/test/storage-complex-values.html
+++ b/toolkit/devtools/storage/test/storage-complex-values.html
@@ -9,7 +9,7 @@ Bug 970517 - Storage inspector front end - tests
 </head>
 <body>
 <script type="application/javascript;version=1.7">
-
+"use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime = 2000000000000;
 // Setting up some cookies to eat.
@@ -20,7 +20,7 @@ document.cookie = "c1=" + JSON.stringify([
   "; path=/browser";
 document.cookie = "cs2=sessionCookie; path=/; domain=" + partialHostname;
 // ... and some local storage items ..
-var es6 = "for";
+const es6 = "for";
 localStorage.setItem("ls1", JSON.stringify({
   es6, the: "win", baz: [0, 2, 3, {
     deep: "down",
@@ -34,67 +34,89 @@ sessionStorage.setItem("ss2", "This~is~another~array");
 sessionStorage.setItem("ss3", "this#is~an#object~foo#bar");
 console.log("added cookies and stuff from main page");
 
-function success(event) {
-  setupIDB.next(event);
-}
-
-window.idbGenerator = function*(callback) {
+let idbGenerator = function*() {
   let request = indexedDB.open("idb1", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  request.onerror = function(e) {
+  request.onerror = function() {
     throw new Error("error opening db connection");
   };
-  let event = yield undefined;
-  let db = event.target.result;
-  let store1 = db.createObjectStore("obj1", { keyPath: "id" });
-  store1.createIndex("name", "name", { unique: false });
-  store1.createIndex("email", "email", { unique: true });
-  let store2 = db.createObjectStore("obj2", { keyPath: "id2" });
+  let db = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db = event.target.result;
+      let store1 = db.createObjectStore("obj1", { keyPath: "id" });
+      store1.createIndex("name", "name", { unique: false });
+      store1.createIndex("email", "email", { unique: true });
+      db.createObjectStore("obj2", { keyPath: "id2" });
+      store1.transaction.oncomplete = () => {
+        done(db);
+      };
+    };
+  });
 
-  store1.add({id: 1, name: "foo", email: "foo@bar.com"}).onsuccess = success;
-  yield undefined;
-  store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}).onsuccess = success;
-  yield undefined;
-  store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}).onsuccess = success;
-  yield undefined;
-  store2.add({id2: 1, name: "foo", email: "foo@bar.com", extra: "baz"}).onsuccess = success;
-  yield undefined;
+  // Prevents AbortError
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
+
+  let transaction = db.transaction(["obj1", "obj2"], "readwrite");
+  let store1 = transaction.objectStore("obj1");
+  let store2 = transaction.objectStore("obj2");
+
+  store1.add({id: 1, name: "foo", email: "foo@bar.com"});
+  store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
+  store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
+  store2.add({
+    id2: 1,
+    name: "foo",
+    email: "foo@bar.com",
+    extra: "baz"});
 
-  yield undefined;
   db.close();
 
   request = indexedDB.open("idb2", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  event = yield undefined;
+  let db2 = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db2 = event.target.result;
+      let store3 = db2.createObjectStore("obj3", { keyPath: "id3" });
+      store3.createIndex("name2", "name2", { unique: true });
+      store3.transaction.oncomplete = () => {
+        done(db2);
+      };
+    };
+  });
 
-  let db2 = event.target.result;
-  let store3 = db2.createObjectStore("obj3", { keyPath: "id3" });
-  store3.createIndex("name2", "name2", { unique: true });
+  // Prevents AbortError during close()
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
 
-  yield undefined;
   db2.close();
   console.log("added cookies and stuff from main page");
-  callback();
+};
+
+function deleteDB(dbName) {
+  return new Promise(resolve => {
+    dump("removing database " + dbName + " from " + document.location + "\n");
+    indexedDB.deleteDatabase(dbName).onsuccess = resolve;
+  });
 }
 
-function successClear(event) {
-  clearIterator.next(event);
-}
+window.setup = function*() {
+  yield idbGenerator();
+};
 
-window.clear = function*(callback) {
+window.clear = function*() {
   document.cookie = "c1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/browser";
   document.cookie = "cs2=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+
   localStorage.clear();
   sessionStorage.clear();
-  indexedDB.deleteDatabase("idb1").onsuccess = successClear;
-  yield undefined;
-  indexedDB.deleteDatabase("idb2").onsuccess = successClear;
-  yield undefined;
-  console.log("removed cookies and stuff from main page");
-  callback();
-}
+
+  yield deleteDB("idb1");
+  yield deleteDB("idb2");
+
+  dump("removed cookies, localStorage, sessionStorage and indexedDB data " +
+       "from " + document.location + "\n");
+};
 </script>
 </body>
 </html>
diff --git a/toolkit/devtools/storage/test/storage-listings.html b/toolkit/devtools/storage/test/storage-listings.html
index a1609940ac..61287f796b 100644
--- a/toolkit/devtools/storage/test/storage-listings.html
+++ b/toolkit/devtools/storage/test/storage-listings.html
@@ -8,10 +8,10 @@ Bug 970517 - Storage inspector front end - tests
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
-<iframe src="http://sectest1.example.org/browser/browser/devtools/storage/test/storage-unsecured-iframe.html"></iframe>
-<iframe src="https://sectest1.example.org:443/browser/browser/devtools/storage/test/storage-secured-iframe.html"></iframe>
+<iframe src="http://sectest1.example.org/browser/devtools/client/storage/test/storage-unsecured-iframe.html"></iframe>
+<iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html"></iframe>
 <script type="application/javascript;version=1.7">
-
+"use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime1 = 2000000000000;
 let cookieExpiresTime2 = 2000000001000;
@@ -26,70 +26,112 @@ localStorage.setItem("ls1", "foobar");
 localStorage.setItem("ls2", "foobar-2");
 // ... and finally some session storage items too
 sessionStorage.setItem("ss1", "foobar-3");
-console.log("added cookies and stuff from main page");
+dump("added cookies and stuff from main page\n");
 
-function success(event) {
-  setupIDB.next(event);
-}
-
-window.idbGenerator = function*(callback) {
+let idbGenerator = function*() {
   let request = indexedDB.open("idb1", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  request.onerror = function(e) {
+  request.onerror = function() {
     throw new Error("error opening db connection");
   };
-  let event = yield undefined;
-  let db = event.target.result;
-  let store1 = db.createObjectStore("obj1", { keyPath: "id" });
-  store1.createIndex("name", "name", { unique: false });
-  store1.createIndex("email", "email", { unique: true });
-  let store2 = db.createObjectStore("obj2", { keyPath: "id2" });
+  let db = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db = event.target.result;
+      let store1 = db.createObjectStore("obj1", { keyPath: "id" });
+      store1.createIndex("name", "name", { unique: false });
+      store1.createIndex("email", "email", { unique: true });
+      let store2 = db.createObjectStore("obj2", { keyPath: "id2" });
+      store1.transaction.oncomplete = () => {
+        done(db);
+      };
+    };
+  });
 
-  store1.add({id: 1, name: "foo", email: "foo@bar.com"}).onsuccess = success;
-  yield undefined;
-  store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}).onsuccess = success;
-  yield undefined;
-  store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}).onsuccess = success;
-  yield undefined;
-  store2.add({id2: 1, name: "foo", email: "foo@bar.com", extra: "baz"}).onsuccess = success;
-  yield undefined;
+  // Prevents AbortError
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
+
+  let transaction = db.transaction(["obj1", "obj2"], "readwrite");
+  let store1 = transaction.objectStore("obj1");
+  let store2 = transaction.objectStore("obj2");
+  store1.add({id: 1, name: "foo", email: "foo@bar.com"});
+  store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
+  store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
+  store2.add({
+    id2: 1,
+    name: "foo",
+    email: "foo@bar.com",
+    extra: "baz"
+  });
+  // Prevents AbortError during close()
+  yield new Promise(success => {
+    transaction.oncomplete = success;
+  });
 
-  yield undefined;
   db.close();
 
   request = indexedDB.open("idb2", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  event = yield undefined;
-
-  let db2 = event.target.result;
-  let store3 = db2.createObjectStore("obj3", { keyPath: "id3" });
-  store3.createIndex("name2", "name2", { unique: true });
-
-  yield undefined;
+  let db2 = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db2 = event.target.result;
+      let store3 = db2.createObjectStore("obj3", { keyPath: "id3" });
+      store3.createIndex("name2", "name2", { unique: true });
+      store3.transaction.oncomplete = () => {
+        done(db2);
+      }
+    };
+  });
+  // Prevents AbortError during close()
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
   db2.close();
-  console.log("added cookies and stuff from main page");
-  callback();
+
+  dump("added cookies and stuff from main page\n");
+};
+
+function deleteDB(dbName) {
+  return new Promise(resolve => {
+    dump("removing database " + dbName + " from " + document.location + "\n");
+    indexedDB.deleteDatabase(dbName).onsuccess = resolve;
+  });
 }
 
-function successClear(event) {
-  clearIterator.next(event);
+function fetchPut(cache, url) {
+  let response = yield fetch(url);
+  yield cache.put(url, response);
 }
 
-window.clear = function*(callback) {
+let cacheGenerator = function*() {
+  let cache = yield caches.open("plop");
+  yield fetchPut(cache, "404_cached_file.js");
+  yield fetchPut(cache, "browser_storage_basic.js");
+};
+
+window.setup = function*() {
+  yield idbGenerator();
+  yield cacheGenerator();
+};
+
+window.clear = function*() {
   document.cookie = "c1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/browser";
-  document.cookie = "c3=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; secure=true";
-  document.cookie = "cs2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=" + partialHostname;
+  document.cookie =
+    "c3=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; secure=true";
+  document.cookie =
+    "cs2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=" +
+    partialHostname;
+
   localStorage.clear();
   sessionStorage.clear();
-  indexedDB.deleteDatabase("idb1").onsuccess = successClear;
-  yield undefined;
-  indexedDB.deleteDatabase("idb2").onsuccess = successClear;
-  yield undefined;
-  console.log("removed cookies and stuff from main page");
-  callback();
-}
+
+  yield deleteDB("idb1");
+  yield deleteDB("idb2");
+
+  yield caches.delete("plop");
+
+  dump("removed cookies, localStorage, sessionStorage and indexedDB data " +
+       "from " + document.location + "\n");
+};
 </script>
 </body>
 </html>
diff --git a/toolkit/devtools/storage/test/storage-secured-iframe.html b/toolkit/devtools/storage/test/storage-secured-iframe.html
index dd93442f03..f650166516 100644
--- a/toolkit/devtools/storage/test/storage-secured-iframe.html
+++ b/toolkit/devtools/storage/test/storage-secured-iframe.html
@@ -8,7 +8,7 @@ Iframe for testing multiple host detetion in storage actor
 </head>
 <body>
 <script type="application/javascript;version=1.7">
-
+"use strict";
 document.cookie = "sc1=foobar;";
 localStorage.setItem("iframe-s-ls1", "foobar");
 sessionStorage.setItem("iframe-s-ss1", "foobar-2");
@@ -17,57 +17,84 @@ function success(event) {
   setupIDB.next(event);
 }
 
-window.idbGenerator = function*(callback) {
+let idbGenerator = function*() {
   let request = indexedDB.open("idb-s1", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  request.onerror = function(e) {
+  request.onerror = function() {
     throw new Error("error opening db connection");
   };
-  let event = yield undefined;
-  let db = event.target.result;
-  let store1 = db.createObjectStore("obj-s1", { keyPath: "id" });
+  let db = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db = event.target.result;
+      let store1 = db.createObjectStore("obj-s1", { keyPath: "id" });
+      store1.transaction.oncomplete = () => {
+        done(db);
+      };
+    };
+  });
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
 
-  store1.add({id: 6, name: "foo", email: "foo@bar.com"}).onsuccess = success;
-  yield undefined;
-  store1.add({id: 7, name: "foo2", email: "foo2@bar.com"}).onsuccess = success;
-  yield undefined;
+  let transaction = db.transaction(["obj-s1"], "readwrite");
+  let store1 = transaction.objectStore("obj-s1");
+  store1.add({id: 6, name: "foo", email: "foo@bar.com"});
+  store1.add({id: 7, name: "foo2", email: "foo2@bar.com"});
+  yield new Promise(success => {
+    transaction.oncomplete = success;
+  });
 
-  yield undefined;
   db.close();
 
   request = indexedDB.open("idb-s2", 1);
-  request.onupgradeneeded = success;
-  request.onsuccess = success;
-  event = yield undefined;
+  let db2 = yield new Promise(done => {
+    request.onupgradeneeded = event => {
+      let db2 = event.target.result;
+      let store3 =
+        db2.createObjectStore("obj-s2", { keyPath: "id3", autoIncrement: true });
+      store3.createIndex("name2", "name2", { unique: true });
+      store3.transaction.oncomplete = () => {
+        done(db2);
+      };
+    };
+  });
+  yield new Promise(done => {
+    request.onsuccess = done;
+  });
 
-  let db2 = event.target.result;
-  let store3 = db2.createObjectStore("obj-s2", { keyPath: "id3", autoIncrement: true });
-  store3.createIndex("name2", "name2", { unique: true });
-  store3.add({id3: 16, name2: "foo", email: "foo@bar.com"}).onsuccess = success;
-  yield undefined;
+  transaction = db2.transaction(["obj-s2"], "readwrite");
+  let store3 = transaction.objectStore("obj-s2");
+  store3.add({id3: 16, name2: "foo", email: "foo@bar.com"});
+  yield new Promise(success => {
+    transaction.oncomplete = success;
+  });
 
-  yield undefined;
   db2.close();
-  console.log("added cookies and stuff from secured iframe");
-  callback();
+  dump("added cookies and stuff from secured iframe\n");
+};
+
+function deleteDB(dbName) {
+  return new Promise(resolve => {
+    dump("removing database " + dbName + " from " + document.location + "\n");
+    indexedDB.deleteDatabase(dbName).onsuccess = resolve;
+  });
 }
 
-function successClear(event) {
-  clearIterator.next(event);
-}
+window.setup = function*() {
+  yield idbGenerator();
+};
 
-window.clear = function*(callback) {
+window.clear = function*() {
   document.cookie = "sc1=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+
   localStorage.clear();
   sessionStorage.clear();
-  indexedDB.deleteDatabase("idb-s1").onsuccess = successClear;
-  yield undefined;
-  indexedDB.deleteDatabase("idb-s2").onsuccess = successClear;
-  yield undefined;
-  console.log("removed cookies and stuff from secured iframe");
-  callback();
-}
+
+  yield deleteDB("idb-s1");
+  yield deleteDB("idb-s2");
+
+  dump("removed cookies, localStorage, sessionStorage and indexedDB data " +
+       "from " + document.location + "\n");
+};
 </script>
 </body>
 </html>
diff --git a/toolkit/devtools/storage/test/storage-unsecured-iframe.html b/toolkit/devtools/storage/test/storage-unsecured-iframe.html
index c3a1eeb570..842d80d7aa 100644
--- a/toolkit/devtools/storage/test/storage-unsecured-iframe.html
+++ b/toolkit/devtools/storage/test/storage-unsecured-iframe.html
@@ -8,20 +8,23 @@ Iframe for testing multiple host detetion in storage actor
 </head>
 <body>
 <script>
-
+"use strict";
 document.cookie = "uc1=foobar; domain=.example.org; path=/; secure=true";
 localStorage.setItem("iframe-u-ls1", "foobar");
 sessionStorage.setItem("iframe-u-ss1", "foobar1");
 sessionStorage.setItem("iframe-u-ss2", "foobar2");
 console.log("added cookies and stuff from unsecured iframe");
 
-window.clear = function*(callback) {
-  document.cookie = "uc1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.example.org; secure=true";
+window.clear = function*() {
+  document.cookie = "uc1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; " +
+                    "domain=.example.org; secure=true";
+
   localStorage.clear();
   sessionStorage.clear();
-  console.log("removed cookies and stuff from unsecured iframe");
-  callback();
-}
+
+  dump("removed cookies, localStorage and sessionStorage from " +
+       document.location + "\n");
+};
 </script>
 </body>
 </html>
diff --git a/toolkit/devtools/storage/test/storage-updates.html b/toolkit/devtools/storage/test/storage-updates.html
index 626118d000..0392fd665e 100644
--- a/toolkit/devtools/storage/test/storage-updates.html
+++ b/toolkit/devtools/storage/test/storage-updates.html
@@ -8,10 +8,10 @@ Bug 965872 - Storage inspector actor with cookies, local storage and session sto
   <title>Storage inspector blank html for tests</title>
 </head>
 <body>
-<script>
-
+<script type="application/javascript;version=1.7">
+"use strict";
 window.addCookie = function(name, value, path, domain, expires, secure) {
-  var cookieString = name + "=" + value + ";";
+  let cookieString = name + "=" + value + ";";
   if (path) {
     cookieString += "path=" + path + ";";
   }
@@ -28,19 +28,23 @@ window.addCookie = function(name, value, path, domain, expires, secure) {
 };
 
 window.removeCookie = function(name, path) {
-  document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=" + path;
-}
+  document.cookie =
+    name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=" + path;
+};
 
-window.clear = function*(callback) {
-  var cookies = document.cookie;
-  for (var cookie of cookies.split(";")) {
+window.clear = function*() {
+  let cookies = document.cookie;
+  for (let cookie of cookies.split(";")) {
     removeCookie(cookie.split("=")[0]);
     removeCookie(cookie.split("=")[0], "/browser");
   }
+
   localStorage.clear();
   sessionStorage.clear();
-  callback();
-}
+
+  dump("removed cookies, localStorage and sessionStorage from " +
+       document.location + "\n");
+};
 
 window.onload = function() {
   addCookie("c1", "1.2.3.4.5.6.7", "/browser");
@@ -57,7 +61,7 @@ window.onload = function() {
   sessionStorage.setItem("ss1", "foobar");
   sessionStorage.setItem("ss2", "foobar");
   sessionStorage.setItem("ss3", "foobar");
-}
+};
 </script>
 </body>
 </html>
diff --git a/toolkit/locales/en-US/chrome/global/devtools/storage.properties b/toolkit/locales/en-US/chrome/global/devtools/storage.properties
index f57b243f5d..5f1ebb0b3d 100644
--- a/toolkit/locales/en-US/chrome/global/devtools/storage.properties
+++ b/toolkit/locales/en-US/chrome/global/devtools/storage.properties
@@ -53,6 +53,7 @@ tree.labels.cookies=Cookies
 tree.labels.localStorage=Local Storage
 tree.labels.sessionStorage=Session Storage
 tree.labels.indexedDB=Indexed DB
+tree.labels.Cache=Cache Storage
 
 # LOCALIZATION NOTE (table.headers.*.*):
 # These strings are the header names of the columns in the Storage Table for
@@ -83,6 +84,9 @@ table.headers.localStorage.value=Value
 table.headers.sessionStorage.name=Key
 table.headers.sessionStorage.value=Value
 
+table.headers.Cache.url=URL
+table.headers.Cache.status=Status
+
 table.headers.indexedDB.name=Key
 table.headers.indexedDB.db=Database Name
 table.headers.indexedDB.objectStore=Object Store Name
diff --git a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.cpp b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.cpp
index 0e06748045..d8e6c0a3a9 100644
--- a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.cpp
+++ b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.cpp
@@ -42,6 +42,7 @@ GonkBufferQueueProducer::GonkBufferQueueProducer(const sp<GonkBufferQueueCore>&
     mCore(core),
     mSlots(core->mSlots),
     mConsumerName(),
+    mSynchronousMode(true),
     mStickyTransform(0) {}
 
 GonkBufferQueueProducer::~GonkBufferQueueProducer() {}
@@ -501,6 +502,22 @@ status_t GonkBufferQueueProducer::attachBuffer(int* outSlot,
     return returnFlags;
 }
 
+status_t GonkBufferQueueProducer::setSynchronousMode(bool enabled) {
+    ALOGV("setSynchronousMode: enabled=%d", enabled);
+    Mutex::Autolock lock(mCore->mMutex);
+
+    if (mCore->mIsAbandoned) {
+        ALOGE("setSynchronousMode: BufferQueue has been abandoned!");
+        return NO_INIT;
+    }
+
+    if (mSynchronousMode != enabled) {
+        mSynchronousMode = enabled;
+        mCore->mDequeueCondition.broadcast();
+    }
+    return OK;
+}
+
 status_t GonkBufferQueueProducer::queueBuffer(int slot,
         const QueueBufferInput &input, QueueBufferOutput *output) {
     ATRACE_CALL();
@@ -619,7 +636,7 @@ status_t GonkBufferQueueProducer::queueBuffer(int slot,
             // When the queue is not empty, we need to look at the front buffer
             // state to see if we need to replace it
             GonkBufferQueueCore::Fifo::iterator front(mCore->mQueue.begin());
-            if (front->mIsDroppable) {
+            if (front->mIsDroppable || !mSynchronousMode) {
                 // If the front queued buffer is still being tracked, we first
                 // mark it as freed
                 if (mCore->stillTracking(front)) {
@@ -630,6 +647,7 @@ status_t GonkBufferQueueProducer::queueBuffer(int slot,
                 }
                 // Overwrite the droppable buffer with the incoming one
                 *front = item;
+                listener = mCore->mConsumerListener;
             } else {
                 mCore->mQueue.push_back(item);
                 listener = mCore->mConsumerListener;
diff --git a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h
index 46bd9512e3..a1a22416ad 100644
--- a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h
+++ b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h
@@ -172,6 +172,16 @@ public:
     virtual void allocateBuffers(bool async, uint32_t width, uint32_t height,
             uint32_t format, uint32_t usage);
 
+    // setSynchronousMode sets whether dequeueBuffer is synchronous or
+    // asynchronous. In synchronous mode, dequeueBuffer blocks until
+    // a buffer is available, the currently bound buffer can be dequeued and
+    // queued buffers will be acquired in order.  In asynchronous mode,
+    // a queued buffer may be replaced by a subsequently queued buffer.
+    //
+    // The default mode is synchronous.
+    // This should be called only during initialization.
+    virtual status_t setSynchronousMode(bool enabled);
+
 private:
     // This is required by the IBinder::DeathRecipient interface
     virtual void binderDied(const wp<IBinder>& who);
@@ -194,6 +204,9 @@ private:
     // most updates).
     String8 mConsumerName;
 
+    // mSynchronousMode whether we're in synchronous mode or not
+    bool mSynchronousMode;
+
     uint32_t mStickyTransform;
 
 }; // class GonkBufferQueueProducer
diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build
index 6b3fe4c64e..96fe175d2c 100644
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -29,6 +29,7 @@ if CONFIG['ANDROID_VERSION'] >= '21':
     EXPORTS += [
         'GonkBufferQueueLL/GonkBufferQueueDefs.h',
         'GonkBufferQueueLL/GonkBufferQueueLL.h',
+        'GonkBufferQueueLL/GonkBufferQueueProducer.h',
         'GonkBufferQueueLL/GonkBufferSlot.h',
         'GonkConsumerBaseLL.h',
         'GonkNativeWindowClientLL.h',
diff --git a/xpcom/ds/nsStaticNameTable.cpp b/xpcom/ds/nsStaticNameTable.cpp
index ae1a3b7b0d..d5fa02356d 100644
--- a/xpcom/ds/nsStaticNameTable.cpp
+++ b/xpcom/ds/nsStaticNameTable.cpp
@@ -19,48 +19,47 @@ using namespace mozilla;
 
 struct NameTableKey
 {
-  explicit NameTableKey(const nsAFlatCString* aKeyStr)
-    : mIsUnichar(false)
+  NameTableKey(const nsDependentCString aNameArray[],
+               const nsAFlatCString* aKeyStr)
+    : mNameArray(aNameArray)
+    , mIsUnichar(false)
   {
     mKeyStr.m1b = aKeyStr;
   }
 
-  explicit NameTableKey(const nsAFlatString* aKeyStr)
-    : mIsUnichar(true)
+  NameTableKey(const nsDependentCString aNameArray[],
+               const nsAFlatString* aKeyStr)
+    : mNameArray(aNameArray)
+    , mIsUnichar(true)
   {
     mKeyStr.m2b = aKeyStr;
   }
 
-  bool mIsUnichar;
+  const nsDependentCString* mNameArray;
   union
   {
     const nsAFlatCString* m1b;
     const nsAFlatString* m2b;
   } mKeyStr;
+  bool mIsUnichar;
 };
 
 struct NameTableEntry : public PLDHashEntryHdr
 {
-  // no ownership here!
-  const nsAFlatCString* mString;
   int32_t mIndex;
 };
 
 static bool
 matchNameKeysCaseInsensitive(PLDHashTable*, const PLDHashEntryHdr* aHdr,
-                             const void* aKey)
+                             const void* aVoidKey)
 {
-  const NameTableEntry* entry = static_cast<const NameTableEntry*>(aHdr);
-  const NameTableKey* keyValue = static_cast<const NameTableKey*>(aKey);
-  const nsAFlatCString* entryKey = entry->mString;
+  auto entry = static_cast<const NameTableEntry*>(aHdr);
+  auto key = static_cast<const NameTableKey*>(aVoidKey);
+  const nsDependentCString* name = &key->mNameArray[entry->mIndex];
 
-  if (keyValue->mIsUnichar) {
-    return keyValue->mKeyStr.m2b->LowerCaseEqualsASCII(entryKey->get(),
-                                                       entryKey->Length());
-  }
-
-  return keyValue->mKeyStr.m1b->LowerCaseEqualsASCII(entryKey->get(),
-                                                     entryKey->Length());
+  return key->mIsUnichar
+       ? key->mKeyStr.m2b->LowerCaseEqualsASCII(name->get(), name->Length())
+       : key->mKeyStr.m1b->LowerCaseEqualsASCII(name->get(), name->Length());
 }
 
 /*
@@ -134,16 +133,20 @@ nsStaticCaseInsensitiveNameTable::nsStaticCaseInsensitiveNameTable(
     nsDependentCString* strPtr = &mNameArray[index];
     new (strPtr) nsDependentCString(raw);
 
-    NameTableKey key(strPtr);
+    NameTableKey key(mNameArray, strPtr);
 
     auto entry = static_cast<NameTableEntry*>(mNameTable.Add(&key, fallible));
     if (!entry) {
       continue;
     }
 
-    NS_ASSERTION(entry->mString == 0, "Entry already exists!");
+    // If the entry already exists it's unlikely but possible that its index is
+    // zero, in which case this assertion won't fail. But if the index is
+    // non-zero (highly likely) then it will fail. In other words, this
+    // assertion is likely but not guaranteed to detect if an entry is already
+    // used.
+    MOZ_ASSERT(entry->mIndex == 0, "Entry already exists!");
 
-    entry->mString = strPtr;      // not owned!
     entry->mIndex = index;
   }
 #ifdef DEBUG
@@ -168,7 +171,7 @@ nsStaticCaseInsensitiveNameTable::Lookup(const nsACString& aName)
 
   const nsAFlatCString& str = PromiseFlatCString(aName);
 
-  NameTableKey key(&str);
+  NameTableKey key(mNameArray, &str);
   auto entry = static_cast<NameTableEntry*>(mNameTable.Search(&key));
 
   return entry ? entry->mIndex : nsStaticCaseInsensitiveNameTable::NOT_FOUND;
@@ -181,7 +184,7 @@ nsStaticCaseInsensitiveNameTable::Lookup(const nsAString& aName)
 
   const nsAFlatString& str = PromiseFlatString(aName);
 
-  NameTableKey key(&str);
+  NameTableKey key(mNameArray, &str);
   auto entry = static_cast<NameTableEntry*>(mNameTable.Search(&key));
 
   return entry ? entry->mIndex : nsStaticCaseInsensitiveNameTable::NOT_FOUND;
diff --git a/xpcom/glue/FileUtils.cpp b/xpcom/glue/FileUtils.cpp
index ad52446299..699812461f 100644
--- a/xpcom/glue/FileUtils.cpp
+++ b/xpcom/glue/FileUtils.cpp
@@ -188,6 +188,35 @@ mozilla::ReadSysFile(
 
 #endif /* ReadSysFile_PRESENT */
 
+#ifdef WriteSysFile_PRESENT
+
+bool
+mozilla::WriteSysFile(
+  const char* aFilename,
+  const char* aBuf)
+{
+  size_t aBufSize = strlen(aBuf);
+  int fd = MOZ_TEMP_FAILURE_RETRY(open(aFilename, O_WRONLY));
+  if (fd < 0) {
+    return false;
+  }
+  ScopedClose autoClose(fd);
+  ssize_t bytesWritten;
+  size_t offset = 0;
+  do {
+    bytesWritten = MOZ_TEMP_FAILURE_RETRY(write(fd, aBuf + offset,
+                                                aBufSize - offset));
+    if (bytesWritten == -1) {
+      return false;
+    }
+    offset += bytesWritten;
+  } while (bytesWritten > 0 && offset < aBufSize);
+  MOZ_ASSERT(offset == aBufSize);
+  return true;
+}
+
+#endif /* WriteSysFile_PRESENT */
+
 void
 mozilla::ReadAheadLib(nsIFile* aFile)
 {
diff --git a/xpcom/glue/FileUtils.h b/xpcom/glue/FileUtils.h
index f6242c9d8d..aaf912b21b 100644
--- a/xpcom/glue/FileUtils.h
+++ b/xpcom/glue/FileUtils.h
@@ -171,15 +171,19 @@ void ReadAhead(filedesc_t aFd, const size_t aOffset = 0,
 }))
 #endif
 
-/* Define ReadSysFile() only on GONK to avoid unnecessary lubxul bloat.
-Also define it in debug builds, so that unit tests for it can be written
-and run in non-GONK builds. */
+/* Define ReadSysFile() and WriteSysFile() only on GONK to avoid unnecessary
+ * libxul bloat. Also define it in debug builds, so that unit tests for it can
+ * be written and run in non-GONK builds. */
 #if (defined(MOZ_WIDGET_GONK) || defined(DEBUG)) && defined(XP_UNIX)
 
 #ifndef ReadSysFile_PRESENT
 #define ReadSysFile_PRESENT
 #endif /* ReadSysFile_PRESENT */
 
+#ifndef WriteSysFile_PRESENT
+#define WriteSysFile_PRESENT
+#endif /* WriteSysFile_PRESENT */
+
 /**
  * Read the contents of a file.
  * This function is intended for reading a single-lined text files from
@@ -207,6 +211,8 @@ bool ReadSysFile(const char* aFilename, int* aVal);
  */
 bool ReadSysFile(const char* aFilename, bool* aVal);
 
+bool WriteSysFile(const char* aFilename, const char* aBuf);
+
 #endif /* (MOZ_WIDGET_GONK || DEBUG) && XP_UNIX */
 
 } // namespace mozilla
diff --git a/xpcom/glue/nsCOMArray.cpp b/xpcom/glue/nsCOMArray.cpp
index c259176392..f07e37f24a 100644
--- a/xpcom/glue/nsCOMArray.cpp
+++ b/xpcom/glue/nsCOMArray.cpp
@@ -292,23 +292,6 @@ nsCOMArray_base::SetCount(int32_t aNewCount)
   return true;
 }
 
-size_t
-nsCOMArray_base::SizeOfExcludingThis(
-    nsBaseArraySizeOfElementIncludingThisFunc aSizeOfElementIncludingThis,
-    mozilla::MallocSizeOf aMallocSizeOf, void* aData) const
-{
-  size_t n = mArray.ShallowSizeOfExcludingThis(aMallocSizeOf);
-
-  if (aSizeOfElementIncludingThis) {
-    for (uint32_t index = 0; index < mArray.Length(); ++index) {
-      n += aSizeOfElementIncludingThis(mArray[index], aMallocSizeOf, aData);
-    }
-  }
-
-  return n;
-}
-
-
 void
 nsCOMArray_base::Adopt(nsISupports** aElements, uint32_t aSize)
 {
diff --git a/xpcom/glue/nsCOMArray.h b/xpcom/glue/nsCOMArray.h
index 16a4fc1da8..7f9d5d39d1 100644
--- a/xpcom/glue/nsCOMArray.h
+++ b/xpcom/glue/nsCOMArray.h
@@ -163,15 +163,17 @@ public:
   void SetCapacity(uint32_t aCapacity) { mArray.SetCapacity(aCapacity); }
   uint32_t Capacity() { return mArray.Capacity(); }
 
-  typedef size_t (*nsBaseArraySizeOfElementIncludingThisFunc)(
-    nsISupports* aElement, mozilla::MallocSizeOf aMallocSizeOf, void* aData);
-
-  // Measures the size of the array's element storage, and if
-  // |aSizeOfElement| is non-nullptr, measures the size of things pointed to
-  // by elements.
-  size_t SizeOfExcludingThis(
-    nsBaseArraySizeOfElementIncludingThisFunc aSizeOfElementIncludingThis,
-    mozilla::MallocSizeOf aMallocSizeOf, void* aData = nullptr) const;
+  // Measures the size of the array's element storage. If you want to measure
+  // anything hanging off the array, you must iterate over the elements and
+  // measure them individually; hence the "Shallow" prefix. Note that because
+  // each element in an nsCOMArray<T> is actually a T* any such iteration
+  // should use a SizeOfIncludingThis() function on each element rather than a
+  // SizeOfExcludingThis() function, so that the memory taken by the T itself
+  // is included as well as anything it points to.
+  size_t ShallowSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
+  {
+    return mArray.ShallowSizeOfExcludingThis(aMallocSizeOf);
+  }
 
 private:
 
@@ -402,21 +404,6 @@ public:
     nsCOMArray_base::SwapElements(aOther);
   }
 
-  // Each element in an nsCOMArray<T> is actually a T*, so this function is
-  // "IncludingThis" rather than "ExcludingThis" because it needs to measure
-  // the memory taken by the T itself as well as anything it points to.
-  typedef size_t (*nsCOMArraySizeOfElementIncludingThisFunc)(
-    T* aElement, mozilla::MallocSizeOf aMallocSizeOf, void* aData);
-
-  size_t SizeOfExcludingThis(
-      nsCOMArraySizeOfElementIncludingThisFunc aSizeOfElementIncludingThis,
-      mozilla::MallocSizeOf aMallocSizeOf, void* aData = nullptr) const
-  {
-    return nsCOMArray_base::SizeOfExcludingThis(
-      nsBaseArraySizeOfElementIncludingThisFunc(aSizeOfElementIncludingThis),
-      aMallocSizeOf, aData);
-  }
-
   /**
    * Adopt parameters that resulted from an XPIDL outparam. The aElements
    * parameter will be freed as a result of the call.
diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build
index 227e654e9b..bc5a403567 100644
--- a/xpcom/glue/staticruntime/moz.build
+++ b/xpcom/glue/staticruntime/moz.build
@@ -37,6 +37,9 @@ USE_STATIC_LIBS = True
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
 DISABLE_STL_WRAPPING = True
 
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += ['-Wshadow']
+
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [
     'fallible',
diff --git a/xpcom/string/nsReadableUtils.cpp b/xpcom/string/nsReadableUtils.cpp
index d0877d57ee..e76b84400d 100644
--- a/xpcom/string/nsReadableUtils.cpp
+++ b/xpcom/string/nsReadableUtils.cpp
@@ -1032,6 +1032,17 @@ CountCharInReadable(const nsACString& aStr, char aChar)
   return count;
 }
 
+bool
+StringBeginsWith(const nsAString& aSource, const nsAString& aSubstring)
+{
+  nsAString::size_type src_len = aSource.Length(),
+                       sub_len = aSubstring.Length();
+  if (sub_len > src_len) {
+    return false;
+  }
+  return Substring(aSource, 0, sub_len).Equals(aSubstring);
+}
+
 bool
 StringBeginsWith(const nsAString& aSource, const nsAString& aSubstring,
                  const nsStringComparator& aComparator)
@@ -1044,6 +1055,17 @@ StringBeginsWith(const nsAString& aSource, const nsAString& aSubstring,
   return Substring(aSource, 0, sub_len).Equals(aSubstring, aComparator);
 }
 
+bool
+StringBeginsWith(const nsACString& aSource, const nsACString& aSubstring)
+{
+  nsACString::size_type src_len = aSource.Length(),
+                        sub_len = aSubstring.Length();
+  if (sub_len > src_len) {
+    return false;
+  }
+  return Substring(aSource, 0, sub_len).Equals(aSubstring);
+}
+
 bool
 StringBeginsWith(const nsACString& aSource, const nsACString& aSubstring,
                  const nsCStringComparator& aComparator)
@@ -1056,6 +1078,17 @@ StringBeginsWith(const nsACString& aSource, const nsACString& aSubstring,
   return Substring(aSource, 0, sub_len).Equals(aSubstring, aComparator);
 }
 
+bool
+StringEndsWith(const nsAString& aSource, const nsAString& aSubstring)
+{
+  nsAString::size_type src_len = aSource.Length(),
+                       sub_len = aSubstring.Length();
+  if (sub_len > src_len) {
+    return false;
+  }
+  return Substring(aSource, src_len - sub_len, sub_len).Equals(aSubstring);
+}
+
 bool
 StringEndsWith(const nsAString& aSource, const nsAString& aSubstring,
                const nsStringComparator& aComparator)
@@ -1069,6 +1102,17 @@ StringEndsWith(const nsAString& aSource, const nsAString& aSubstring,
                                                                aComparator);
 }
 
+bool
+StringEndsWith(const nsACString& aSource, const nsACString& aSubstring)
+{
+  nsACString::size_type src_len = aSource.Length(),
+                        sub_len = aSubstring.Length();
+  if (sub_len > src_len) {
+    return false;
+  }
+  return Substring(aSource, src_len - sub_len, sub_len).Equals(aSubstring);
+}
+
 bool
 StringEndsWith(const nsACString& aSource, const nsACString& aSubstring,
                const nsCStringComparator& aComparator)
diff --git a/xpcom/string/nsReadableUtils.h b/xpcom/string/nsReadableUtils.h
index 6a697d5eae..12b2e67465 100644
--- a/xpcom/string/nsReadableUtils.h
+++ b/xpcom/string/nsReadableUtils.h
@@ -386,18 +386,18 @@ uint32_t CountCharInReadable(const nsAString& aStr,
 uint32_t CountCharInReadable(const nsACString& aStr,
                              char aChar);
 
+bool StringBeginsWith(const nsAString& aSource, const nsAString& aSubstring);
 bool StringBeginsWith(const nsAString& aSource, const nsAString& aSubstring,
-                      const nsStringComparator& aComparator =
-                        nsDefaultStringComparator());
+                      const nsStringComparator& aComparator);
+bool StringBeginsWith(const nsACString& aSource, const nsACString& aSubstring);
 bool StringBeginsWith(const nsACString& aSource, const nsACString& aSubstring,
-                      const nsCStringComparator& aComparator =
-                        nsDefaultCStringComparator());
+                      const nsCStringComparator& aComparator);
+bool StringEndsWith(const nsAString& aSource, const nsAString& aSubstring);
 bool StringEndsWith(const nsAString& aSource, const nsAString& aSubstring,
-                    const nsStringComparator& aComparator =
-                      nsDefaultStringComparator());
+                    const nsStringComparator& aComparator);
+bool StringEndsWith(const nsACString& aSource, const nsACString& aSubstring);
 bool StringEndsWith(const nsACString& aSource, const nsACString& aSubstring,
-                    const nsCStringComparator& aComparator =
-                      nsDefaultCStringComparator());
+                    const nsCStringComparator& aComparator);
 
 const nsAFlatString& EmptyString();
 const nsAFlatCString& EmptyCString();
diff --git a/xpcom/string/nsStringObsolete.cpp b/xpcom/string/nsStringObsolete.cpp
index 9f8ce35061..bd6daacab3 100644
--- a/xpcom/string/nsStringObsolete.cpp
+++ b/xpcom/string/nsStringObsolete.cpp
@@ -540,7 +540,7 @@ StripChars2(char16_t* aString,uint32_t aLength,const char* aSet) {
 
 /* ***** END RICKG BLOCK ***** */
 
-static const char* kWhitespace="\b\t\r\n ";
+static const char* kWhitespace="\f\t\r\n ";
 
 // This function is used to implement FindCharInSet and friends
 template <class CharT>
diff --git a/xpcom/string/nsTSubstring.h b/xpcom/string/nsTSubstring.h
index fb6328a3fa..8a2e9a357e 100644
--- a/xpcom/string/nsTSubstring.h
+++ b/xpcom/string/nsTSubstring.h
@@ -1126,6 +1126,13 @@ operator!=(const nsTSubstring_CharT::base_string_type& aLhs,
   return !aLhs.Equals(aRhs);
 }
 
+inline bool
+operator!=(const nsTSubstring_CharT::base_string_type& aLhs,
+           const nsTSubstring_CharT::char_type* aRhs)
+{
+  return !aLhs.Equals(aRhs);
+}
+
 inline bool
 operator<(const nsTSubstring_CharT::base_string_type& aLhs,
           const nsTSubstring_CharT::base_string_type& aRhs)
diff --git a/xpcom/tests/external/TestMinStringAPI.cpp b/xpcom/tests/external/TestMinStringAPI.cpp
index cd0880a739..117d631705 100644
--- a/xpcom/tests/external/TestMinStringAPI.cpp
+++ b/xpcom/tests/external/TestMinStringAPI.cpp
@@ -265,7 +265,7 @@ static bool test_replace()
     return true;
   }
 
-static const char* kWhitespace="\b\t\r\n ";
+static const char* kWhitespace="\f\t\r\n ";
 
 static void
 CompressWhitespace(nsACString &str)