--- a/accessible/atk/AccessibleWrap.cpp
+++ b/accessible/atk/AccessibleWrap.cpp
@@ -678,17 +678,17 @@ getRoleCB(AtkObject *aAtkObj)
 
 #undef ROLE
 
   if (aAtkObj->role == ATK_ROLE_LIST_BOX && !IsAtkVersionAtLeast(2, 1))
     aAtkObj->role = ATK_ROLE_LIST;
   else if (aAtkObj->role == ATK_ROLE_TABLE_ROW && !IsAtkVersionAtLeast(2, 1))
     aAtkObj->role = ATK_ROLE_LIST_ITEM;
   else if (aAtkObj->role == ATK_ROLE_MATH && !IsAtkVersionAtLeast(2, 12))
-    aAtkObj->role = ATK_ROLE_PANEL;
+    aAtkObj->role = ATK_ROLE_SECTION;
   else if (aAtkObj->role == ATK_ROLE_STATIC && !IsAtkVersionAtLeast(2, 16))
     aAtkObj->role = ATK_ROLE_TEXT;
   else if ((aAtkObj->role == ATK_ROLE_MATH_FRACTION ||
             aAtkObj->role == ATK_ROLE_MATH_ROOT) && !IsAtkVersionAtLeast(2, 16))
     aAtkObj->role = ATK_ROLE_SECTION;
 
   return aAtkObj->role;
 }

--- a/accessible/base/RoleMap.h
+++ b/accessible/base/RoleMap.h
@@ -1062,281 +1062,281 @@ ROLE(SWITCH,
      NSAccessibilityCheckBoxRole,
      ROLE_SYSTEM_CHECKBUTTON,
      IA2_ROLE_TOGGLE_BUTTON,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_MATH,
      "math",
      ATK_ROLE_MATH,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      ROLE_SYSTEM_EQUATION,
      ROLE_SYSTEM_EQUATION,
      eNoNameRule)
 
 ROLE(MATHML_IDENTIFIER,
      "mathml identifier",
      ATK_ROLE_STATIC,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_NUMBER,
      "mathml number",
      ATK_ROLE_STATIC,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_OPERATOR,
      "mathml operator",
      ATK_ROLE_STATIC,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_TEXT,
      "mathml text",
      ATK_ROLE_STATIC,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_STRING_LITERAL,
      "mathml string literal",
      ATK_ROLE_STATIC,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_GLYPH,
      "mathml glyph",
      ATK_ROLE_IMAGE,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNameFromSubtreeRule)
 
 ROLE(MATHML_ROW,
      "mathml row",
-     ATK_ROLE_PANEL,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_FRACTION,
      "mathml fraction",
      ATK_ROLE_MATH_FRACTION,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_SQUARE_ROOT,
      "mathml square root",
      ATK_ROLE_MATH_ROOT,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_ROOT,
      "mathml root",
      ATK_ROLE_MATH_ROOT,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_FENCED,
      "mathml fenced",
-     ATK_ROLE_PANEL,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_ENCLOSED,
      "mathml enclosed",
-     ATK_ROLE_PANEL,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STYLE,
      "mathml style",
-     ATK_ROLE_PANEL,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_SUB,
      "mathml sub",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_SUP,
      "mathml sup",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_SUB_SUP,
      "mathml sub sup",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_UNDER,
      "mathml under",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_OVER,
      "mathml over",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_UNDER_OVER,
      "mathml under over",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_MULTISCRIPTS,
      "mathml multiscripts",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_TABLE,
      "mathml table",
      ATK_ROLE_TABLE,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_LABELED_ROW,
      "mathml labeled row",
      ATK_ROLE_TABLE_ROW,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_TABLE_ROW,
      "mathml table row",
      ATK_ROLE_TABLE_ROW,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_CELL,
      "mathml cell",
      ATK_ROLE_TABLE_CELL,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_ACTION,
      "mathml action",
-     ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_ERROR,
      "mathml error",
-     ATK_ROLE_PANEL,
-     NSAccessibilityUnknownRole,
+     ATK_ROLE_SECTION,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK,
      "mathml stack",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_LONG_DIVISION,
      "mathml long division",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK_GROUP,
      "mathml stack group",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK_ROW,
      "mathml stack row",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK_CARRIES,
      "mathml stack carries",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK_CARRY,
      "mathml stack carry",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(MATHML_STACK_LINE,
      "mathml stack line",
      ATK_ROLE_UNKNOWN,
-     NSAccessibilityUnknownRole,
+     NSAccessibilityGroupRole,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
 
 ROLE(RADIO_GROUP,
      "grouping",
      ATK_ROLE_PANEL,
      NSAccessibilityRadioGroupRole,

--- a/accessible/mac/mozAccessible.mm
+++ b/accessible/mac/mozAccessible.mm
@@ -498,16 +498,76 @@ GetClosestInterestingAccessible(id anObj
       return @"AXDefinitionList"; // 10.6+ NSAccessibilityDefinitionListSubrole;
 
     case roles::TERM:
       return @"AXTerm";
 
     case roles::DEFINITION:
       return @"AXDefinition";
 
+    case roles::MATHML_MATH:
+      return @"AXDocumentMath";
+
+    case roles::MATHML_FRACTION:
+      return @"AXMathFraction";
+
+    case roles::MATHML_FENCED:
+      // XXX This should be AXMathFence, but doing so without implementing the
+      // whole fence interface seems to make VoiceOver crash, so we present it
+      // as a row for now.
+      return @"AXMathRow";
+
+    case roles::MATHML_SUB:
+    case roles::MATHML_SUP:
+    case roles::MATHML_SUB_SUP:
+      return @"AXMathSubscriptSuperscript";
+
+    case roles::MATHML_ROW:
+      return @"AXMathRow";
+
+    case roles::MATHML_UNDER:
+    case roles::MATHML_OVER:
+    case roles::MATHML_UNDER_OVER:
+      return @"AXMathUnderOver";
+
+    case roles::MATHML_SQUARE_ROOT:
+      return @"AXMathSquareRoot";
+
+    case roles::MATHML_ROOT:
+      return @"AXMathRoot";
+
+    case roles::MATHML_TEXT:
+      return @"AXMathText";
+
+    case roles::MATHML_NUMBER:
+      return @"AXMathNumber";
+
+    case roles::MATHML_IDENTIFIER:
+      return @"AXMathIdentifier";
+
+    case roles::MATHML_TABLE:
+      return @"AXMathTable";
+
+    case roles::MATHML_TABLE_ROW:
+      return @"AXMathTableRow";
+
+    case roles::MATHML_CELL:
+      return @"AXMathTableCell";
+
+    // XXX: NSAccessibility also uses subroles AXMathSeparatorOperator and
+    // AXMathFenceOperator. We should use the NS_MATHML_OPERATOR_FENCE and
+    // NS_MATHML_OPERATOR_SEPARATOR bits of nsOperatorFlags, but currently they
+    // are only available from the MathML layout code. Hence we just fallback
+    // to subrole AXMathOperator for now.
+    case roles::MATHML_OPERATOR:
+      return @"AXMathOperator";
+
+    case roles::MATHML_MULTISCRIPTS:
+      return @"AXMathMultiscript";
+
     case roles::SWITCH:
       return @"AXSwitch";
 
     default:
       break;
   }
 
   return nil;

--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -300,17 +300,16 @@
 @RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
 @RESPATH@/components/peerconnection.xpt
 #endif
 @RESPATH@/components/places.xpt
 @RESPATH@/components/plugin.xpt
 @RESPATH@/components/pref.xpt
 @RESPATH@/components/prefetch.xpt
-@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @RESPATH@/components/profiler.xpt
 #endif
 @RESPATH@/components/proxyObject.xpt
 @RESPATH@/components/rdf.xpt
 @RESPATH@/components/satchel.xpt
 @RESPATH@/components/saxparser.xpt
 @RESPATH@/components/sessionstore.xpt

--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -470,16 +470,17 @@ skip-if = e10s # Bug 940206 - nsIWebCont
 [browser_addCertException.js]
 skip-if = e10s # Bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_bug1045809.js]
 [browser_e10s_switchbrowser.js]
 [browser_e10s_about_process.js]
 [browser_e10s_chrome_process.js]
 [browser_e10s_javascript.js]
 [browser_blockHPKP.js]
+tags = psm
 skip-if = e10s # bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_mcb_redirect.js]
 [browser_windowactivation.js]
 [browser_contextmenu_childprocess.js]
 [browser_bug963945.js]
 [browser_readerMode.js]
 support-files =
   readerModeArticle.html

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -301,17 +301,16 @@
 @RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
 @RESPATH@/components/peerconnection.xpt
 #endif
 @RESPATH@/components/places.xpt
 @RESPATH@/components/plugin.xpt
 @RESPATH@/components/pref.xpt
 @RESPATH@/components/prefetch.xpt
-@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @RESPATH@/components/profiler.xpt
 #endif
 @RESPATH@/components/rdf.xpt
 @RESPATH@/components/satchel.xpt
 @RESPATH@/components/saxparser.xpt
 @RESPATH@/browser/components/sessionstore.xpt
 @RESPATH@/components/services-crypto-component.xpt

--- a/dom/base/Attr.h
+++ b/dom/base/Attr.h
@@ -93,16 +93,18 @@ public:
   bool Specified() const;
 
   // XPCOM GetNamespaceURI() is OK
   // XPCOM GetPrefix() is OK
   // XPCOM GetLocalName() is OK
 
   Element* GetOwnerElement(ErrorResult& aRv);
 
+  bool IsNSAware() const { return mNsAware; }
+
 protected:
   virtual Element* GetNameSpaceElement() override
   {
     return GetElement();
   }
 
   static bool sInitialized;
 

--- a/dom/base/nsDOMAttributeMap.cpp
+++ b/dom/base/nsDOMAttributeMap.cpp
@@ -10,16 +10,17 @@
 
 #include "nsDOMAttributeMap.h"
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/Attr.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/NamedNodeMapBinding.h"
 #include "mozilla/dom/NodeInfoInlines.h"
+#include "mozilla/Telemetry.h"
 #include "nsAttrName.h"
 #include "nsContentUtils.h"
 #include "nsError.h"
 #include "nsIContentInlines.h"
 #include "nsIDocument.h"
 #include "nsNameSpaceManager.h"
 #include "nsNodeInfoManager.h"
 #include "nsUnicharUtils.h"
@@ -266,16 +267,31 @@ nsDOMAttributeMap::SetNamedItemNS(nsIDOM
 
 already_AddRefed<Attr>
 nsDOMAttributeMap::SetNamedItemInternal(Attr& aAttr,
                                         bool aWithNS,
                                         ErrorResult& aError)
 {
   NS_ENSURE_TRUE(mContent, nullptr);
 
+  if (!aAttr.IsNSAware() &&
+      !mContent->IsHTMLElement() &&
+      aAttr.OwnerDoc()->IsHTMLDocument()) {
+    // Check whether we have a non-lowercase name, and if so log some telemetry.
+    // We check whether the attr's document is HTML _before_ the adopt we do
+    // below, because we're trying to figure out whether we could lowercase the
+    // attr name at creation time.  We restrict this to the !IsNSAware() case,
+    // because we only care about Attr nodes created via createAttribute.
+    nsIAtom* nameAtom = aAttr.NodeInfo()->NameAtom();
+    if (nsContentUtils::StringContainsASCIIUpper(nsDependentAtomString(nameAtom))) {
+        Telemetry::Accumulate(Telemetry::NONLOWERCASE_NONHTML_ATTR_NODE_SET,
+                              true);
+      }
+  }
+
   // XXX should check same-origin between mContent and aAttr however
   // nsContentUtils::CheckSameOrigin can't deal with attributenodes yet
 
   // Check that attribute is not owned by somebody else
   nsDOMAttributeMap* owner = aAttr.GetMap();
   if (owner) {
     if (owner != this) {
       aError.Throw(NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR);

--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7586,28 +7586,16 @@ nsGlobalWindow::ClearInterval(int32_t aH
 {
   ErrorResult rv;
   ClearInterval(aHandle, rv);
 
   return rv.StealNSResult();
 }
 
 NS_IMETHODIMP
-nsGlobalWindow::SetTimeout(int32_t *_retval)
-{
-  return SetTimeoutOrInterval(false, _retval);
-}
-
-NS_IMETHODIMP
-nsGlobalWindow::SetInterval(int32_t *_retval)
-{
-  return SetTimeoutOrInterval(true, _retval);
-}
-
-NS_IMETHODIMP
 nsGlobalWindow::SetResizable(bool aResizable)
 {
   // nop
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -11940,60 +11928,16 @@ nsGlobalWindow::SetTimeoutOrInterval(nsI
 
   timeout->mPublicId = ++mTimeoutPublicIdCounter;
   *aReturn = timeout->mPublicId;
 
   return NS_OK;
 
 }
 
-nsresult
-nsGlobalWindow::SetTimeoutOrInterval(bool aIsInterval, int32_t *aReturn)
-{
-  // This needs to forward to the inner window, but since the current
-  // inner may not be the inner in the calling scope, we need to treat
-  // this specially here as we don't want timeouts registered in a
-  // dying inner window to get registered and run on the current inner
-  // window. To get this right, we need to forward this call to the
-  // inner window that's calling window.setTimeout().
-
-  if (IsOuterWindow()) {
-    nsGlobalWindow* callerInner = CallerInnerWindow();
-    NS_ENSURE_TRUE(callerInner || nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE);
-
-    // If the caller and the callee share the same outer window,
-    // forward to the callee inner. Else, we forward to the current
-    // inner (e.g. someone is calling setTimeout() on a reference to
-    // some other window).
-
-    if (callerInner &&
-        callerInner->GetOuterWindow() == this &&
-        callerInner->IsInnerWindow()) {
-      return callerInner->SetTimeoutOrInterval(aIsInterval, aReturn);
-    }
-
-    FORWARD_TO_INNER(SetTimeoutOrInterval, (aIsInterval, aReturn),
-                     NS_ERROR_NOT_INITIALIZED);
-  }
-
-  int32_t interval = 0;
-  bool isInterval = aIsInterval;
-  nsCOMPtr<nsIScriptTimeoutHandler> handler;
-  nsresult rv = NS_CreateJSTimeoutHandler(this,
-                                          &isInterval,
-                                          &interval,
-                                          getter_AddRefs(handler));
-  if (!handler) {
-    *aReturn = 0;
-    return rv;
-  }
-
-  return SetTimeoutOrInterval(handler, interval, isInterval, aReturn);
-}
-
 int32_t
 nsGlobalWindow::SetTimeoutOrInterval(Function& aFunction, int32_t aTimeout,
                                      const Sequence<JS::Value>& aArguments,
                                      bool aIsInterval, ErrorResult& aError)
 {
   nsGlobalWindow* inner = InnerForSetTimeoutOrInterval(aError);
   if (!inner) {
     return -1;

--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -124,22 +124,16 @@ namespace indexedDB {
 class IDBFactory;
 } // namespace indexedDB
 } // namespace dom
 namespace gfx {
 class VRHMDInfo;
 } // namespace gfx
 } // namespace mozilla
 
-extern nsresult
-NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow,
-                          bool *aIsInterval,
-                          int32_t *aInterval,
-                          nsIScriptTimeoutHandler **aRet);
-
 extern already_AddRefed<nsIScriptTimeoutHandler>
 NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow,
                           mozilla::dom::Function& aFunction,
                           const mozilla::dom::Sequence<JS::Value>& aArguments,
                           mozilla::ErrorResult& aError);
 
 extern already_AddRefed<nsIScriptTimeoutHandler>
 NS_CreateJSTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
@@ -1330,17 +1324,16 @@ public:
   nsresult ClearTimeoutOrInterval(int32_t aTimerID) override
   {
     mozilla::ErrorResult rv;
     ClearTimeoutOrInterval(aTimerID, rv);
     return rv.StealNSResult();
   }
 
   // JS specific timeout functions (JS args grabbed from context).
-  nsresult SetTimeoutOrInterval(bool aIsInterval, int32_t* aReturn);
   nsresult ResetTimersForNonBackgroundWindow();
 
   // The timeout implementation functions.
   void RunTimeout(nsTimeout *aTimeout);
   void RunTimeout() { RunTimeout(nullptr); }
   // Return true if |aTimeout| was cleared while its handler ran.
   bool RunTimeoutHandler(nsTimeout* aTimeout, nsIScriptContext* aScx);
   // Return true if |aTimeout| needs to be reinserted into the timeout list.

--- a/dom/base/nsJSTimeoutHandler.cpp
+++ b/dom/base/nsJSTimeoutHandler.cpp
@@ -53,19 +53,16 @@ public:
     *aLineNo = mLineNo;
   }
 
   virtual const nsTArray<JS::Value>& GetArgs() override
   {
     return mArgs;
   }
 
-  nsresult Init(nsGlobalWindow *aWindow, bool *aIsInterval,
-                int32_t *aInterval, bool* aAllowEval);
-
   void ReleaseJSObjects();
 
 private:
   ~nsJSScriptTimeoutHandler();
 
   // filename, line number and JS language version string of the
   // caller of setTimeout()
   nsCString mFileName;
@@ -243,171 +240,23 @@ nsJSScriptTimeoutHandler::ReleaseJSObjec
 {
   if (mFunction) {
     mFunction = nullptr;
     mArgs.Clear();
     mozilla::DropJSObjects(this);
   }
 }
 
-nsresult
-nsJSScriptTimeoutHandler::Init(nsGlobalWindow *aWindow, bool *aIsInterval,
-                               int32_t *aInterval, bool *aAllowEval)
-{
-  if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
-    // This window was already closed, or never properly initialized,
-    // don't let a timer be scheduled on such a window.
-
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-
-  nsAXPCNativeCallContext *ncc = nullptr;
-  nsresult rv = nsContentUtils::XPConnect()->
-    GetCurrentNativeCallContext(&ncc);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!ncc)
-    return NS_ERROR_NOT_AVAILABLE;
-
-  JSContext *cx = nullptr;
-
-  rv = ncc->GetJSContext(&cx);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t argc;
-  JS::Value *argv = nullptr;
-
-  ncc->GetArgc(&argc);
-  ncc->GetArgvPtr(&argv);
-
-  JS::Rooted<JSFlatString*> expr(cx);
-  JS::Rooted<JSObject*> funobj(cx);
-
-  if (argc < 1) {
-    ::JS_ReportError(cx, "Function %s requires at least 2 parameter",
-                     *aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
-    return NS_ERROR_DOM_TYPE_ERR;
-  }
-
-  int32_t interval = 0;
-  if (argc > 1) {
-    JS::Rooted<JS::Value> arg(cx, argv[1]);
-
-    if (!JS::ToInt32(cx, arg, &interval)) {
-      ::JS_ReportError(cx,
-                       "Second argument to %s must be a millisecond interval",
-                       aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
-      return NS_ERROR_DOM_TYPE_ERR;
-    }
-  }
-
-  if (argc == 1) {
-    // If no interval was specified, treat this like a timeout, to avoid
-    // setting an interval of 0 milliseconds.
-    *aIsInterval = false;
-  }
-
-  JS::Rooted<JS::Value> arg(cx, argv[0]);
-  switch (::JS_TypeOfValue(cx, arg)) {
-  case JSTYPE_FUNCTION:
-    funobj = &arg.toObject();
-    break;
-
-  case JSTYPE_STRING:
-  case JSTYPE_OBJECT:
-    {
-      JSString *str = JS::ToString(cx, arg);
-      if (!str)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-      expr = ::JS_FlattenString(cx, str);
-      if (!expr)
-          return NS_ERROR_OUT_OF_MEMORY;
-
-      argv[0] = JS::StringValue(str);
-    }
-    break;
-
-  default:
-    ::JS_ReportError(cx, "useless %s call (missing quotes around argument?)",
-                     *aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
-
-    // Return an error that nsGlobalWindow can recognize and turn into NS_OK.
-    return NS_ERROR_DOM_TYPE_ERR;
-  }
-
-  if (expr) {
-    // if CSP is enabled, and setTimeout/setInterval was called with a string,
-    // disable the registration and log an error
-    ErrorResult error;
-    *aAllowEval = CheckCSPForEval(cx, aWindow, error);
-    if (error.Failed() || !*aAllowEval) {
-      return error.StealNSResult();
-    }
-
-    MOZ_ASSERT(mExpr.IsEmpty());
-    AssignJSFlatString(mExpr, expr);
-
-    // Get the calling location.
-    nsJSUtils::GetCallingLocation(cx, mFileName, &mLineNo);
-  } else if (funobj) {
-    *aAllowEval = true;
-
-    mozilla::HoldJSObjects(this);
-
-    mFunction = new Function(funobj, GetIncumbentGlobal());
-
-    // Create our arg array.  argc is the number of arguments passed
-    // to setTimeout or setInterval; the first two are our callback
-    // and the delay, so only arguments after that need to go in our
-    // array.
-    // std::max(argc - 2, 0) wouldn't work right because argc is unsigned.
-    uint32_t argCount = std::max(argc, 2u) - 2;
-
-    FallibleTArray<JS::Heap<JS::Value> > args;
-    if (!args.SetCapacity(argCount, fallible)) {
-      // No need to drop here, since we already have a non-null mFunction
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    for (uint32_t idx = 0; idx < argCount; ++idx) {
-      *args.AppendElement(fallible) = argv[idx + 2];
-    }
-    args.SwapElements(mArgs);
-  } else {
-    NS_WARNING("No func and no expr - why are we here?");
-  }
-  *aInterval = interval;
-  return NS_OK;
-}
-
 const char16_t *
 nsJSScriptTimeoutHandler::GetHandlerText()
 {
   NS_ASSERTION(!mFunction, "No expression, so no handler text!");
   return mExpr.get();
 }
 
-nsresult NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow,
-                                   bool *aIsInterval,
-                                   int32_t *aInterval,
-                                   nsIScriptTimeoutHandler **aRet)
-{
-  *aRet = nullptr;
-  nsRefPtr<nsJSScriptTimeoutHandler> handler = new nsJSScriptTimeoutHandler();
-  bool allowEval;
-  nsresult rv = handler->Init(aWindow, aIsInterval, aInterval, &allowEval);
-  if (NS_FAILED(rv) || !allowEval) {
-    return rv;
-  }
-
-  handler.forget(aRet);
-
-  return NS_OK;
-}
-
 already_AddRefed<nsIScriptTimeoutHandler>
 NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow, Function& aFunction,
                           const Sequence<JS::Value>& aArguments,
                           ErrorResult& aError)
 {
   FallibleTArray<JS::Heap<JS::Value> > args;
   if (!args.AppendElements(aArguments, fallible)) {
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);

--- a/dom/base/nsXMLHttpRequest.cpp
+++ b/dom/base/nsXMLHttpRequest.cpp
@@ -673,38 +673,45 @@ nsXMLHttpRequest::AppendToResponseText(c
 {
   NS_ENSURE_STATE(mDecoder);
 
   int32_t destBufferLen;
   nsresult rv = mDecoder->GetMaxLength(aSrcBuffer, aSrcBufferLen,
                                        &destBufferLen);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!mResponseText.SetCapacity(mResponseText.Length() + destBufferLen, fallible)) {
+  uint32_t size = mResponseText.Length() + destBufferLen;
+  if (size < (uint32_t)destBufferLen) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  if (!mResponseText.SetCapacity(size, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   char16_t* destBuffer = mResponseText.BeginWriting() + mResponseText.Length();
 
-  int32_t totalChars = mResponseText.Length();
+  CheckedInt32 totalChars = mResponseText.Length();
 
   // This code here is basically a copy of a similar thing in
   // nsScanner::Append(const char* aBuffer, uint32_t aLen).
   int32_t srclen = (int32_t)aSrcBufferLen;
   int32_t destlen = (int32_t)destBufferLen;
   rv = mDecoder->Convert(aSrcBuffer,
                          &srclen,
                          destBuffer,
                          &destlen);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   totalChars += destlen;
-
-  mResponseText.SetLength(totalChars);
-
+  if (!totalChars.isValid()) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  mResponseText.SetLength(totalChars.value());
   return NS_OK;
 }
 
 /* readonly attribute AString responseText; */
 NS_IMETHODIMP
 nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)
 {
   ErrorResult rv;

--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -751,16 +751,21 @@ IDBFactory::OpenInternal(nsIPrincipal* a
     MOZ_ASSERT(scriptOwner);
 
     request = IDBOpenDBRequest::CreateForWindow(this, mWindow, scriptOwner);
   } else {
     autoJS.Init(mOwningObject.get());
     JS::Rooted<JSObject*> scriptOwner(autoJS.cx(), mOwningObject);
 
     request = IDBOpenDBRequest::CreateForJS(this, scriptOwner);
+    if (!request) {
+      MOZ_ASSERT(!NS_IsMainThread());
+      aRv.ThrowUncatchableException();
+      return nullptr;
+    }
   }
 
   MOZ_ASSERT(request);
 
   if (aDeleting) {
     IDB_LOG_MARK("IndexedDB %s: Child  Request[%llu]: "
                    "indexedDB.deleteDatabase(\"%s\")",
                  "IndexedDB %s: C R[%llu]: IDBFactory.deleteDatabase()",

--- a/dom/indexedDB/IDBRequest.cpp
+++ b/dom/indexedDB/IDBRequest.cpp
@@ -437,35 +437,56 @@ IDBRequest::PreHandleEvent(EventChainPre
   aVisitor.mParentTarget = mTransaction;
   return NS_OK;
 }
 
 class IDBOpenDBRequest::WorkerFeature final
   : public mozilla::dom::workers::WorkerFeature
 {
   WorkerPrivate* mWorkerPrivate;
+#ifdef DEBUG
+  // This is only here so that assertions work in the destructor even if
+  // NoteAddFeatureFailed was called.
+  WorkerPrivate* mWorkerPrivateDEBUG;
+#endif
 
 public:
   explicit
   WorkerFeature(WorkerPrivate* aWorkerPrivate)
     : mWorkerPrivate(aWorkerPrivate)
+#ifdef DEBUG
+    , mWorkerPrivateDEBUG(aWorkerPrivate)
+#endif
   {
     MOZ_ASSERT(aWorkerPrivate);
     aWorkerPrivate->AssertIsOnWorkerThread();
 
     MOZ_COUNT_CTOR(IDBOpenDBRequest::WorkerFeature);
   }
 
   ~WorkerFeature()
   {
-    mWorkerPrivate->AssertIsOnWorkerThread();
+#ifdef DEBUG
+    mWorkerPrivateDEBUG->AssertIsOnWorkerThread();
+#endif
 
     MOZ_COUNT_DTOR(IDBOpenDBRequest::WorkerFeature);
 
-    mWorkerPrivate->RemoveFeature(mWorkerPrivate->GetJSContext(), this);
+    if (mWorkerPrivate) {
+      mWorkerPrivate->RemoveFeature(mWorkerPrivate->GetJSContext(), this);
+    }
+  }
+
+  void
+  NoteAddFeatureFailed()
+  {
+    MOZ_ASSERT(mWorkerPrivate);
+    mWorkerPrivate->AssertIsOnWorkerThread();
+
+    mWorkerPrivate = nullptr;
   }
 
 private:
   virtual bool
   Notify(JSContext* aCx, Status aStatus) override;
 };
 
 IDBOpenDBRequest::IDBOpenDBRequest(IDBFactory* aFactory, nsPIDOMWindow* aOwner)
@@ -522,16 +543,17 @@ IDBOpenDBRequest::CreateForJS(IDBFactory
 
     workerPrivate->AssertIsOnWorkerThread();
 
     JSContext* cx = workerPrivate->GetJSContext();
     MOZ_ASSERT(cx);
 
     nsAutoPtr<WorkerFeature> feature(new WorkerFeature(workerPrivate));
     if (NS_WARN_IF(!workerPrivate->AddFeature(cx, feature))) {
+      feature->NoteAddFeatureFailed();
       return nullptr;
     }
 
     request->mWorkerFeature = Move(feature);
   }
 
   return request.forget();
 }

--- a/dom/interfaces/base/nsIDOMJSWindow.idl
+++ b/dom/interfaces/base/nsIDOMJSWindow.idl
@@ -1,30 +1,21 @@
 /* -*- Mode: IDL; 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/. */
 
 #include "domstubs.idl"
 
-[scriptable, uuid(4237c376-d637-4b6e-9f8a-1da57e867834)]
+[scriptable, uuid(e0f739e3-47e2-4007-af30-181939e97a51)]
 interface nsIDOMJSWindow : nsISupports
 {
   void                      dump(in DOMString str);
 
   /**
-   * These methods take typeless arguments and optional arguments, the
-   * first argument is either a function or a string, the second
-   * argument must be a number (ms) and the rest of the arguments (2
-   * ... n) are passed to the callback function
-   */
-  long                      setTimeout();
-  long                      setInterval();
-
-  /**
    * These methods take one optional argument that's the timer ID to
    * clear. Often in existing code these methods are passed undefined,
    * which is a nop so we need to support that as well.
    */
   void                      clearTimeout([optional] in long handle);
   void                      clearInterval([optional] in long handle);
 
   /**

--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -99,23 +99,22 @@ void InitPreferredSampleRate()
     // Query failed, use a sensible default.
     sPreferredSampleRate = 44100;
   }
 }
 
 cubeb* GetCubebContextUnlocked()
 {
   sMutex.AssertCurrentThreadOwns();
-  if (!sCubebContext) {
-    MOZ_ASSERT(NS_IsMainThread());
-    if (cubeb_init(&sCubebContext, "CubebUtils") != CUBEB_OK) {
-      NS_WARNING("cubeb_init failed");
-    }
+  if (sCubebContext ||
+      cubeb_init(&sCubebContext, "CubebUtils") == CUBEB_OK) {
+    return sCubebContext;
   }
-  return sCubebContext;
+  NS_WARNING("cubeb_init failed");
+  return nullptr;
 }
 
 uint32_t GetCubebLatency()
 {
   StaticMutexAutoLock lock(sMutex);
   return sCubebLatency;
 }
 

--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -5,17 +5,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaDecoder.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
 #include <limits>
 #include "nsIObserver.h"
 #include "nsTArray.h"
-#include "CubebUtils.h"
 #include "VideoUtils.h"
 #include "MediaDecoderStateMachine.h"
 #include "ImageContainer.h"
 #include "MediaResource.h"
 #include "nsError.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPtr.h"
 #include "nsIMemoryReporter.h"
@@ -397,21 +396,16 @@ MediaDecoder::MediaDecoder() :
 }
 
 bool MediaDecoder::Init(MediaDecoderOwner* aOwner)
 {
   MOZ_ASSERT(NS_IsMainThread());
   mOwner = aOwner;
   mVideoFrameContainer = aOwner->GetVideoFrameContainer();
   MediaShutdownManager::Instance().Register(this);
-  // We don't use the cubeb context yet, but need to ensure it is created on
-  // the main thread.
-  if (!CubebUtils::GetCubebContext()) {
-    NS_WARNING("Audio backend initialization failed.");
-  }
   return true;
 }
 
 void MediaDecoder::Shutdown()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   if (mShuttingDown)

--- a/dom/media/MediaInfo.h
+++ b/dom/media/MediaInfo.h
@@ -281,16 +281,21 @@ public:
 
   nsRefPtr<MediaByteBuffer> mCodecSpecificConfig;
   nsRefPtr<MediaByteBuffer> mExtraData;
 
 };
 
 class EncryptionInfo {
 public:
+  EncryptionInfo()
+    : mEncrypted(false)
+  {
+  }
+
   struct InitData {
     template<typename AInitDatas>
     InitData(const nsAString& aType, AInitDatas&& aInitData)
       : mType(aType)
       , mInitData(Forward<AInitDatas>(aInitData))
     {
     }
 
@@ -300,32 +305,36 @@ public:
     // Encryption data.
     nsTArray<uint8_t> mInitData;
   };
   typedef nsTArray<InitData> InitDatas;
 
   // True if the stream has encryption metadata
   bool IsEncrypted() const
   {
-    return !mInitDatas.IsEmpty();
+    return mEncrypted;
   }
 
   template<typename AInitDatas>
   void AddInitData(const nsAString& aType, AInitDatas&& aInitData)
   {
     mInitDatas.AppendElement(InitData(aType, Forward<AInitDatas>(aInitData)));
+    mEncrypted = true;
   }
 
   void AddInitData(const EncryptionInfo& aInfo)
   {
     mInitDatas.AppendElements(aInfo.mInitDatas);
+    mEncrypted = !!mInitDatas.Length();
   }
 
   // One 'InitData' per encrypted buffer.
   InitDatas mInitDatas;
+private:
+  bool mEncrypted;
 };
 
 class MediaInfo {
 public:
   bool HasVideo() const
   {
     return mVideo.IsValid();
   }

--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -26,16 +26,17 @@
 #endif
 #include "GMPContentParent.h"
 
 #include "mozilla/dom/CrashReporterParent.h"
 using mozilla::dom::CrashReporterParent;
 using mozilla::ipc::GeckoChildProcessHost;
 
 #ifdef MOZ_CRASHREPORTER
+#include "nsPrintfCString.h"
 using CrashReporter::AnnotationTable;
 using CrashReporter::GetIDFromMinidump;
 #endif
 
 #include "mozilla/Telemetry.h"
 
 namespace mozilla {
 
@@ -191,16 +192,21 @@ GMPParent::LoadProcess()
   return NS_OK;
 }
 
 void
 AbortWaitingForGMPAsyncShutdown(nsITimer* aTimer, void* aClosure)
 {
   NS_WARNING("Timed out waiting for GMP async shutdown!");
   GMPParent* parent = reinterpret_cast<GMPParent*>(aClosure);
+#if defined(MOZ_CRASHREPORTER)
+  CrashReporter::AnnotateCrashReport(
+    nsPrintfCString("AsyncPluginShutdown-%s@%p", parent->GetDisplayName().get(), parent),
+    NS_LITERAL_CSTRING("Timed out waiting for async shutdown"));
+#endif
   nsRefPtr<GeckoMediaPluginServiceParent> service =
     GeckoMediaPluginServiceParent::GetSingleton();
   if (service) {
     service->AsyncShutdownComplete(parent);
   }
 }
 
 nsresult
@@ -234,18 +240,30 @@ GMPParent::EnsureAsyncShutdownTimeoutSet
     nsITimer::TYPE_ONE_SHOT);
 }
 
 bool
 GMPParent::RecvPGMPContentChildDestroyed()
 {
   --mGMPContentChildCount;
   if (!IsUsed()) {
+#if defined(MOZ_CRASHREPORTER)
+    CrashReporter::AnnotateCrashReport(
+      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+      NS_LITERAL_CSTRING("Content children destroyed"));
+#endif
     CloseIfUnused();
   }
+#if defined(MOZ_CRASHREPORTER)
+  else {
+    CrashReporter::AnnotateCrashReport(
+      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+      nsPrintfCString("Content child destroyed, remaining: %u", mGMPContentChildCount));
+  }
+#endif
   return true;
 }
 
 void
 GMPParent::CloseIfUnused()
 {
   MOZ_ASSERT(GMPThread() == NS_GetCurrentThread());
   LOGD("%s: mAsyncShutdownRequired=%d", __FUNCTION__, mAsyncShutdownRequired);
@@ -257,19 +275,29 @@ GMPParent::CloseIfUnused()
     // Ensure all timers are killed.
     for (uint32_t i = mTimers.Length(); i > 0; i--) {
       mTimers[i - 1]->Shutdown();
     }
 
     if (mAsyncShutdownRequired) {
       if (!mAsyncShutdownInProgress) {
         LOGD("%s: sending async shutdown notification", __FUNCTION__);
+#if defined(MOZ_CRASHREPORTER)
+      CrashReporter::AnnotateCrashReport(
+        nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+        NS_LITERAL_CSTRING("Sent BeginAsyncShutdown"));
+#endif
         mAsyncShutdownInProgress = true;
         if (!SendBeginAsyncShutdown() ||
             NS_FAILED(EnsureAsyncShutdownTimeoutSet())) {
+#if defined(MOZ_CRASHREPORTER)
+          CrashReporter::AnnotateCrashReport(
+            nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+            NS_LITERAL_CSTRING("Could not send BeginAsyncShutdown - Aborting"));
+#endif
           AbortAsyncShutdown();
         }
       }
     } else {
       // Any async shutdown must be complete. Shutdown GMPStorage.
       for (size_t i = mStorage.Length(); i > 0; i--) {
         mStorage[i - 1]->Shutdown();
       }
@@ -308,16 +336,21 @@ GMPParent::CloseActive(bool aDieWhenUnlo
 
   if (aDieWhenUnloaded) {
     mDeleteProcessOnlyOnUnload = true; // don't allow this to go back...
   }
   if (mState == GMPStateLoaded) {
     mState = GMPStateUnloading;
   }
   if (mState != GMPStateNotLoaded && IsUsed()) {
+#if defined(MOZ_CRASHREPORTER)
+    CrashReporter::AnnotateCrashReport(
+      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+      nsPrintfCString("Sent CloseActive, content children to close: %u", mGMPContentChildCount));
+#endif
     unused << SendCloseActive();
   }
 }
 
 void
 GMPParent::MarkForDeletion()
 {
   mDeleteProcessOnlyOnUnload = true;
@@ -563,16 +596,21 @@ GMPParent::ActorDestroy(ActorDestroyReas
   mState = GMPStateClosing;
   mAbnormalShutdownInProgress = true;
   CloseActive(false);
 
   // Normal Shutdown() will delete the process on unwind.
   if (AbnormalShutdown == aWhy) {
     nsRefPtr<GMPParent> self(this);
     if (mAsyncShutdownRequired) {
+#if defined(MOZ_CRASHREPORTER)
+      CrashReporter::AnnotateCrashReport(
+        nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+        NS_LITERAL_CSTRING("Actor destroyed"));
+#endif
       mService->AsyncShutdownComplete(this);
       mAsyncShutdownRequired = false;
     }
     // Must not call Close() again in DeleteProcess(), as we'll recurse
     // infinitely if we do.
     MOZ_ASSERT(mState == GMPStateClosing);
     DeleteProcess();
     // Note: final destruction will be Dispatched to ourself
@@ -865,16 +903,21 @@ GMPParent::RecvAsyncShutdownRequired()
 }
 
 bool
 GMPParent::RecvAsyncShutdownComplete()
 {
   LOGD("%s", __FUNCTION__);
 
   MOZ_ASSERT(mAsyncShutdownRequired);
+#if defined(MOZ_CRASHREPORTER)
+  CrashReporter::AnnotateCrashReport(
+    nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
+    NS_LITERAL_CSTRING("Received AsyncShutdownComplete"));
+#endif
   AbortAsyncShutdown();
   return true;
 }
 
 class RunCreateContentParentCallbacks : public nsRunnable
 {
 public:
   explicit RunCreateContentParentCallbacks(GMPContentParent* aGMPContentParent)

--- a/dom/media/mediasource/SourceBuffer.cpp
+++ b/dom/media/mediasource/SourceBuffer.cpp
@@ -311,17 +311,17 @@ SourceBuffer::SourceBuffer(MediaSource* 
   , mActive(false)
   , mUpdateID(0)
   , mReportedOffset(0)
   , mType(aType)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aMediaSource);
   mEvictionThreshold = Preferences::GetUint("media.mediasource.eviction_threshold",
-                                            75 * (1 << 20));
+                                            100 * (1 << 20));
   mContentManager =
     SourceBufferContentManager::CreateManager(this,
                                               aMediaSource->GetDecoder(),
                                               aType);
   MSE_DEBUG("Create mContentManager=%p",
             mContentManager.get());
   if (aType.LowerCaseEqualsLiteral("audio/mpeg") ||
       aType.LowerCaseEqualsLiteral("audio/aac")) {
@@ -576,30 +576,29 @@ SourceBuffer::PrepareAppend(const uint8_
     // We notify that we've evicted from the time range 0 through to
     // the current start point.
     mMediaSource->NotifyEvicted(0.0, newBufferStartTime.ToSeconds());
   }
 
   // See if we have enough free space to append our new data.
   // As we can only evict once we have playable data, we must give a chance
   // to the DASH player to provide a complete media segment.
-  if (aLength > mEvictionThreshold ||
+  if (aLength > mEvictionThreshold || evicted == Result::BUFFER_FULL ||
       ((!mIsUsingFormatReader &&
         mContentManager->GetSize() > mEvictionThreshold - aLength) &&
        evicted != Result::CANT_EVICT)) {
     aRv.Throw(NS_ERROR_DOM_QUOTA_EXCEEDED_ERR);
     return nullptr;
   }
 
   nsRefPtr<MediaByteBuffer> data = new MediaByteBuffer();
   if (!data->AppendElements(aData, aLength, fallible)) {
     aRv.Throw(NS_ERROR_DOM_QUOTA_EXCEEDED_ERR);
     return nullptr;
   }
-  // TODO: Test buffer full flag.
   return data.forget();
 }
 
 double
 SourceBuffer::GetBufferedStart()
 {
   MOZ_ASSERT(NS_IsMainThread());
   ErrorResult dummy;

--- a/dom/media/mediasource/SourceBufferContentManager.h
+++ b/dom/media/mediasource/SourceBufferContentManager.h
@@ -52,16 +52,17 @@ public:
   // http://w3c.github.io/media-source/#sourcebuffer-coded-frame-removal
   virtual nsRefPtr<RangeRemovalPromise> RangeRemoval(TimeUnit aStart, TimeUnit aEnd) = 0;
 
   enum class EvictDataResult : int8_t
   {
     NO_DATA_EVICTED,
     DATA_EVICTED,
     CANT_EVICT,
+    BUFFER_FULL,
   };
 
   // Evicts data up to aPlaybackTime. aThreshold is used to
   // bound the data being evicted. It will not evict more than aThreshold
   // bytes. aBufferStartTime contains the new start time of the data after the
   // eviction.
   virtual EvictDataResult
   EvictData(TimeUnit aPlaybackTime, uint32_t aThreshold, TimeUnit* aBufferStartTime) = 0;

--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -34,32 +34,63 @@ AppendStateToStr(TrackBuffersManager::Ap
       return "PARSING_MEDIA_SEGMENT";
     default:
       return "IMPOSSIBLE";
   }
 }
 
 static Atomic<uint32_t> sStreamSourceID(0u);
 
+#ifdef MOZ_EME
+class DispatchKeyNeededEvent : public nsRunnable {
+public:
+  DispatchKeyNeededEvent(AbstractMediaDecoder* aDecoder,
+                         nsTArray<uint8_t>& aInitData,
+                         const nsString& aInitDataType)
+    : mDecoder(aDecoder)
+    , mInitData(aInitData)
+    , mInitDataType(aInitDataType)
+  {
+  }
+  NS_IMETHOD Run() {
+    // Note: Null check the owner, as the decoder could have been shutdown
+    // since this event was dispatched.
+    MediaDecoderOwner* owner = mDecoder->GetOwner();
+    if (owner) {
+      owner->DispatchEncrypted(mInitData, mInitDataType);
+    }
+    mDecoder = nullptr;
+    return NS_OK;
+  }
+private:
+  nsRefPtr<AbstractMediaDecoder> mDecoder;
+  nsTArray<uint8_t> mInitData;
+  nsString mInitDataType;
+};
+#endif // MOZ_EME
+
 TrackBuffersManager::TrackBuffersManager(dom::SourceBuffer* aParent, MediaSourceDecoder* aParentDecoder, const nsACString& aType)
   : mInputBuffer(new MediaByteBuffer)
   , mAppendState(AppendState::WAITING_FOR_SEGMENT)
   , mBufferFull(false)
   , mFirstInitializationSegmentReceived(false)
   , mActiveTrack(false)
   , mType(aType)
   , mParser(ContainerParser::CreateForMIMEType(aType))
   , mProcessedInput(0)
   , mAppendRunning(false)
   , mTaskQueue(aParentDecoder->GetDemuxer()->GetTaskQueue())
   , mParent(new nsMainThreadPtrHolder<dom::SourceBuffer>(aParent, false /* strict */))
   , mParentDecoder(new nsMainThreadPtrHolder<MediaSourceDecoder>(aParentDecoder, false /* strict */))
   , mMediaSourceDemuxer(mParentDecoder->GetDemuxer())
   , mMediaSourceDuration(mTaskQueue, Maybe<double>(), "TrackBuffersManager::mMediaSourceDuration (Mirror)")
   , mAbort(false)
+  , mEvictionThreshold(Preferences::GetUint("media.mediasource.eviction_threshold",
+                                            100 * (1 << 20)))
+  , mEvictionOccurred(false)
   , mMonitor("TrackBuffersManager")
 {
   MOZ_ASSERT(NS_IsMainThread(), "Must be instanciated on the main thread");
   nsRefPtr<TrackBuffersManager> self = this;
   nsCOMPtr<nsIRunnable> task =
     NS_NewRunnableFunction([self] () {
       self->mMediaSourceDuration.Connect(self->mParentDecoder->CanonicalExplicitDuration());
     });
@@ -171,16 +202,21 @@ TrackBuffersManager::EvictData(TimeUnit 
   int64_t toEvict = GetSize() - aThreshold;
   if (toEvict <= 0) {
     return EvictDataResult::NO_DATA_EVICTED;
   }
   if (toEvict <= 512*1024) {
     // Don't bother evicting less than 512KB.
     return EvictDataResult::CANT_EVICT;
   }
+
+  if (mBufferFull && mEvictionOccurred) {
+    return EvictDataResult::BUFFER_FULL;
+  }
+
   MSE_DEBUG("Reaching our size limit, schedule eviction of %lld bytes", toEvict);
 
   nsCOMPtr<nsIRunnable> task =
     NS_NewRunnableMethodWithArgs<TimeUnit, uint32_t>(
       this, &TrackBuffersManager::DoEvictData,
       aPlaybackTime, toEvict);
   GetTaskQueue()->Dispatch(task.forget());
 
@@ -340,22 +376,22 @@ TrackBuffersManager::CompleteResetParser
 }
 
 void
 TrackBuffersManager::DoEvictData(const TimeUnit& aPlaybackTime,
                                  uint32_t aSizeToEvict)
 {
   MOZ_ASSERT(OnTaskQueue());
 
-  // Remove any data we've already played, up to 5s behind.
-  TimeUnit lowerLimit = aPlaybackTime - TimeUnit::FromSeconds(5);
-  TimeUnit to;
   // Video is what takes the most space, only evict there if we have video.
   const auto& track = HasVideo() ? mVideoTracks : mAudioTracks;
   const auto& buffer = track.mBuffers.LastElement();
+  // Remove any data we've already played, or before the next sample to be
+  // demuxed whichever is lowest.
+  TimeUnit lowerLimit = std::min(track.mNextSampleTime, aPlaybackTime);
   uint32_t lastKeyFrameIndex = 0;
   int64_t toEvict = aSizeToEvict;
   uint32_t partialEvict = 0;
   for (uint32_t i = 0; i < buffer.Length(); i++) {
     const auto& frame = buffer[i];
     if (frame->mKeyframe) {
       lastKeyFrameIndex = i;
       toEvict -= partialEvict;
@@ -364,46 +400,59 @@ TrackBuffersManager::DoEvictData(const T
       }
       partialEvict = 0;
     }
     if (frame->mTime >= lowerLimit.ToMicroseconds()) {
       break;
     }
     partialEvict += sizeof(*frame) + frame->mSize;
   }
+
+  int64_t finalSize = mSizeSourceBuffer - aSizeToEvict;
+
   if (lastKeyFrameIndex > 0) {
+    MSE_DEBUG("Step1. Evicting %u bytes prior currentTime",
+              aSizeToEvict - toEvict);
     CodedFrameRemoval(
       TimeInterval(TimeUnit::FromMicroseconds(0),
-                   TimeUnit::FromMicroseconds(buffer[lastKeyFrameIndex-1]->mTime)));
+                   TimeUnit::FromMicroseconds(buffer[lastKeyFrameIndex]->mTime - 1)));
   }
-  if (toEvict <= 0) {
+
+  if (mSizeSourceBuffer <= finalSize) {
     return;
   }
 
-  // Still some to remove. Remove data starting from the end, up to 5s ahead
-  // of our playtime.
-  TimeUnit upperLimit = aPlaybackTime + TimeUnit::FromSeconds(5);
+  toEvict = mSizeSourceBuffer - finalSize;
+
+  // Still some to remove. Remove data starting from the end, up to 30s ahead
+  // of the later of the playback time or the next sample to be demuxed.
+  // 30s is a value chosen as it appears to work with YouTube.
+  TimeUnit upperLimit =
+    std::max(aPlaybackTime, track.mNextSampleTime) + TimeUnit::FromSeconds(30);
+  lastKeyFrameIndex = buffer.Length();
   for (int32_t i = buffer.Length() - 1; i >= 0; i--) {
     const auto& frame = buffer[i];
     if (frame->mKeyframe) {
       lastKeyFrameIndex = i;
       toEvict -= partialEvict;
       if (toEvict < 0) {
         break;
       }
       partialEvict = 0;
     }
     if (frame->mTime <= upperLimit.ToMicroseconds()) {
       break;
     }
     partialEvict += sizeof(*frame) + frame->mSize;
   }
-  if (lastKeyFrameIndex + 1 < buffer.Length()) {
+  if (lastKeyFrameIndex < buffer.Length()) {
+    MSE_DEBUG("Step2. Evicting %u bytes from trailing data",
+              mSizeSourceBuffer - finalSize);
     CodedFrameRemoval(
-      TimeInterval(TimeUnit::FromMicroseconds(buffer[lastKeyFrameIndex+1]->mTime),
+      TimeInterval(TimeUnit::FromMicroseconds(buffer[lastKeyFrameIndex]->GetEndTime() + 1),
                    TimeUnit::FromInfinity()));
   }
 }
 
 nsRefPtr<TrackBuffersManager::RangeRemovalPromise>
 TrackBuffersManager::CodedFrameRemovalWithPromise(TimeInterval aInterval)
 {
   MOZ_ASSERT(OnTaskQueue());
@@ -554,19 +603,17 @@ TrackBuffersManager::CodedFrameRemoval(T
 
     // 5. If this object is in activeSourceBuffers, the current playback position
     // is greater than or equal to start and less than the remove end timestamp,
     // and HTMLMediaElement.readyState is greater than HAVE_METADATA, then set the
     // HTMLMediaElement.readyState attribute to HAVE_METADATA and stall playback.
     // This will be done by the MDSM during playback.
     // TODO properly, so it works even if paused.
   }
-  // 4. If buffer full flag equals true and this object is ready to accept more bytes, then set the buffer full flag to false.
-  // TODO.
-  mBufferFull = false;
+
   {
     MonitorAutoLock mon(mMonitor);
     mVideoBufferedRanges = mVideoTracks.mBufferedRanges;
     mAudioBufferedRanges = mAudioTracks.mBufferedRanges;
   }
 
   if (HasVideo()) {
     MSE_DEBUG("after video ranges=%s",
@@ -575,16 +622,22 @@ TrackBuffersManager::CodedFrameRemoval(T
   if (HasAudio()) {
     MSE_DEBUG("after audio ranges=%s",
               DumpTimeRanges(mAudioTracks.mBufferedRanges).get());
   }
 
   // Update our reported total size.
   mSizeSourceBuffer = mVideoTracks.mSizeBuffer + mAudioTracks.mSizeBuffer;
 
+  // 4. If buffer full flag equals true and this object is ready to accept more bytes, then set the buffer full flag to false.
+  if (mBufferFull && mSizeSourceBuffer < mEvictionThreshold) {
+    mBufferFull = false;
+  }
+  mEvictionOccurred = true;
+
   // Tell our demuxer that data was removed.
   mMediaSourceDemuxer->NotifyTimeRangesChanged();
 
   return dataRemoved;
 }
 
 nsRefPtr<TrackBuffersManager::AppendPromise>
 TrackBuffersManager::InitSegmentParserLoop()
@@ -948,27 +1001,29 @@ TrackBuffersManager::OnDemuxerInitDone(n
 
     // 6. Set first initialization segment received flag to true.
     mFirstInitializationSegmentReceived = true;
   } else {
     mAudioTracks.mLastInfo = new SharedTrackInfo(info.mAudio, streamID);
     mVideoTracks.mLastInfo = new SharedTrackInfo(info.mVideo, streamID);
   }
 
-  // TODO CHECK ENCRYPTION
   UniquePtr<EncryptionInfo> crypto = mInputDemuxer->GetCrypto();
   if (crypto && crypto->IsEncrypted()) {
 #ifdef MOZ_EME
     // Try and dispatch 'encrypted'. Won't go if ready state still HAVE_NOTHING.
     for (uint32_t i = 0; i < crypto->mInitDatas.Length(); i++) {
-//      NS_DispatchToMainThread(
-//        new DispatchKeyNeededEvent(mParentDecoder, crypto->mInitDatas[i].mInitData, NS_LITERAL_STRING("cenc")));
+      NS_DispatchToMainThread(
+        new DispatchKeyNeededEvent(mParentDecoder, crypto->mInitDatas[i].mInitData, NS_LITERAL_STRING("cenc")));
     }
 #endif // MOZ_EME
     info.mCrypto = *crypto;
+    // We clear our crypto init data array, so the MediaFormatReader will
+    // not emit an encrypted event for the same init data again.
+    info.mCrypto.mInitDatas.Clear();
     mEncrypted = true;
   }
 
   {
     MonitorAutoLock mon(mMonitor);
     mInfo = info;
   }
 
@@ -1175,18 +1230,20 @@ TrackBuffersManager::CompleteCodedFrameP
     }
   }
 
   // Update our reported total size.
   mSizeSourceBuffer = mVideoTracks.mSizeBuffer + mAudioTracks.mSizeBuffer;
 
   // Return to step 6.4 of Segment Parser Loop algorithm
   // 4. If this SourceBuffer is full and cannot accept more media data, then set the buffer full flag to true.
-  // TODO
-  mBufferFull = false;
+  if (mSizeSourceBuffer >= mEvictionThreshold) {
+    mBufferFull = true;
+    mEvictionOccurred = false;
+  }
 
   // 5. If the input buffer does not contain a complete media segment, then jump to the need more data step below.
   if (mParser->MediaSegmentRange().IsNull()) {
     ResolveProcessing(true, __func__);
     return;
   }
 
   // 6. Remove the media segment bytes from the beginning of the input buffer.
@@ -1355,88 +1412,94 @@ TrackBuffersManager::ProcessFrame(MediaR
   //      Remove all coded frames from track buffer that have a presentation timestamp greater than or equal to highest end timestamp and less than frame end timestamp
 
   // There is an ambiguity on how to remove frames, which was lodged with:
   // https://www.w3.org/Bugs/Public/show_bug.cgi?id=28710, implementing as per
   // bug description.
   Maybe<uint32_t> firstRemovedIndex;
   TimeInterval removedInterval;
   TrackBuffer& data = trackBuffer.mBuffers.LastElement();
-  if (trackBuffer.mBufferedRanges.ContainsStrict(presentationTimestamp)) {
+  bool removeCodedFrames =
+    trackBuffer.mHighestEndTimestamp.isSome()
+      ? trackBuffer.mHighestEndTimestamp.ref() <= presentationTimestamp
+      : true;
+  if (removeCodedFrames) {
     TimeUnit lowerBound =
       trackBuffer.mHighestEndTimestamp.valueOr(presentationTimestamp);
-    for (uint32_t i = 0; i < data.Length();) {
-      MediaRawData* sample = data[i].get();
-      if (sample->mTime >= lowerBound.ToMicroseconds() &&
-          sample->mTime < frameEndTimestamp.ToMicroseconds()) {
-        if (firstRemovedIndex.isNothing()) {
-          removedInterval =
-            TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
-                         TimeUnit::FromMicroseconds(sample->GetEndTime()));
-          firstRemovedIndex = Some(i);
+    if (trackBuffer.mBufferedRanges.ContainsStrict(lowerBound)) {
+      for (uint32_t i = 0; i < data.Length();) {
+        MediaRawData* sample = data[i].get();
+        if (sample->mTime >= lowerBound.ToMicroseconds() &&
+            sample->mTime < frameEndTimestamp.ToMicroseconds()) {
+          if (firstRemovedIndex.isNothing()) {
+            removedInterval =
+              TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
+                           TimeUnit::FromMicroseconds(sample->GetEndTime()));
+            firstRemovedIndex = Some(i);
+          } else {
+            removedInterval = removedInterval.Span(
+              TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
+                           TimeUnit::FromMicroseconds(sample->GetEndTime())));
+          }
+          trackBuffer.mSizeBuffer -= sizeof(*sample) + sample->mSize;
+          MSE_DEBUGV("Overlapping frame:%u ([%f, %f))",
+                    i,
+                    TimeUnit::FromMicroseconds(sample->mTime).ToSeconds(),
+                    TimeUnit::FromMicroseconds(sample->GetEndTime()).ToSeconds());
+          data.RemoveElementAt(i);
+
+          if (trackBuffer.mNextGetSampleIndex.isSome()) {
+            if (trackBuffer.mNextGetSampleIndex.ref() == i) {
+              MSE_DEBUG("Next sample to be played got evicted");
+              trackBuffer.mNextGetSampleIndex.reset();
+            } else if (trackBuffer.mNextGetSampleIndex.ref() > i) {
+              trackBuffer.mNextGetSampleIndex.ref()--;
+            }
+          }
         } else {
-          removedInterval = removedInterval.Span(
-            TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
-                         TimeUnit::FromMicroseconds(sample->GetEndTime())));
+          i++;
         }
-        trackBuffer.mSizeBuffer -= sizeof(*sample) + sample->mSize;
-        MSE_DEBUGV("Overlapping frame:%u ([%f, %f))",
-                  i,
-                  TimeUnit::FromMicroseconds(sample->mTime).ToSeconds(),
-                  TimeUnit::FromMicroseconds(sample->GetEndTime()).ToSeconds());
-        data.RemoveElementAt(i);
-
-        if (trackBuffer.mNextGetSampleIndex.isSome()) {
-          if (trackBuffer.mNextGetSampleIndex.ref() == i) {
-            MSE_DEBUG("Next sample to be played got evicted");
-            trackBuffer.mNextGetSampleIndex.reset();
-          } else if (trackBuffer.mNextGetSampleIndex.ref() > i) {
-            trackBuffer.mNextGetSampleIndex.ref()--;
-          }
-        }
-      } else {
-        i++;
       }
     }
-  }
-  // 15. Remove decoding dependencies of the coded frames removed in the previous step:
-  // Remove all coded frames between the coded frames removed in the previous step and the next random access point after those removed frames.
-  if (firstRemovedIndex.isSome()) {
-    uint32_t start = firstRemovedIndex.ref();
-    uint32_t end = start;
-    for (;end < data.Length(); end++) {
-      MediaRawData* sample = data[end].get();
-      if (sample->mKeyframe) {
-        break;
+    // 15. Remove decoding dependencies of the coded frames removed in the previous step:
+    // Remove all coded frames between the coded frames removed in the previous step and the next random access point after those removed frames.
+    if (firstRemovedIndex.isSome()) {
+      uint32_t start = firstRemovedIndex.ref();
+      uint32_t end = start;
+      for (;end < data.Length(); end++) {
+        MediaRawData* sample = data[end].get();
+        if (sample->mKeyframe) {
+          break;
+        }
+        removedInterval = removedInterval.Span(
+          TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
+                       TimeUnit::FromMicroseconds(sample->GetEndTime())));
+        trackBuffer.mSizeBuffer -= sizeof(*sample) + sample->mSize;
       }
-      removedInterval = removedInterval.Span(
-        TimeInterval(TimeUnit::FromMicroseconds(sample->mTime),
-                     TimeUnit::FromMicroseconds(sample->GetEndTime())));
-      trackBuffer.mSizeBuffer -= sizeof(*sample) + sample->mSize;
-    }
-    data.RemoveElementsAt(start, end - start);
+      data.RemoveElementsAt(start, end - start);
 
-    MSE_DEBUG("Removing undecodable frames from:%u (frames:%u) ([%f, %f))",
-              start, end - start,
-              removedInterval.mStart.ToSeconds(), removedInterval.mEnd.ToSeconds());
+      MSE_DEBUG("Removing undecodable frames from:%u (frames:%u) ([%f, %f))",
+                start, end - start,
+                removedInterval.mStart.ToSeconds(), removedInterval.mEnd.ToSeconds());
 
-    if (trackBuffer.mNextGetSampleIndex.isSome()) {
-      if (trackBuffer.mNextGetSampleIndex.ref() >= start &&
-          trackBuffer.mNextGetSampleIndex.ref() < end) {
-        MSE_DEBUG("Next sample to be played got evicted");
-        trackBuffer.mNextGetSampleIndex.reset();
-      } else if (trackBuffer.mNextGetSampleIndex.ref() >= end) {
-        trackBuffer.mNextGetSampleIndex.ref() -= end - start;
+      if (trackBuffer.mNextGetSampleIndex.isSome()) {
+        if (trackBuffer.mNextGetSampleIndex.ref() >= start &&
+            trackBuffer.mNextGetSampleIndex.ref() < end) {
+          MSE_DEBUG("Next sample to be played got evicted");
+          trackBuffer.mNextGetSampleIndex.reset();
+        } else if (trackBuffer.mNextGetSampleIndex.ref() >= end) {
+          trackBuffer.mNextGetSampleIndex.ref() -= end - start;
+        }
       }
+
+      // Update our buffered range to exclude the range just removed.
+      trackBuffer.mBufferedRanges -= removedInterval;
+      MOZ_ASSERT(trackBuffer.mNextInsertionIndex.isNothing() ||
+                 trackBuffer.mNextInsertionIndex.ref() <= start);
     }
-
-    // Update our buffered range to exclude the range just removed.
-    trackBuffer.mBufferedRanges -= removedInterval;
-    MOZ_ASSERT(trackBuffer.mNextInsertionIndex.isNothing() ||
-               trackBuffer.mNextInsertionIndex.ref() <= start);
   }
 
   // 16. Add the coded frame with the presentation timestamp, decode timestamp, and frame duration to the track buffer.
   aSample->mTime = presentationTimestamp.ToMicroseconds();
   aSample->mTimecode = decodeTimestamp.ToMicroseconds();
   aSample->mTrackInfo = trackBuffer.mLastInfo;
 
   if (data.IsEmpty()) {
@@ -1559,21 +1622,21 @@ TrackBuffersManager::GetTracksList()
   return tracks;
 }
 
 void
 TrackBuffersManager::RestoreCachedVariables()
 {
   MOZ_ASSERT(OnTaskQueue());
   if (mTimestampOffset != mLastTimestampOffset) {
+    nsRefPtr<TrackBuffersManager> self = this;
     nsCOMPtr<nsIRunnable> task =
-      NS_NewRunnableMethodWithArg<TimeUnit>(
-        mParent.get(),
-        static_cast<void (dom::SourceBuffer::*)(const TimeUnit&)>(&dom::SourceBuffer::SetTimestampOffset), /* beauty uh? :) */
-        mTimestampOffset);
+      NS_NewRunnableFunction([self] {
+        self->mParent->SetTimestampOffset(self->mTimestampOffset);
+      });
     AbstractThread::MainThread()->Dispatch(task.forget());
   }
 }
 
 void
 TrackBuffersManager::SetAppendState(TrackBuffersManager::AppendState aAppendState)
 {
   MSE_DEBUG("AppendState changed from %s to %s",

--- a/dom/media/mediasource/TrackBuffersManager.h
+++ b/dom/media/mediasource/TrackBuffersManager.h
@@ -305,16 +305,18 @@ private:
 
   // Set to true if abort was called.
   Atomic<bool> mAbort;
   // Set to true if mediasource state changed to ended.
   Atomic<bool> mEnded;
 
   // Global size of this source buffer content.
   Atomic<int64_t> mSizeSourceBuffer;
+  uint32_t mEvictionThreshold;
+  Atomic<bool> mEvictionOccurred;
 
   // Monitor to protect following objects accessed across multipple threads.
   mutable Monitor mMonitor;
   // Stable audio and video track time ranges.
   TimeIntervals mVideoBufferedRanges;
   TimeIntervals mAudioBufferedRanges;
   // MediaInfo of the first init segment read.
   MediaInfo mInfo;

--- a/dom/media/webaudio/AudioContext.cpp
+++ b/dom/media/webaudio/AudioContext.cpp
@@ -105,21 +105,16 @@ AudioContext::AudioContext(nsPIDOMWindow
   // bound to the window.
   mDestination = new AudioDestinationNode(this, aIsOffline, aChannel,
                                           aNumberOfChannels, aLength, aSampleRate);
   // We skip calling SetIsOnlyNodeForContext and the creation of the
   // audioChannelAgent during mDestination's constructor, because we can only
   // call them after mDestination has been set up.
   mDestination->CreateAudioChannelAgent();
   mDestination->SetIsOnlyNodeForContext(true);
-  // We don't use the cubeb context yet, but need to ensure it is created on
-  // the main thread.
-  if (!aIsOffline && !CubebUtils::GetCubebContext()) {
-    NS_WARNING("Audio backend initialization failed.");
-  }
 }
 
 AudioContext::~AudioContext()
 {
   nsPIDOMWindow* window = GetOwner();
   if (window) {
     window->RemoveAudioContext(this);
   }

--- a/dom/storage/DOMStorageCache.cpp
+++ b/dom/storage/DOMStorageCache.cpp
@@ -766,18 +766,21 @@ DOMStorageCache::StartDatabase()
 
     nsresult rv = db->Init();
     if (NS_FAILED(rv)) {
       return nullptr;
     }
 
     sDatabase = db.forget();
   } else {
+    // Use DOMLocalStorageManager::Ensure in case we're called from
+    // DOMSessionStorageManager's initializer and we haven't yet initialized the
+    // local storage manager.
     nsRefPtr<DOMStorageDBChild> db = new DOMStorageDBChild(
-        DOMLocalStorageManager::Self());
+        DOMLocalStorageManager::Ensure());
 
     nsresult rv = db->Init();
     if (NS_FAILED(rv)) {
       return nullptr;
     }
 
     db.forget(&sDatabase);
   }

--- a/dom/storage/DOMStorageManager.cpp
+++ b/dom/storage/DOMStorageManager.cpp
@@ -623,16 +623,31 @@ DOMLocalStorageManager::DOMLocalStorageM
   }
 }
 
 DOMLocalStorageManager::~DOMLocalStorageManager()
 {
   sSelf = nullptr;
 }
 
+DOMLocalStorageManager*
+DOMLocalStorageManager::Ensure()
+{
+  if (sSelf) {
+    return sSelf;
+  }
+
+  // Cause sSelf to be populated.
+  nsCOMPtr<nsIDOMStorageManager> initializer =
+    do_GetService("@mozilla.org/dom/localStorage-manager;1");
+  MOZ_ASSERT(sSelf, "Didn't initialize?");
+
+  return sSelf;
+}
+
 // DOMSessionStorageManager
 
 DOMSessionStorageManager::DOMSessionStorageManager()
   : DOMStorageManager(SessionStorage)
 {
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
     // Do this only on the child process.  The thread IPC bridge
     // is also used to communicate chrome observer notifications.

--- a/dom/storage/DOMStorageManager.h
+++ b/dom/storage/DOMStorageManager.h
@@ -121,16 +121,19 @@ class DOMLocalStorageManager final : pub
 {
 public:
   DOMLocalStorageManager();
   virtual ~DOMLocalStorageManager();
 
   // Global getter of localStorage manager service
   static DOMLocalStorageManager* Self() { return sSelf; }
 
+  // Like Self, but creates an instance if we're not yet initialized.
+  static DOMLocalStorageManager* Ensure();
+
 private:
   static DOMLocalStorageManager* sSelf;
 };
 
 class DOMSessionStorageManager final : public DOMStorageManager
 {
 public:
   DOMSessionStorageManager();

--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -374,51 +374,49 @@ NS_INTERFACE_MAP_BEGIN(ServiceWorkerMana
   NS_INTERFACE_MAP_ENTRY(nsIServiceWorkerManager)
   NS_INTERFACE_MAP_ENTRY(nsIIPCBackgroundChildCreateCallback)
   NS_INTERFACE_MAP_ENTRY(nsIObserver)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIServiceWorkerManager)
 NS_INTERFACE_MAP_END
 
 ServiceWorkerManager::ServiceWorkerManager()
   : mActor(nullptr)
+  , mShuttingDown(false)
 {
   // Register this component to PBackground.
   MOZ_ALWAYS_TRUE(BackgroundChild::GetOrCreateForCurrentThread(this));
 }
 
 ServiceWorkerManager::~ServiceWorkerManager()
 {
   // The map will assert if it is not empty when destroyed.
   mRegistrationInfos.Clear();
-
-  if (mActor) {
-    mActor->ManagerShuttingDown();
-
-    nsRefPtr<TeardownRunnable> runnable = new TeardownRunnable(mActor);
-    nsresult rv = NS_DispatchToMainThread(runnable);
-    unused << NS_WARN_IF(NS_FAILED(rv));
-  }
+  MOZ_ASSERT(!mActor);
 }
 
 void
 ServiceWorkerManager::Init()
 {
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (obs) {
+    DebugOnly<nsresult> rv;
+    rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false /* ownsWeak */);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+  }
+
   if (XRE_GetProcessType() == GeckoProcessType_Default) {
     nsRefPtr<ServiceWorkerRegistrar> swr = ServiceWorkerRegistrar::Get();
     MOZ_ASSERT(swr);
 
     nsTArray<ServiceWorkerRegistrationData> data;
     swr->GetRegistrations(data);
     LoadRegistrations(data);
 
-    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     if (obs) {
       DebugOnly<nsresult> rv;
-      rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false /* ownsWeak */);
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
       rv = obs->AddObserver(this, PURGE_SESSION_HISTORY, false /* ownsWeak */);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
       rv = obs->AddObserver(this, PURGE_DOMAIN_DATA, false /* ownsWeak */);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
       rv = obs->AddObserver(this, WEBAPPS_CLEAR_DATA, false /* ownsWeak */);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
     }
   }
@@ -867,16 +865,17 @@ class ServiceWorkerRegisterJob final : p
   friend class ContinueInstallTask;
 
   nsCString mScope;
   nsCString mScriptSpec;
   nsRefPtr<ServiceWorkerRegistrationInfo> mRegistration;
   nsRefPtr<ServiceWorkerUpdateFinishCallback> mCallback;
   nsCOMPtr<nsIPrincipal> mPrincipal;
   nsRefPtr<ServiceWorkerInfo> mUpdateAndInstallInfo;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
 
   ~ServiceWorkerRegisterJob()
   { }
 
   enum
   {
     REGISTER_JOB = 0,
     UPDATE_JOB = 1,
@@ -887,25 +886,29 @@ class ServiceWorkerRegisterJob final : p
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // [[Register]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
                            const nsCString& aScope,
                            const nsCString& aScriptSpec,
                            ServiceWorkerUpdateFinishCallback* aCallback,
-                           nsIPrincipal* aPrincipal)
+                           nsIPrincipal* aPrincipal,
+                           nsILoadGroup* aLoadGroup)
     : ServiceWorkerJob(aQueue)
     , mScope(aScope)
     , mScriptSpec(aScriptSpec)
     , mCallback(aCallback)
     , mPrincipal(aPrincipal)
+    , mLoadGroup(aLoadGroup)
     , mJobType(REGISTER_JOB)
     , mCanceled(false)
-  { }
+  {
+    MOZ_ASSERT(mLoadGroup);
+  }
 
   // [[Update]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
                            ServiceWorkerRegistrationInfo* aRegistration,
                            ServiceWorkerUpdateFinishCallback* aCallback)
     : ServiceWorkerJob(aQueue)
     , mRegistration(aRegistration)
     , mCallback(aCallback)
@@ -1225,17 +1228,17 @@ private:
     // byte-for-byte match with the script resource of newestWorker...
     if (workerInfo && workerInfo->ScriptSpec().Equals(mRegistration->mScriptSpec)) {
       cacheName = workerInfo->CacheName();
     }
 
     nsresult rv =
       serviceWorkerScriptCache::Compare(mRegistration->mPrincipal, cacheName,
                                         NS_ConvertUTF8toUTF16(mRegistration->mScriptSpec),
-                                        this);
+                                        this, mLoadGroup);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Fail(rv);
     }
   }
 
   void
   Succeed()
   {
@@ -1529,18 +1532,30 @@ ServiceWorkerManager::Register(nsIDOMWin
   }
 
   ServiceWorkerJobQueue* queue = GetOrCreateJobQueue(originSuffix, cleanedScope);
   MOZ_ASSERT(queue);
 
   nsRefPtr<ServiceWorkerResolveWindowPromiseOnUpdateCallback> cb =
     new ServiceWorkerResolveWindowPromiseOnUpdateCallback(window, promise);
 
+  nsCOMPtr<nsILoadGroup> docLoadGroup = doc->GetDocumentLoadGroup();
+  nsRefPtr<WorkerLoadInfo::InterfaceRequestor> ir =
+    new WorkerLoadInfo::InterfaceRequestor(documentPrincipal, docLoadGroup);
+  ir->MaybeAddTabChild(docLoadGroup);
+
+  // Create a load group that is separate from, yet related to, the document's load group.
+  // This allows checks for interfaces like nsILoadContext to yield the values used by the
+  // the document, yet will not cancel the update job if the document's load group is cancelled.
+  nsCOMPtr<nsILoadGroup> loadGroup = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
+  rv = loadGroup->SetNotificationCallbacks(ir);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(rv));
+
   nsRefPtr<ServiceWorkerRegisterJob> job =
-    new ServiceWorkerRegisterJob(queue, cleanedScope, spec, cb, documentPrincipal);
+    new ServiceWorkerRegisterJob(queue, cleanedScope, spec, cb, documentPrincipal, loadGroup);
   queue->Append(job);
 
   AssertIsOnMainThread();
   Telemetry::Accumulate(Telemetry::SERVICE_WORKER_REGISTRATIONS, 1);
 
   promise.forget(aPromise);
   return NS_OK;
 }
@@ -1548,29 +1563,33 @@ ServiceWorkerManager::Register(nsIDOMWin
 void
 ServiceWorkerManager::AppendPendingOperation(ServiceWorkerJobQueue* aQueue,
                                              ServiceWorkerJob* aJob)
 {
   MOZ_ASSERT(!mActor);
   MOZ_ASSERT(aQueue);
   MOZ_ASSERT(aJob);
 
-  PendingOperation* opt = mPendingOperations.AppendElement();
-  opt->mQueue = aQueue;
-  opt->mJob = aJob;
+  if (!mShuttingDown) {
+    PendingOperation* opt = mPendingOperations.AppendElement();
+    opt->mQueue = aQueue;
+    opt->mJob = aJob;
+  }
 }
 
 void
 ServiceWorkerManager::AppendPendingOperation(nsIRunnable* aRunnable)
 {
   MOZ_ASSERT(!mActor);
   MOZ_ASSERT(aRunnable);
 
-  PendingOperation* opt = mPendingOperations.AppendElement();
-  opt->mRunnable = aRunnable;
+  if (!mShuttingDown) {
+    PendingOperation* opt = mPendingOperations.AppendElement();
+    opt->mRunnable = aRunnable;
+  }
 }
 
 /*
  * Used to handle ExtendableEvent::waitUntil() and proceed with
  * installation/activation.
  */
 class LifecycleEventPromiseHandler final : public PromiseNativeHandler
 {
@@ -2378,18 +2397,20 @@ private:
     PrincipalInfo principalInfo;
     if (NS_WARN_IF(NS_FAILED(PrincipalToPrincipalInfo(mPrincipal,
                                                       &principalInfo)))) {
       return mCallback ? mCallback->UnregisterSucceeded(false) : NS_OK;
     }
 
     nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
 
-    MOZ_ASSERT(swm->mActor);
-    swm->mActor->SendUnregister(principalInfo, NS_ConvertUTF8toUTF16(mScope));
+    // Could it be that we are shutting down.
+    if (swm->mActor) {
+      swm->mActor->SendUnregister(principalInfo, NS_ConvertUTF8toUTF16(mScope));
+    }
 
     nsAutoCString scopeKey;
     nsresult rv = swm->PrincipalToScopeKey(mPrincipal, scopeKey);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return mCallback ? mCallback->UnregisterSucceeded(false) : NS_OK;
     }
 
     // "Let registration be the result of running [[Get Registration]]
@@ -2730,20 +2751,25 @@ ServiceWorkerManager::ActorCreated(mozil
   mPendingOperations.Clear();
 }
 
 void
 ServiceWorkerManager::StoreRegistration(
                                    nsIPrincipal* aPrincipal,
                                    ServiceWorkerRegistrationInfo* aRegistration)
 {
-  MOZ_ASSERT(mActor);
   MOZ_ASSERT(aPrincipal);
   MOZ_ASSERT(aRegistration);
 
+  if (mShuttingDown) {
+    return;
+  }
+
+  MOZ_ASSERT(mActor);
+
   ServiceWorkerRegistrationData data;
   nsresult rv = PopulateRegistrationData(aPrincipal, aRegistration, data);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
 
   PrincipalInfo principalInfo;
   if (NS_WARN_IF(NS_FAILED(PrincipalToPrincipalInfo(aPrincipal,
@@ -4059,16 +4085,20 @@ ServiceWorkerManager::MaybeRemoveRegistr
 }
 
 void
 ServiceWorkerManager::RemoveRegistrationInternal(ServiceWorkerRegistrationInfo* aRegistration)
 {
   MOZ_ASSERT(aRegistration);
   MOZ_ASSERT(!aRegistration->IsControllingDocuments());
 
+  if (mShuttingDown) {
+    return;
+  }
+
   // All callers should be either from a job in which case the actor is
   // available, or from MaybeStopControlling(), in which case, this will only be
   // called if a valid registration is found. If a valid registration exists,
   // it means the actor is available since the original map of registrations is
   // populated by it, and any new registrations wait until the actor is
   // available before proceeding (See ServiceWorkerRegisterJob::Start).
   MOZ_ASSERT(mActor);
 
@@ -4492,31 +4522,32 @@ ServiceWorkerManager::UpdateAllRegistrat
   return NS_OK;
 }
 
 NS_IMETHODIMP
 ServiceWorkerManager::Observe(nsISupports* aSubject,
                               const char* aTopic,
                               const char16_t* aData)
 {
-  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
-
   if (strcmp(aTopic, PURGE_SESSION_HISTORY) == 0) {
+    MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
     RemoveAll();
     PropagateRemoveAll();
     return NS_OK;
   }
 
   if (strcmp(aTopic, PURGE_DOMAIN_DATA) == 0) {
+    MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
     nsAutoString domain(aData);
     RemoveAndPropagate(NS_ConvertUTF16toUTF8(domain));
     return NS_OK;
   }
 
   if (strcmp(aTopic, WEBAPPS_CLEAR_DATA) == 0) {
+    MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
     nsCOMPtr<mozIApplicationClearPrivateDataParams> params =
       do_QueryInterface(aSubject);
     if (NS_WARN_IF(!params)) {
       return NS_OK;
     }
 
     uint32_t appId;
     nsresult rv = params->GetAppId(&appId);
@@ -4536,28 +4567,45 @@ ServiceWorkerManager::Observe(nsISupport
 
     nsCOMPtr<nsIPrincipal> principal;
     app->GetPrincipal(getter_AddRefs(principal));
     if (NS_WARN_IF(!principal)) {
       return NS_OK;
     }
 
     RemoveAllRegistrations(principal);
-  } else if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+    return NS_OK;
+  }
+
+  if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+    mShuttingDown = true;
+
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     if (obs) {
       obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
-      obs->RemoveObserver(this, PURGE_SESSION_HISTORY);
-      obs->RemoveObserver(this, PURGE_DOMAIN_DATA);
-      obs->RemoveObserver(this, WEBAPPS_CLEAR_DATA);
+
+      if (XRE_GetProcessType() == GeckoProcessType_Default) {
+        obs->RemoveObserver(this, PURGE_SESSION_HISTORY);
+        obs->RemoveObserver(this, PURGE_DOMAIN_DATA);
+        obs->RemoveObserver(this, WEBAPPS_CLEAR_DATA);
+      }
     }
-  } else {
-    MOZ_CRASH("Received message we aren't supposed to be registered for!");
-  }
-
+
+    if (mActor) {
+      mActor->ManagerShuttingDown();
+
+      nsRefPtr<TeardownRunnable> runnable = new TeardownRunnable(mActor);
+      nsresult rv = NS_DispatchToMainThread(runnable);
+      unused << NS_WARN_IF(NS_FAILED(rv));
+      mActor = nullptr;
+    }
+    return NS_OK;
+  }
+
+  MOZ_CRASH("Received message we aren't supposed to be registered for!");
   return NS_OK;
 }
 
 NS_IMETHODIMP
 ServiceWorkerManager::PropagateSoftUpdate(JS::Handle<JS::Value> aOriginAttributes,
                                           const nsAString& aScope,
                                           JSContext* aCx)
 {

--- a/dom/workers/ServiceWorkerManager.h
+++ b/dom/workers/ServiceWorkerManager.h
@@ -547,15 +547,17 @@ private:
   // Removes all service worker registrations for a given principal.
   void
   RemoveAllRegistrations(nsIPrincipal* aPrincipal);
 
   nsRefPtr<ServiceWorkerManagerChild> mActor;
 
   struct PendingOperation;
   nsTArray<PendingOperation> mPendingOperations;
+
+  bool mShuttingDown;
 };
 
 } // namespace workers
 } // namespace dom
 } // namespace mozilla
 
 #endif // mozilla_dom_workers_serviceworkermanager_h

--- a/dom/workers/ServiceWorkerScriptCache.cpp
+++ b/dom/workers/ServiceWorkerScriptCache.cpp
@@ -72,31 +72,32 @@ public:
   explicit CompareNetwork(CompareManager* aManager)
     : mManager(aManager)
   {
     MOZ_ASSERT(aManager);
     AssertIsOnMainThread();
   }
 
   nsresult
-  Initialize(nsIPrincipal* aPrincipal, const nsAString& aURL)
+  Initialize(nsIPrincipal* aPrincipal, const nsAString& aURL, nsILoadGroup* aLoadGroup)
   {
     MOZ_ASSERT(aPrincipal);
     AssertIsOnMainThread();
 
     nsCOMPtr<nsIURI> uri;
     nsresult rv = NS_NewURI(getter_AddRefs(uri), aURL, nullptr, nullptr);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
     rv = NS_NewChannel(getter_AddRefs(mChannel),
                        uri, aPrincipal,
                        nsILoadInfo::SEC_NORMAL,
-                       nsIContentPolicy::TYPE_SCRIPT); // FIXME(nsm): TYPE_SERVICEWORKER
+                       nsIContentPolicy::TYPE_SCRIPT, // FIXME(nsm): TYPE_SERVICEWORKER
+                       aLoadGroup);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
     nsLoadFlags flags;
     rv = mChannel->GetLoadFlags(&flags);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -275,34 +276,34 @@ public:
     , mCacheFinished(false)
     , mInCache(false)
   {
     AssertIsOnMainThread();
   }
 
   nsresult
   Initialize(nsIPrincipal* aPrincipal, const nsAString& aURL,
-             const nsAString& aCacheName)
+             const nsAString& aCacheName, nsILoadGroup* aLoadGroup)
   {
     AssertIsOnMainThread();
     MOZ_ASSERT(aPrincipal);
 
     mURL = aURL;
 
     // Always create a CacheStorage since we want to write the network entry to
     // the cache even if there isn't an existing one.
     ErrorResult result;
     mCacheStorage = CreateCacheStorage(aPrincipal, result, getter_AddRefs(mSandbox));
     if (NS_WARN_IF(result.Failed())) {
       MOZ_ASSERT(!result.IsErrorWithMessage());
       return result.StealNSResult();
     }
 
     mCN = new CompareNetwork(this);
-    nsresult rv = mCN->Initialize(aPrincipal, aURL);
+    nsresult rv = mCN->Initialize(aPrincipal, aURL, aLoadGroup);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
     if (!aCacheName.IsEmpty()) {
       mCC = new CompareCache(this);
       rv = mCC->Initialize(aPrincipal, aURL, aCacheName);
       if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -931,26 +932,27 @@ GenerateCacheName(nsAString& aName)
   id.ToProvidedString(chars);
   aName.AssignASCII(chars, NSID_LENGTH);
 
   return NS_OK;
 }
 
 nsresult
 Compare(nsIPrincipal* aPrincipal, const nsAString& aCacheName,
-        const nsAString& aURL, CompareCallback* aCallback)
+        const nsAString& aURL, CompareCallback* aCallback,
+        nsILoadGroup* aLoadGroup)
 {
   AssertIsOnMainThread();
   MOZ_ASSERT(aPrincipal);
   MOZ_ASSERT(!aURL.IsEmpty());
   MOZ_ASSERT(aCallback);
 
   nsRefPtr<CompareManager> cm = new CompareManager(aCallback);
 
-  nsresult rv = cm->Initialize(aPrincipal, aURL, aCacheName);
+  nsresult rv = cm->Initialize(aPrincipal, aURL, aCacheName, aLoadGroup);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   return NS_OK;
 }
 
 } // serviceWorkerScriptCache namespace

--- a/dom/workers/ServiceWorkerScriptCache.h
+++ b/dom/workers/ServiceWorkerScriptCache.h
@@ -39,17 +39,17 @@ public:
                    const nsACString& aMaxScope) = 0;
 
   NS_IMETHOD_(MozExternalRefCountType) AddRef() = 0;
   NS_IMETHOD_(MozExternalRefCountType) Release() = 0;
 };
 
 nsresult
 Compare(nsIPrincipal* aPrincipal, const nsAString& aCacheName,
-        const nsAString& aURL, CompareCallback* aCallback);
+        const nsAString& aURL, CompareCallback* aCallback, nsILoadGroup* aLoadGroup);
 
 } // serviceWorkerScriptCache namespace
 
 } // workers namespace
 } // dom namespace
 } // mozilla namespace
 
 #endif // mozilla_dom_workers_ServiceWorkerScriptCache_h

--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -5957,21 +5957,23 @@ WorkerPrivate::AddFeature(JSContext* aCx
     MutexAutoLock lock(mMutex);
 
     if (mStatus >= Canceling) {
       return false;
     }
   }
 
   MOZ_ASSERT(!mFeatures.Contains(aFeature), "Already know about this one!");
+
+  if (mFeatures.IsEmpty() && !ModifyBusyCountFromWorker(aCx, true)) {
+    return false;
+  }
+
   mFeatures.AppendElement(aFeature);
-
-  return mFeatures.Length() == 1 ?
-         ModifyBusyCountFromWorker(aCx, true) :
-         true;
+  return true;
 }
 
 void
 WorkerPrivate::RemoveFeature(JSContext* aCx, WorkerFeature* aFeature)
 {
   AssertIsOnWorkerThread();
 
   MOZ_ASSERT(mFeatures.Contains(aFeature), "Didn't know about this one!");

--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -65,9 +65,11 @@ LOCAL_INCLUDES += [
     '/editor/txmgr',
     '/extensions/spellcheck/src',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'

--- a/editor/libeditor/nsEditorEventListener.cpp
+++ b/editor/libeditor/nsEditorEventListener.cpp
@@ -54,16 +54,18 @@
 #include "nsServiceManagerUtils.h"      // for do_GetService
 #include "nsString.h"                   // for nsAutoString
 #include "nsQueryObject.h"              // for do_QueryObject
 #ifdef HANDLE_NATIVE_TEXT_DIRECTION_SWITCH
 #include "nsContentUtils.h"             // for nsContentUtils, etc
 #include "nsIBidiKeyboard.h"            // for nsIBidiKeyboard
 #endif
 
+#include "mozilla/dom/TabParent.h"
+
 class nsPresContext;
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 static void
 DoCommandCallback(Command aCommand, void* aData)
 {
@@ -980,16 +982,24 @@ nsEditorEventListener::CanDrop(nsIDOMDra
   nsresult rv = sourceNode->GetOwnerDocument(getter_AddRefs(sourceDoc));
   NS_ENSURE_SUCCESS(rv, false);
 
   // If the source and the dest are not same document, allow to drop it always.
   if (domdoc != sourceDoc) {
     return true;
   }
 
+  // If the source node is a remote browser, treat this as coming from a
+  // different document and allow the drop.
+  nsCOMPtr<nsIContent> sourceContent = do_QueryInterface(sourceNode);
+  TabParent* tp = TabParent::GetFrom(sourceContent);
+  if (tp) {
+    return true;
+  }
+
   nsRefPtr<Selection> selection = mEditor->GetSelection();
   if (!selection) {
     return false;
   }
 
   // If selection is collapsed, allow to drop it always.
   if (selection->Collapsed()) {
     return true;

deleted file mode 100644
index ec288075e2874b7f8371930b7fdc8c4071fce40c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
--- a/embedding/tests/winEmbed/WebBrowserChrome.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Local includes
-#include "resource.h"
-#include "winEmbed.h"
-#include "WebBrowserChrome.h"
-
-// OS headers
-#include <stdio.h>
-
-// Frozen APIs
-
-#include "nsStringAPI.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMWindow.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIRequest.h"
-#include "nsIURI.h"
-#include "nsIWebProgress.h"
-#include "nsCWebBrowser.h"
-
-// Glue APIs (not frozen, but safe to use because they are statically linked)
-#include "nsComponentManagerUtils.h"
-
-// NON-FROZEN APIS!
-#include "nsIWebNavigation.h"
-
-WebBrowserChrome::WebBrowserChrome()
-{
-    mNativeWindow = nullptr;
-    mSizeSet = false;
-}
-
-WebBrowserChrome::~WebBrowserChrome()
-{
-    WebBrowserChromeUI::Destroyed(this);
-}
-
-nsresult WebBrowserChrome::CreateBrowser(int32_t aX, int32_t aY,
-                                         int32_t aCX, int32_t aCY,
-                                         nsIWebBrowser **aBrowser)
-{
-    NS_ENSURE_ARG_POINTER(aBrowser);
-    *aBrowser = nullptr;
-
-    mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
-    
-    if (!mWebBrowser)
-        return NS_ERROR_FAILURE;
-
-    (void)mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
-
-    nsCOMPtr<nsIBaseWindow> browserBaseWindow = do_QueryInterface(mWebBrowser);
-
-    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast<nsIWebBrowserChrome*>(this));
-
-    if (!mNativeWindow)
-        return NS_ERROR_FAILURE;
-
-    browserBaseWindow->InitWindow( mNativeWindow,
-                             nullptr, 
-                             aX, aY, aCX, aCY);
-    browserBaseWindow->Create();
-
-    nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
-    nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
-    (void)mWebBrowser->AddWebBrowserListener(thisListener, 
-        NS_GET_IID(nsIWebProgressListener));
-
-    // The window has been created. Now register for history notifications
-    mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsISHistoryListener));
-
-    if (mWebBrowser)
-    {
-      *aBrowser = mWebBrowser;
-      NS_ADDREF(*aBrowser);
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ADDREF(WebBrowserChrome)
-NS_IMPL_RELEASE(WebBrowserChrome)
-
-NS_INTERFACE_MAP_BEGIN(WebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
-   NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) // optional
-   NS_INTERFACE_MAP_ENTRY(nsISHistoryListener)
-   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-   NS_INTERFACE_MAP_ENTRY(nsIObserver)
-   NS_INTERFACE_MAP_ENTRY(nsIContextMenuListener)
-   NS_INTERFACE_MAP_ENTRY(nsITooltipListener)
-NS_INTERFACE_MAP_END
-
-//*****************************************************************************
-// WebBrowserChrome::nsIInterfaceRequestor
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::GetInterface(const nsIID &aIID, void** aInstancePtr)
-{
-    NS_ENSURE_ARG_POINTER(aInstancePtr);
-
-    *aInstancePtr = 0;
-    if (aIID.Equals(NS_GET_IID(nsIDOMWindow)))
-    {
-        if (mWebBrowser)
-        {
-            return mWebBrowser->GetContentDOMWindow((nsIDOMWindow **) aInstancePtr);
-        }
-        return NS_ERROR_NOT_INITIALIZED;
-    }
-    return QueryInterface(aIID, aInstancePtr);
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebBrowserChrome
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::SetStatus(uint32_t aType, const char16_t* aStatus)
-{
-    WebBrowserChromeUI::UpdateStatusBarText(this, aStatus);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetWebBrowser(nsIWebBrowser** aWebBrowser)
-{
-    NS_ENSURE_ARG_POINTER(aWebBrowser);
-    *aWebBrowser = mWebBrowser;
-    NS_IF_ADDREF(*aWebBrowser);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::SetWebBrowser(nsIWebBrowser* aWebBrowser)
-{
-    mWebBrowser = aWebBrowser;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetChromeFlags(uint32_t* aChromeMask)
-{
-    *aChromeMask = mChromeFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::SetChromeFlags(uint32_t aChromeMask)
-{
-    mChromeFlags = aChromeMask;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::DestroyBrowserWindow(void)
-{
-    WebBrowserChromeUI::Destroy(this);
-    return NS_OK;
-}
-
-
-// IN: The desired browser client area dimensions.
-NS_IMETHODIMP WebBrowserChrome::SizeBrowserTo(int32_t aWidth, int32_t aHeight)
-{
-  /* This isn't exactly correct: we're setting the whole window to
-     the size requested for the browser. At time of writing, though,
-     it's fine and useful for winEmbed's purposes. */
-  WebBrowserChromeUI::SizeTo(this, aWidth, aHeight);
-  mSizeSet = true;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP WebBrowserChrome::ShowAsModal(void)
-{
-  if (mDependentParent)
-    AppCallbacks::EnableChromeWindow(mDependentParent, false);
-
-  mContinueModalLoop = true;
-  AppCallbacks::RunEventLoop(mContinueModalLoop);
-
-  if (mDependentParent)
-    AppCallbacks::EnableChromeWindow(mDependentParent, true);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::IsWindowModal(bool *_retval)
-{
-    *_retval = false;
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
-{
-  mContinueModalLoop = false;
-  return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebBrowserChromeFocus
-//*****************************************************************************
-
-NS_IMETHODIMP WebBrowserChrome::FocusNextElement()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::FocusPrevElement()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebProgressListener
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::OnProgressChange(nsIWebProgress *progress, nsIRequest *request,
-                                                  int32_t curSelfProgress, int32_t maxSelfProgress,
-                                                  int32_t curTotalProgress, int32_t maxTotalProgress)
-{
-    WebBrowserChromeUI::UpdateProgress(this, curTotalProgress, maxTotalProgress);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::OnStateChange(nsIWebProgress *progress, nsIRequest *request,
-                                               uint32_t progressStateFlags, nsresult status)
-{
-    if ((progressStateFlags & STATE_START) && (progressStateFlags & STATE_IS_DOCUMENT))
-    {
-        WebBrowserChromeUI::UpdateBusyState(this, true);
-    }
-
-    if ((progressStateFlags & STATE_STOP) && (progressStateFlags & STATE_IS_DOCUMENT))
-    {
-        WebBrowserChromeUI::UpdateBusyState(this, false);
-        WebBrowserChromeUI::UpdateProgress(this, 0, 100);
-        WebBrowserChromeUI::UpdateStatusBarText(this, nullptr);
-        ContentFinishedLoading();
-    }
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP WebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
-                                                 nsIRequest* aRequest,
-                                                 nsIURI *location,
-                                                 uint32_t aFlags)
-{
-  bool isSubFrameLoad = false; // Is this a subframe load
-  if (aWebProgress) {
-    nsCOMPtr<nsIDOMWindow>  domWindow;
-    nsCOMPtr<nsIDOMWindow>  topDomWindow;
-    aWebProgress->GetDOMWindow(getter_AddRefs(domWindow));
-    if (domWindow) { // Get root domWindow
-      domWindow->GetTop(getter_AddRefs(topDomWindow));
-    }
-    if (domWindow != topDomWindow)
-      isSubFrameLoad = true;
-  }
-  if (!isSubFrameLoad)
-    WebBrowserChromeUI::UpdateCurrentURI(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-WebBrowserChrome::OnStatusChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 nsresult aStatus,
-                                 const char16_t* aMessage)
-{
-    WebBrowserChromeUI::UpdateStatusBarText(this, aMessage);
-    return NS_OK;
-}
-
-
-
-NS_IMETHODIMP 
-WebBrowserChrome::OnSecurityChange(nsIWebProgress *aWebProgress, 
-                                    nsIRequest *aRequest, 
-                                    uint32_t state)
-{
-    return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsISHistoryListener
-//*****************************************************************************   
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryNewEntry(nsIURI * aNewURI)
-{
-    return SendHistoryStatusMessage(aNewURI, "add");
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGoBack(nsIURI * aBackURI, bool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = true;
-    return SendHistoryStatusMessage(aBackURI, "back");
-}
-
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGoForward(nsIURI * aForwardURI, bool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = true;
-    return SendHistoryStatusMessage(aForwardURI, "forward");
-}
-
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGotoIndex(int32_t aIndex, nsIURI * aGotoURI, bool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = true;
-    return SendHistoryStatusMessage(aGotoURI, "goto", aIndex);
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryReload(nsIURI * aURI, uint32_t aReloadFlags, bool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = true;
-    return SendHistoryStatusMessage(aURI, "reload", 0 /* no info to pass here */, aReloadFlags);
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryPurge(int32_t aNumEntries, bool *aContinue)
-{
-    // For now let the operation continue
-    *aContinue = false;
-    return SendHistoryStatusMessage(nullptr, "purge", aNumEntries);
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryReplaceEntry(int32_t aIndex)
-{
-    return SendHistoryStatusMessage(nullptr, "replace", aIndex);
-}
-
-static void
-AppendIntToCString(int32_t info1, nsCString& aResult)
-{
-  char intstr[10];
-  _snprintf(intstr, sizeof(intstr) - 1, "%i", info1);
-  intstr[sizeof(intstr) - 1] = '\0';
-  aResult.Append(intstr);
-}
-
-nsresult
-WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, int32_t info1, uint32_t aReloadFlags)
-{
-    nsCString uriSpec;
-    if (aURI)
-    {
-        aURI->GetSpec(uriSpec);
-    }
-
-    nsCString status;
-
-    if(!(strcmp(operation, "back")))
-    {
-        status.AssignLiteral("Going back to url: ");
-        status.Append(uriSpec);
-    }
-    else if (!(strcmp(operation, "forward")))
-    {
-        // Going forward. XXX Get string from a resource file
-        status.AssignLiteral("Going forward to url: ");
-        status.Append(uriSpec);
-    }
-    else if (!(strcmp(operation, "reload")))
-    {
-        // Reloading. XXX Get string from a resource file
-        if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY && 
-            aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE)
-        {
-            status.AssignLiteral("Reloading url, (bypassing proxy and cache): ");
-        }
-        else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY)
-        {
-            status.AssignLiteral("Reloading url, (bypassing proxy): ");
-        }
-        else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE)
-        {
-            status.AssignLiteral("Reloading url, (bypassing cache): ");
-        }
-        else
-        {
-            status.AssignLiteral("Reloading url, (normal): ");
-        }
-        status.Append(uriSpec);
-    }
-    else if (!(strcmp(operation, "add")))
-    {
-        status.Assign(uriSpec);
-        status.AppendLiteral(" added to session History");
-    }
-    else if (!(strcmp(operation, "goto")))
-    {
-        status.AssignLiteral("Going to HistoryIndex: ");
-
-	AppendIntToCString(info1, status);
-
-        status.AppendLiteral(" Url: ");
-        status.Append(uriSpec);
-    }
-    else if (!(strcmp(operation, "purge")))
-    {
-        AppendIntToCString(info1, status);
-        status.AppendLiteral(" purged from Session History");
-    }
-    else if (!(strcmp(operation, "replace")))
-    {
-        status.AssignLiteral("Replacing HistoryIndex: ");
-        AppendIntToCString(info1, status);
-    }
-
-    nsString wstatus;
-    NS_CStringToUTF16(status, NS_CSTRING_ENCODING_UTF8, wstatus);
-    WebBrowserChromeUI::UpdateStatusBarText(this, wstatus.get());
-
-    return NS_OK;
-}
-
-void WebBrowserChrome::ContentFinishedLoading()
-{
-  // if it was a chrome window and no one has already specified a size,
-  // size to content
-  if (mWebBrowser && !mSizeSet &&
-     (mChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)) {
-    nsCOMPtr<nsIDOMWindow> contentWin;
-    mWebBrowser->GetContentDOMWindow(getter_AddRefs(contentWin));
-    if (contentWin)
-        contentWin->SizeToContent();
-    WebBrowserChromeUI::ShowWindow(this, true);
-  }
-}
-
-
-//*****************************************************************************
-// WebBrowserChrome::nsIEmbeddingSiteWindow
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::SetDimensions(uint32_t aFlags, int32_t x, int32_t y, int32_t cx, int32_t cy)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetDimensions(uint32_t aFlags, int32_t *x, int32_t *y, int32_t *cx, int32_t *cy)
-{
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION)
-    {
-        *x = 0;
-        *y = 0;
-    }
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER ||
-        aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER)
-    {
-        *cx = 0;
-        *cy = 0;
-    }
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setFocus (); */
-NS_IMETHODIMP WebBrowserChrome::SetFocus()
-{
-    WebBrowserChromeUI::SetFocus(this);
-    return NS_OK;
-}
-
-/* void blur (); */
-NS_IMETHODIMP WebBrowserChrome::Blur()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute wstring title; */
-NS_IMETHODIMP WebBrowserChrome::GetTitle(char16_t * *aTitle)
-{
-   NS_ENSURE_ARG_POINTER(aTitle);
-
-   *aTitle = nullptr;
-   
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP WebBrowserChrome::SetTitle(const char16_t * aTitle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean visibility; */
-NS_IMETHODIMP WebBrowserChrome::GetVisibility(bool * aVisibility)
-{
-    NS_ENSURE_ARG_POINTER(aVisibility);
-    *aVisibility = true;
-    return NS_OK;
-}
-NS_IMETHODIMP WebBrowserChrome::SetVisibility(bool aVisibility)
-{
-    return NS_OK;
-}
-
-/* attribute nativeSiteWindow siteWindow */
-NS_IMETHODIMP WebBrowserChrome::GetSiteWindow(void * *aSiteWindow)
-{
-   NS_ENSURE_ARG_POINTER(aSiteWindow);
-
-   *aSiteWindow = mNativeWindow;
-   return NS_OK;
-}
-
-
-//*****************************************************************************
-// WebBrowserChrome::nsIObserver
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *someData)
-{
-    nsresult rv = NS_OK;
-    if (strcmp(aTopic, "profile-change-teardown") == 0)
-    {
-        // A profile change means death for this window
-        WebBrowserChromeUI::Destroy(this);
-    }
-    return rv;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIContextMenuListener
-//*****************************************************************************   
-
-/* void OnShowContextMenu (in unsigned long aContextFlags, in nsIDOMEvent aEvent, in nsIDOMNode aNode); */
-NS_IMETHODIMP WebBrowserChrome::OnShowContextMenu(uint32_t aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-    WebBrowserChromeUI::ShowContextMenu(this, aContextFlags, aEvent, aNode);
-    return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsITooltipListener
-//*****************************************************************************   
-
-/* void OnShowTooltip (in long aXCoords, in long aYCoords, in wstring aTipText); */
-NS_IMETHODIMP WebBrowserChrome::OnShowTooltip(int32_t aXCoords, int32_t aYCoords, const char16_t *aTipText)
-{
-    WebBrowserChromeUI::ShowTooltip(this, aXCoords, aYCoords, aTipText);
-    return NS_OK;
-}
-
-/* void OnHideTooltip (); */
-NS_IMETHODIMP WebBrowserChrome::OnHideTooltip()
-{
-    WebBrowserChromeUI::HideTooltip(this);
-    return NS_OK;
-}

deleted file mode 100644
--- a/embedding/tests/winEmbed/WebBrowserChrome.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __WebBrowserChrome__
-#define __WebBrowserChrome__
-
-// OS headers
-
-#include <windows.h>
-
-// FROZEN APIs
-
-#include "nsStringAPI.h"
-
-#include "nsIWebBrowserChrome.h"
-#include "nsIWebBrowserChromeFocus.h"
-
-#include "nsIContextMenuListener.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIObserver.h"
-#include "nsISHistoryListener.h"
-#include "nsITooltipListener.h"
-#include "nsIWebProgressListener.h"
-#include "nsIWebBrowser.h"
-
-// GLUE APIs (not frozen, but safe because we're statically linking them)
-#include "nsCOMPtr.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsWeakReference.h"
-
-class WebBrowserChromeUI
-{
-public:
-    static HWND CreateNativeWindow(nsIWebBrowserChrome* chrome);
-    static void Destroy(nsIWebBrowserChrome* chrome);
-    static void Destroyed(nsIWebBrowserChrome* chrome);
-    static void SetFocus(nsIWebBrowserChrome *chrome);
-    static void UpdateStatusBarText(nsIWebBrowserChrome *aChrome, const char16_t* aStatusText);
-    static void UpdateCurrentURI(nsIWebBrowserChrome *aChrome);
-    static void UpdateBusyState(nsIWebBrowserChrome *aChrome, bool aBusy);
-    static void UpdateProgress(nsIWebBrowserChrome *aChrome, int32_t aCurrent, int32_t aMax);
-    static void GetResourceStringById(int32_t aID, char ** aReturn);
-    static void ShowContextMenu(nsIWebBrowserChrome *aChrome, uint32_t aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode);
-    static void ShowTooltip(nsIWebBrowserChrome *aChrome, int32_t aXCoords, int32_t aYCoords, const char16_t *aTipText);
-    static void HideTooltip(nsIWebBrowserChrome *aChrome);
-    static void ShowWindow(nsIWebBrowserChrome *aChrome, bool aShow);
-    static void SizeTo(nsIWebBrowserChrome *aChrome, int32_t aWidth, int32_t aHeight);
-};
-
-class WebBrowserChrome   : public nsIWebBrowserChrome,
-                           public nsIWebBrowserChromeFocus,
-                           public nsIWebProgressListener,
-                           public nsIEmbeddingSiteWindow,
-                           public nsIInterfaceRequestor,
-                           public nsISHistoryListener,
-                           public nsIObserver,
-                           public nsIContextMenuListener,
-                           public nsITooltipListener,
-                           public nsSupportsWeakReference
-
-{
-public:
-    WebBrowserChrome();
-    virtual ~WebBrowserChrome();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWEBBROWSERCHROME
-    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
-    NS_DECL_NSIWEBPROGRESSLISTENER
-    NS_DECL_NSIEMBEDDINGSITEWINDOW
-    NS_DECL_NSIINTERFACEREQUESTOR
-    NS_DECL_NSISHISTORYLISTENER
-    NS_DECL_NSIOBSERVER
-    NS_DECL_NSICONTEXTMENULISTENER
-    NS_DECL_NSITOOLTIPLISTENER
-
-    nsresult CreateBrowser(int32_t aX, int32_t aY, int32_t aCX, int32_t aCY,
-                           nsIWebBrowser **aBrowser);
-
-    void     SetParent(nsIWebBrowserChrome *aParent)
-               { mDependentParent = aParent; }
-   
-protected:
-    nsresult SendHistoryStatusMessage(nsIURI * aURI, char * operation, int32_t info1=0, uint32_t info2=0);
-
-    void ContentFinishedLoading();
-
-    HWND         mNativeWindow;
-    uint32_t     mChromeFlags;
-    bool         mContinueModalLoop;
-    bool         mSizeSet;
-
-    nsCOMPtr<nsIWebBrowser> mWebBrowser;
-    nsCOMPtr<nsIWebBrowserChrome> mDependentParent; // opener (for dependent windows only)
-};
-
-#endif /* __WebBrowserChrome__ */

deleted file mode 100644
--- a/embedding/tests/winEmbed/WindowCreator.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIWebBrowserChrome.h"
-#include "WindowCreator.h"
-#include "winEmbed.h"
-
-WindowCreator::WindowCreator()
-{
-}
-
-WindowCreator::~WindowCreator()
-{
-}
-
-NS_IMPL_ISUPPORTS(WindowCreator, nsIWindowCreator)
-
-NS_IMETHODIMP
-WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
-                                  uint32_t chromeFlags,
-                                  nsIWebBrowserChrome **_retval)
-{
-    NS_ENSURE_ARG_POINTER(_retval);
-    AppCallbacks::CreateBrowserWindow(int32_t(chromeFlags), parent, _retval);
-    return *_retval ? NS_OK : NS_ERROR_FAILURE;
-}

deleted file mode 100644
--- a/embedding/tests/winEmbed/WindowCreator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __WindowCreator_h_
-#define __WindowCreator_h_
-
-#include "nsIWindowCreator.h"
-
-class WindowCreator :
-      public nsIWindowCreator
-{
-public:
-    WindowCreator();
-    virtual ~WindowCreator();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWINDOWCREATOR
-};
-
-#endif
-

deleted file mode 100644
--- a/embedding/tests/winEmbed/moz.build
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-GeckoProgram('winEmbed')
-
-SOURCES += [
-    'WebBrowserChrome.cpp',
-    'WindowCreator.cpp',
-    'winEmbed.cpp',
-]
-
-XPI_NAME = 'winembed'
-
-RESFILE = 'winEmbed.res'
-
-if CONFIG['GNU_CC']:
-    # Get rid of console window
-    LDFLAGS += ['-mwindows']
-else:
-    # Control the default heap size.
-    # This is the heap returned by GetProcessHeap().
-    # As we use the CRT heap, the default size is too large and wastes VM.
-    #
-    # The default heap size is 1MB on Win32.
-    # The heap will grow if need be.
-    #
-    # Set it to 256k.  See bug 127069.
-    LDFLAGS += ['/HEAP:0x40000']
-
-DISABLE_STL_WRAPPING = True
-
-USE_LIBS += [
-    'profdirserviceprovidersa_s',
-]
-
-OS_LIBS += [
-    'ole32',
-    'comdlg32',
-    'shell32',
-    'version',
-]

deleted file mode 100644
--- a/embedding/tests/winEmbed/resource.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by winEmbed.rc
-//
-#define IDC_MYICON                      2
-#define IDD_WINEMBED_DIALOG             102
-#define IDD_ABOUTBOX                    103
-#define IDS_APP_TITLE                   103
-#define IDM_ABOUT                       104
-#define MOZ_OpenURI                     104
-#define MOZ_GetURI                      104
-#define IDM_EXIT                        105
-#define IDS_HELLO                       106
-#define IDI_WINEMBED                    107
-#define IDS_ABOUT                       107
-#define IDI_SMALL                       108
-#define IDS_ABOUT_TITLE                 108
-#define IDC_WINEMBED                    109
-#define IDS_HIST_BACK                   109
-#define IDS_HIST_FORWARD                110
-#define IDS_HIST_RELOAD_NORMAL          111
-#define IDS_HIST_RELOAD_BYPASSPROXY     112
-#define IDS_HIST_RELOAD_BYPASSCACHE     113
-#define IDS_HIST_ADDURL                 114
-#define IDS_HIST_RELOAD_BYPASSPROXYANDCACHE 115
-#define IDS_HIST_PURGE                  116
-#define IDS_HIST_GOTO                   117
-#define IDS_HIST_URL                    118
-#define IDR_MAINFRAME                   128
-#define IDD_BROWSER                     130
-#define IDD_BROWSER_NC                  131
-#define IDD_CHOOSEPROFILE               132
-#define MOZ_EDIT_URI                    1001
-#define IDC_GO                          1003
-#define IDC_BROWSER                     1004
-#define IDC_ADDRESS                     1005
-#define IDC_STOP                        1006
-#define IDC_STATUS                      1007
-#define IDC_BACK                        1008
-#define IDC_FORWARD                     1009
-#define IDC_PROGRESS                    1010
-#define IDC_RELOAD                      1011
-#define IDC_PROFILELIST                 1011
-#define MOZ_Open                        32771
-#define MOZ_NewBrowser                  32773
-#define MOZ_NewEditor                   32774
-#define MOZ_Cut                         32776
-#define MOZ_Copy                        32777
-#define MOZ_Paste                       32778
-#define MOZ_Delete                      32779
-#define MOZ_SelectAll                   32780
-#define MOZ_SelectNone                  32781
-#define MOZ_GoBack                      32782
-#define MOZ_GoForward                   32783
-#define MOZ_About                       32784
-#define ID_DEBUG_THISSPACEFORRENT       32786
-#define MOZ_SwitchProfile               32787
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        133
-#define _APS_NEXT_COMMAND_VALUE         32788
-#define _APS_NEXT_CONTROL_VALUE         1012
-#define _APS_NEXT_SYMED_VALUE           110
-#endif
-#endif

deleted file mode 100644
index b276a959679bf59784dd4fcd071783a0e3b120a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
--- a/embedding/tests/winEmbed/winEmbed.cpp
+++ /dev/null
@@ -1,1135 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *   Doug Turner <dougt@netscape.com>
- *   Adam Lock <adamlock@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-// C RunTime Header Files
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
-
-// Win32 header files
-#include <windows.h>
-#include <commctrl.h>
-#include <commdlg.h>
-
-// Mozilla Frozen APIs
-#include "nsXULAppAPI.h"
-
-XRE_InitEmbedding2Type XRE_InitEmbedding2;
-XRE_TermEmbeddingType XRE_TermEmbedding;
-
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsProfileDirServiceProvider.h"
-#include "nsStringAPI.h"
-#include "nsXPCOMGlue.h"
-
-#include "nsIClipboardCommands.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIObserverService.h"
-#include "nsIObserver.h"
-#include "nsIURI.h"
-#include "nsIWebBrowserFocus.h"
-#include "nsIWindowWatcher.h"
-
-// NON-FROZEN APIs!
-#include "nsIBaseWindow.h"
-#include "nsIWebNavigation.h"
-
-// Local header files
-#include "winEmbed.h"
-#include "WebBrowserChrome.h"
-#include "WindowCreator.h"
-#include "resource.h"
-
-#define MAX_LOADSTRING 100
-
-const TCHAR *szWindowClass = _T("WINEMBED");
-
-// Foward declarations of functions included in this code module:
-static ATOM             MyRegisterClass(HINSTANCE hInstance);
-static LRESULT CALLBACK BrowserWndProc(HWND, UINT, WPARAM, LPARAM);
-static INT_PTR CALLBACK BrowserDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-static nsresult InitializeWindowCreator();
-static nsresult OpenWebPage(const char * url);
-static nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome);
-
-// Profile chooser stuff
-static nsresult StartupProfile();
-
-// Global variables
-static UINT gDialogCount = 0;
-static HINSTANCE ghInstanceApp = nullptr;
-static char gFirstURL[1024];
-
-// like strpbrk but finds the *last* char, not the first
-static char*
-ns_strrpbrk(char *string, const char *strCharSet)
-{
-    char *found = nullptr;
-    for (; *string; ++string) {
-        for (const char *search = strCharSet; *search; ++search) {
-            if (*search == *string) {
-                found = string;
-                // Since we're looking for the last char, we save "found"
-                // until we're at the end of the string.
-            }
-        }
-    }
-
-    return found;
-}
-
-// A list of URLs to populate the URL drop down list with
-static const TCHAR *gDefaultURLs[] = 
-{
-    _T("http://www.mozilla.org/"),
-    _T("http://www.netscape.com/"),
-    _T("http://browsertest.web.aol.com/tests/javascript/javascpt/index.htm"),
-    _T("http://127.0.0.1/"),
-    _T("http://www.yahoo.com/"),
-    _T("http://www.travelocity.com/"),
-    _T("http://www.disney.com/"),
-    _T("http://www.go.com/"),
-    _T("http://www.google.com/"),
-    _T("http://www.ebay.com/"),
-    _T("http://www.shockwave.com/"),
-    _T("http://www.slashdot.org/"),
-    _T("http://www.quicken.com/"),
-    _T("http://www.hotmail.com/"),
-    _T("http://www.cnn.com/"),
-    _T("http://www.javasoft.com/")
-};
-
-int main(int argc, char *argv[])
-{
-    nsresult rv;
-
-    printf("You are embedded, man!\n\n");
-    printf("******************************************************************\n");
-    printf("*                                                                *\n");
-    printf("*  IMPORTANT NOTE:                                               *\n");
-    printf("*                                                                *\n");
-    printf("*  WinEmbed is not supported!!! Do not raise bugs on it unless   *\n");
-    printf("*  it is badly broken (e.g. crash on start/exit, build errors)   *\n");
-    printf("*  or you have the patch to make it better! MFCEmbed is now our  *\n");
-    printf("*  embedding test application on Win32 and all testing should    *\n");
-    printf("*  be done on that.                                              *\n");
-    printf("*                                                                *\n");
-    printf("******************************************************************\n");
-    printf("\n\n");
-    
-    // Sophisticated command-line parsing in action
-    char *szFirstURL = "http://www.mozilla.org/projects/embedding/";
-	int argn;
-    for (argn = 1; argn < argc; argn++)
-    {
-		szFirstURL = argv[argn];
-    }
-    strncpy(gFirstURL, szFirstURL, sizeof(gFirstURL) - 1);
-
-    ghInstanceApp = GetModuleHandle(nullptr);
-
-    // Initialize global strings
-    TCHAR szTitle[MAX_LOADSTRING];
-    LoadString(ghInstanceApp, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-    MyRegisterClass(ghInstanceApp);
-
-    char path[_MAX_PATH];
-    GetModuleFileName(ghInstanceApp, path, sizeof(path));
-    char* lastslash = ns_strrpbrk(path, "/\\");
-    if (!lastslash)
-        return 7;
-
-    strcpy(lastslash, "\\xulrunner\\xpcom.dll");
-
-    rv = XPCOMGlueStartup(path);
-    if (NS_FAILED(rv))
-        return 3;
-
-    strcpy(lastslash, "\\xulrunner\\xul.dll");
-
-    HINSTANCE xulModule = LoadLibraryEx(path, nullptr, 0);
-    if (!xulModule)
-        return 4;
-
-    XRE_InitEmbedding2 =
-        (XRE_InitEmbedding2Type) GetProcAddress(xulModule, "XRE_InitEmbedding2");
-    if (!XRE_InitEmbedding2) {
-        fprintf(stderr, "Error: %i\n", GetLastError());
-        return 5;
-    }
-
-    XRE_TermEmbedding =
-        (XRE_TermEmbeddingType) GetProcAddress(xulModule, "XRE_TermEmbedding");
-    if (!XRE_TermEmbedding) {
-        fprintf(stderr, "Error: %i\n", GetLastError());
-        return 5;
-    }
-
-    int result = 0;
-
-    // Scope all the XPCOM stuff
-    {
-        strcpy(lastslash, "\\xulrunner");
-
-        nsCOMPtr<nsIFile> xuldir;
-        rv = NS_NewNativeLocalFile(nsCString(path), false,
-                                   getter_AddRefs(xuldir));
-        if (NS_FAILED(rv))
-            return 6;
-
-        *lastslash = '\0';
-
-        nsCOMPtr<nsIFile> appdir;
-        rv = NS_NewNativeLocalFile(nsCString(path), false,
-                                   getter_AddRefs(appdir));
-        if (NS_FAILED(rv))
-            return 8;
-
-        rv = XRE_InitEmbedding2(xuldir, appdir, nullptr);
-        if (NS_FAILED(rv))
-            return 9;
-
-        if (NS_FAILED(StartupProfile())) {
-            result = 8;
-        }
-        else {
-            InitializeWindowCreator();
-
-            // Open the initial browser window
-            OpenWebPage(gFirstURL);
-
-            // Main message loop.
-            // NOTE: We use a fake event and a timeout in order to process idle stuff for
-            //       Mozilla every 1/10th of a second.
-            bool runCondition = true;
-
-            result = AppCallbacks::RunEventLoop(runCondition);
-        }
-    }
-    XRE_TermEmbedding();
-
-    return result;
-}
-
-/* InitializeWindowCreator creates and hands off an object with a callback
-   to a window creation function. This is how all new windows are opened,
-   except any created directly by the embedding app. */
-nsresult
-InitializeWindowCreator()
-{
-    // create an nsWindowCreator and give it to the WindowWatcher service
-    nsCOMPtr<nsIWindowCreator> creator(new WindowCreator());
-    if (!creator)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-    if (!wwatch)
-        return NS_ERROR_UNEXPECTED;
-
-    return wwatch->SetWindowCreator(creator);
-}
-
-//-----------------------------------------------------------------------------
-
-//
-//  FUNCTION: OpenWebPage()
-//
-//  PURPOSE: Opens a new browser dialog and starts it loading to the
-//           specified url.
-//
-nsresult OpenWebPage(const char *url)
-{
-    nsresult  rv;
-
-    // Create the chrome object. Note that it leaves this function
-    // with an extra reference so that it can released correctly during
-    // destruction (via Win32UI::Destroy)
-
-    nsCOMPtr<nsIWebBrowserChrome> chrome;
-    rv = AppCallbacks::CreateBrowserWindow(nsIWebBrowserChrome::CHROME_ALL,
-           nullptr, getter_AddRefs(chrome));
-    if (NS_SUCCEEDED(rv))
-    {
-        // Start loading a page
-        nsCOMPtr<nsIWebBrowser> newBrowser;
-        chrome->GetWebBrowser(getter_AddRefs(newBrowser));
-        nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(newBrowser));
-
-        return webNav->LoadURI(NS_ConvertASCIItoUTF16(url).get(),
-                               nsIWebNavigation::LOAD_FLAGS_NONE,
-                               nullptr,
-                               nullptr,
-                               nullptr);
-    }
-
-    return rv;
-}   
-
-//
-//  FUNCTION: GetBrowserFromChrome()
-//
-//  PURPOSE: Returns the HWND for the webbrowser container associated
-//           with the specified chrome.
-//
-HWND GetBrowserFromChrome(nsIWebBrowserChrome *aChrome)
-{
-    if (!aChrome)
-    {
-        return nullptr;
-    }
-    nsCOMPtr<nsIEmbeddingSiteWindow> baseWindow = do_QueryInterface(aChrome);
-    HWND hwnd = nullptr;
-    baseWindow->GetSiteWindow((void **) & hwnd);
-    return hwnd;
-}
-
-
-//
-//  FUNCTION: GetBrowserDlgFromChrome()
-//
-//  PURPOSE: Returns the HWND for the browser dialog associated with
-//           the specified chrome.
-//
-HWND GetBrowserDlgFromChrome(nsIWebBrowserChrome *aChrome)
-{
-    return GetParent(GetBrowserFromChrome(aChrome));
-}
-
-
-//
-//  FUNCTION: ResizeEmbedding()
-//
-//  PURPOSE: Resizes the webbrowser window to fit its container.
-//
-nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome)
-{
-    if (!chrome)
-        return NS_ERROR_FAILURE;
-    
-    nsCOMPtr<nsIEmbeddingSiteWindow> embeddingSite = do_QueryInterface(chrome);
-    HWND hWnd;
-    embeddingSite->GetSiteWindow((void **) & hWnd);
-    
-    if (!hWnd)
-        return NS_ERROR_NULL_POINTER;
-    
-    RECT rect;
-    GetClientRect(hWnd, &rect);
-    
-    // Make sure the browser is visible and sized
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    nsCOMPtr<nsIBaseWindow> webBrowserAsWin = do_QueryInterface(webBrowser);
-    if (webBrowserAsWin)
-    {
-        webBrowserAsWin->SetPositionAndSize(rect.left, 
-                                   rect.top, 
-                                   rect.right - rect.left, 
-                                   rect.bottom - rect.top,
-                                   true);
-        webBrowserAsWin->SetVisibility(true);
-    }
-
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    This function and its usage is only necessary if you want this code
-//    to be compatible with Win32 systems prior to the 'RegisterClassEx'
-//    function that was added to Windows 95. It is important to call this function
-//    so that the application will get 'well formed' small icons associated
-//    with it.
-//
-ATOM MyRegisterClass(HINSTANCE hInstance)
-{
-    WNDCLASSEX wcex;
-
-    memset(&wcex, 0, sizeof(wcex));
-    wcex.cbSize = sizeof(WNDCLASSEX); 
-
-    wcex.style            = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = (WNDPROC) BrowserWndProc;
-    wcex.cbClsExtra        = 0;
-    wcex.cbWndExtra        = 0;
-    wcex.hInstance        = hInstance;
-    wcex.hIcon            = LoadIcon(ghInstanceApp, (LPCTSTR)IDI_WINEMBED);
-    wcex.hCursor        = LoadCursor(nullptr, IDC_ARROW);
-    wcex.hbrBackground    = (HBRUSH)(COLOR_WINDOW+1);
-    wcex.lpszClassName    = szWindowClass;
-    wcex.hIconSm        = LoadIcon(ghInstanceApp, (LPCTSTR)IDI_SMALL);
-
-    return RegisterClassEx(&wcex);
-}
-
-
-//
-//  FUNCTION: UpdateUI()
-//
-//  PURPOSE: Refreshes the buttons and menu items in the browser dialog
-//
-void UpdateUI(nsIWebBrowserChrome *aChrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    bool canGoBack = false;
-    bool canGoForward = false;
-    if (webNavigation)
-    {
-        webNavigation->GetCanGoBack(&canGoBack);
-        webNavigation->GetCanGoForward(&canGoForward);
-    }
-
-    bool canCutSelection = false;
-    bool canCopySelection = false;
-    bool canPaste = false;
-
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-    if (clipCmds)
-    {
-        clipCmds->CanCutSelection(&canCutSelection);
-        clipCmds->CanCopySelection(&canCopySelection);
-        clipCmds->CanPaste(&canPaste);
-    }
-
-    HMENU hmenu = GetMenu(hwndDlg);
-    if (hmenu)
-    {
-        EnableMenuItem(hmenu, MOZ_GoBack, MF_BYCOMMAND |
-            ((canGoBack) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_GoForward, MF_BYCOMMAND |
-            ((canGoForward) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-
-        EnableMenuItem(hmenu, MOZ_Cut, MF_BYCOMMAND |
-            ((canCutSelection) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_Copy, MF_BYCOMMAND |
-            ((canCopySelection) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_Paste, MF_BYCOMMAND |
-            ((canPaste) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-    }
-
-    HWND button;
-    button = GetDlgItem(hwndDlg, IDC_BACK);
-    if (button)
-      EnableWindow(button, canGoBack);
-    button = GetDlgItem(hwndDlg, IDC_FORWARD);
-    if (button)
-      EnableWindow(button, canGoForward);
-}
-
-
-//
-//  FUNCTION: BrowserDlgProc()
-//
-//  PURPOSE: Browser dialog windows message handler.
-//
-//  COMMENTS:
-//
-//    The code for handling buttons and menu actions is here.
-//
-INT_PTR CALLBACK BrowserDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    // Get the browser and other pointers since they are used a lot below
-    HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-    nsIWebBrowserChrome *chrome = nullptr ;
-    if (hwndBrowser)
-    {
-        chrome = (nsIWebBrowserChrome *) GetWindowLongPtr(hwndBrowser, GWLP_USERDATA);
-    }
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    if (chrome)
-    {
-        chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-        webNavigation = do_QueryInterface(webBrowser);
-    }
-
-    // Test the message
-    switch (uMsg)
-    {
-    case WM_INITDIALOG:
-        return TRUE;
-
-    case WM_INITMENU:
-        UpdateUI(chrome);
-        return TRUE;
-
-    case WM_SYSCOMMAND:
-        if (wParam == SC_CLOSE)
-        {
-            WebBrowserChromeUI::Destroy(chrome);
-            return TRUE;
-        }
-        break;
-
-    case WM_DESTROY:
-        return TRUE;
-
-    case WM_COMMAND:
-        if (!webBrowser)
-        {
-            return TRUE;
-        }
-
-        // Test which command was selected
-        switch (LOWORD(wParam))
-        {
-        case IDC_ADDRESS:
-            if (HIWORD(wParam) == CBN_EDITCHANGE || HIWORD(wParam) == CBN_SELCHANGE)
-            {
-                // User has changed the address field so enable the Go button
-                EnableWindow(GetDlgItem(hwndDlg, IDC_GO), TRUE);
-            }
-            break;
-
-        case IDC_GO:
-            {
-                TCHAR szURL[2048];
-                memset(szURL, 0, sizeof(szURL));
-                GetDlgItemText(hwndDlg, IDC_ADDRESS, szURL,
-                    sizeof(szURL) / sizeof(szURL[0]) - 1);
-                webNavigation->LoadURI(
-                    NS_ConvertASCIItoUTF16(szURL).get(),
-                    nsIWebNavigation::LOAD_FLAGS_NONE,
-                    nullptr,
-                    nullptr,
-                    nullptr);
-            }
-            break;
-
-        case IDC_STOP:
-            webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-            UpdateUI(chrome);
-            break;
-
-        case IDC_RELOAD:
-            webNavigation->Reload(nsIWebNavigation::LOAD_FLAGS_NONE);
-            break;
-
-        case IDM_EXIT:
-            PostMessage(hwndDlg, WM_SYSCOMMAND, SC_CLOSE, 0);
-            break;
-
-        // File menu commands
-
-        case MOZ_NewBrowser:
-            OpenWebPage(gFirstURL);
-            break;
-
-        // Edit menu commands
-
-        case MOZ_Cut:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CutSelection();
-            }
-            break;
-
-        case MOZ_Copy:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CopySelection();
-            }
-            break;
-
-        case MOZ_Paste:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->Paste();
-            }
-            break;
-
-        case MOZ_SelectAll:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectAll();
-            }
-            break;
-
-        case MOZ_SelectNone:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectNone();
-            }
-            break;
-
-        // Go menu commands
-        case IDC_BACK:
-        case MOZ_GoBack:
-            webNavigation->GoBack();
-            UpdateUI(chrome);
-            break;
-
-        case IDC_FORWARD:
-        case MOZ_GoForward:
-            webNavigation->GoForward();
-            UpdateUI(chrome);
-            break;
-
-        // Help menu commands
-        case MOZ_About:
-            {
-                TCHAR szAboutTitle[MAX_LOADSTRING];
-                TCHAR szAbout[MAX_LOADSTRING];
-                LoadString(ghInstanceApp, IDS_ABOUT_TITLE, szAboutTitle, MAX_LOADSTRING);
-                LoadString(ghInstanceApp, IDS_ABOUT, szAbout, MAX_LOADSTRING);
-                MessageBox(nullptr, szAbout, szAboutTitle, MB_OK);
-            }
-            break;
-        }
-
-        return TRUE;
-
-    case WM_ACTIVATE:
-        {
-            nsCOMPtr<nsIWebBrowserFocus> focus(do_GetInterface(webBrowser));
-            if(focus)
-            {
-                switch (wParam)
-                {
-                case WA_ACTIVE:
-                    focus->Activate();
-                    break;
-                case WA_INACTIVE:
-                    focus->Deactivate();
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-        break;
-
-    case WM_SIZE:
-        {
-            UINT newDlgWidth = LOWORD(lParam);
-            UINT newDlgHeight = HIWORD(lParam);
-
-            // TODO Reposition the control bar - for the moment it's fixed size
-
-            // Reposition the status area. Status bar
-            // gets any space that the fixed size progress bar doesn't use.
-            int progressWidth;
-            int statusWidth;
-            int statusHeight;
-            HWND hwndStatus = GetDlgItem(hwndDlg, IDC_STATUS);
-            if (hwndStatus) {
-              RECT rcStatus;
-              GetWindowRect(hwndStatus, &rcStatus);
-              statusHeight = rcStatus.bottom - rcStatus.top;
-            } else
-              statusHeight = 0;
-
-            HWND hwndProgress = GetDlgItem(hwndDlg, IDC_PROGRESS);
-            if (hwndProgress) {
-              RECT rcProgress;
-              GetWindowRect(hwndProgress, &rcProgress);
-              progressWidth = rcProgress.right - rcProgress.left;
-            } else
-              progressWidth = 0;
-            statusWidth = newDlgWidth - progressWidth;
-
-            if (hwndStatus)
-              SetWindowPos(hwndStatus,
-                           HWND_TOP,
-                           0, newDlgHeight - statusHeight,
-                           statusWidth,
-                           statusHeight,
-                           SWP_NOZORDER);
-            if (hwndProgress)
-              SetWindowPos(hwndProgress,
-                           HWND_TOP,
-                           statusWidth, newDlgHeight - statusHeight,
-                           0, 0,
-                           SWP_NOSIZE | SWP_NOZORDER);
-
-            // Resize the browser area (assuming the browse is
-            // sandwiched between the control bar and status area)
-            RECT rcBrowser;
-            POINT ptBrowser;
-            GetWindowRect(hwndBrowser, &rcBrowser);
-            ptBrowser.x = rcBrowser.left;
-            ptBrowser.y = rcBrowser.top;
-            ScreenToClient(hwndDlg, &ptBrowser);
-            int browserHeight = newDlgHeight - ptBrowser.y - statusHeight;
-            if (browserHeight < 1)
-            {
-                browserHeight = 1;
-            }
-            SetWindowPos(hwndBrowser,
-                         HWND_TOP,
-                         0, 0,
-                         newDlgWidth,
-                         newDlgHeight - ptBrowser.y - statusHeight,
-                         SWP_NOMOVE | SWP_NOZORDER);
-        }
-        return TRUE;
-    }
-    return FALSE;
-}
-
-
-//
-//  FUNCTION: BrowserWndProc(HWND, UINT, WRAPAM, LPARAM)
-//
-//  PURPOSE:  Processes messages for the browser container window.
-//
-LRESULT CALLBACK BrowserWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    nsIWebBrowserChrome *chrome = (nsIWebBrowserChrome *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
-    switch (message) 
-    {
-    case WM_SIZE:
-        // Resize the embedded browser
-        ResizeEmbedding(chrome);
-        return 0;
-    case WM_ERASEBKGND:
-        // Reduce flicker by not painting the non-visible background
-        return 1;
-    }
-    return DefWindowProc(hWnd, message, wParam, lParam);
-}
-
-//
-//  FUNCTION: StartupProfile()
-//
-//  PURPOSE: 
-//
-nsresult StartupProfile()
-{
-
-	nsCOMPtr<nsIFile> appDataDir;
-	nsresult rv = NS_GetSpecialDirectory(NS_APP_APPLICATION_REGISTRY_DIR, getter_AddRefs(appDataDir));
-	if (NS_FAILED(rv))
-      return rv;
-
-	appDataDir->AppendNative(nsCString("winembed"));
-
-	nsCOMPtr<nsProfileDirServiceProvider> locProvider;
-    NS_NewProfileDirServiceProvider(true, getter_AddRefs(locProvider));
-    if (!locProvider)
-      return NS_ERROR_FAILURE;
-    
-	rv = locProvider->Register();
-    if (NS_FAILED(rv))
-      return rv;
-    
-	return locProvider->SetProfileDir(appDataDir);
-
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// WebBrowserChromeUI
-
-//
-//  FUNCTION: CreateNativeWindow()
-//
-//  PURPOSE: Creates a new browser dialog.
-//
-//  COMMENTS:
-//
-//    This function loads the browser dialog from a resource template
-//    and returns the HWND for the webbrowser container dialog item
-//    to the caller.
-//
-HWND WebBrowserChromeUI::CreateNativeWindow(nsIWebBrowserChrome* chrome)
-{
-  // Load the browser dialog from resource
-  HWND hwndDialog;
-  uint32_t chromeFlags;
-
-  chrome->GetChromeFlags(&chromeFlags);
-  if ((chromeFlags & nsIWebBrowserChrome::CHROME_ALL) == nsIWebBrowserChrome::CHROME_ALL)
-    hwndDialog = CreateDialog(ghInstanceApp,
-                              MAKEINTRESOURCE(IDD_BROWSER),
-                              nullptr,
-                              BrowserDlgProc);
-  else
-    hwndDialog = CreateDialog(ghInstanceApp,
-                              MAKEINTRESOURCE(IDD_BROWSER_NC),
-                              nullptr,
-                              BrowserDlgProc);
-  if (!hwndDialog)
-    return nullptr;
-
-  // Stick a menu onto it
-  if (chromeFlags & nsIWebBrowserChrome::CHROME_MENUBAR) {
-    HMENU hmenuDlg = LoadMenu(ghInstanceApp, MAKEINTRESOURCE(IDC_WINEMBED));
-    SetMenu(hwndDialog, hmenuDlg);
-  } else
-    SetMenu(hwndDialog, 0);
-
-  // Add some interesting URLs to the address drop down
-  HWND hwndAddress = GetDlgItem(hwndDialog, IDC_ADDRESS);
-  if (hwndAddress) {
-    for (int i = 0; i < sizeof(gDefaultURLs) / sizeof(gDefaultURLs[0]); i++)
-    {
-      SendMessage(hwndAddress, CB_ADDSTRING, 0, (LPARAM) gDefaultURLs[i]);
-    }
-  }
-
-  // Fetch the browser window handle
-  HWND hwndBrowser = GetDlgItem(hwndDialog, IDC_BROWSER);
-  SetWindowLongPtr(hwndBrowser, GWLP_USERDATA, (LONG_PTR)chrome);  // save the browser LONG_PTR.
-  SetWindowLongPtr(hwndBrowser, GWL_STYLE, GetWindowLongPtr(hwndBrowser, GWL_STYLE) | WS_CLIPCHILDREN);
-
-  // Activate the window
-  PostMessage(hwndDialog, WM_ACTIVATE, WA_ACTIVE, 0);
-
-  gDialogCount++;
-
-  return hwndBrowser;
-}
-
-
-//
-// FUNCTION: Destroy()
-//
-// PURPOSE: Destroy the window specified by the chrome
-//
-void WebBrowserChromeUI::Destroy(nsIWebBrowserChrome* chrome)
-{
-  nsCOMPtr<nsIWebBrowser> webBrowser;
-  nsCOMPtr<nsIWebNavigation> webNavigation;
-
-  chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-  webNavigation = do_QueryInterface(webBrowser);
-  if (webNavigation)
-    webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-
-  chrome->ExitModalEventLoop(NS_OK);
-
-  HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-  if (hwndDlg == nullptr)
-    return;
-
-  // Explicitly destroy the embedded browser and then the chrome
-
-  // First the browser
-  nsCOMPtr<nsIWebBrowser> browser = nullptr;
-  chrome->GetWebBrowser(getter_AddRefs(browser));
-  nsCOMPtr<nsIBaseWindow> browserAsWin = do_QueryInterface(browser);
-  if (browserAsWin)
-    browserAsWin->Destroy();
-
-      // Now the chrome
-  chrome->SetWebBrowser(nullptr);
-  NS_RELEASE(chrome);
-}
-
-
-//
-// FUNCTION: Called as the final act of a chrome object during its destructor
-//
-void WebBrowserChromeUI::Destroyed(nsIWebBrowserChrome* chrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-    if (hwndDlg == nullptr)
-    {
-        return;
-    }
-
-    // Clear the window user data
-    HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-    SetWindowLongPtr(hwndBrowser, GWLP_USERDATA, 0);
-    DestroyWindow(hwndBrowser);
-    DestroyWindow(hwndDlg);
-
-    --gDialogCount;
-    if (gDialogCount == 0)
-    {
-        // Quit when there are no more browser objects
-        PostQuitMessage(0);
-    }
-}
-
-
-//
-// FUNCTION: Set the input focus onto the browser window
-//
-void WebBrowserChromeUI::SetFocus(nsIWebBrowserChrome *chrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-    if (hwndDlg == nullptr)
-    {
-        return;
-    }
-    
-    HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-    ::SetFocus(hwndBrowser);
-}
-
-//
-//  FUNCTION: UpdateStatusBarText()
-//
-//  PURPOSE: Set the status bar text.
-//
-void WebBrowserChromeUI::UpdateStatusBarText(nsIWebBrowserChrome *aChrome, const char16_t* aStatusText)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCString status; 
-    if (aStatusText) {
-        nsString wStatusText(aStatusText);
-        NS_UTF16ToCString(wStatusText, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM,
-                          status);
-    }
-
-    SetDlgItemText(hwndDlg, IDC_STATUS, status.get());
-}
-
-
-//
-//  FUNCTION: UpdateCurrentURI()
-//
-//  PURPOSE: Updates the URL address field
-//
-void WebBrowserChromeUI::UpdateCurrentURI(nsIWebBrowserChrome *aChrome)
-{
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    nsCOMPtr<nsIURI> currentURI;
-    webNavigation->GetCurrentURI(getter_AddRefs(currentURI));
-    if (currentURI)
-    {
-        nsCString uriString;
-        currentURI->GetAsciiSpec(uriString);
-        HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-        SetDlgItemText(hwndDlg, IDC_ADDRESS, uriString.get());
-    }
-}
-
-
-//
-//  FUNCTION: UpdateBusyState()
-//
-//  PURPOSE: Refreshes the stop/go buttons in the browser dialog
-//
-void WebBrowserChromeUI::UpdateBusyState(nsIWebBrowserChrome *aChrome, bool aBusy)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND button;
-    button = GetDlgItem(hwndDlg, IDC_STOP);
-    if (button)
-        EnableWindow(button, aBusy);
-    button = GetDlgItem(hwndDlg, IDC_GO);
-    if (button)
-        EnableWindow(button, !aBusy);
-    UpdateUI(aChrome);
-}
-
-
-//
-//  FUNCTION: UpdateProgress()
-//
-//  PURPOSE: Refreshes the progress bar in the browser dialog
-//
-void WebBrowserChromeUI::UpdateProgress(nsIWebBrowserChrome *aChrome, int32_t aCurrent, int32_t aMax)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND hwndProgress = GetDlgItem(hwndDlg, IDC_PROGRESS);
-    if (aCurrent < 0)
-    {
-        aCurrent = 0;
-    }
-    if (aCurrent > aMax)
-    {
-        aMax = aCurrent + 20; // What to do?
-    }
-    if (hwndProgress)
-    {
-        SendMessage(hwndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, aMax));
-        SendMessage(hwndProgress, PBM_SETPOS, aCurrent, 0);
-    }
-}
-
-//
-//  FUNCTION: ShowContextMenu()
-//
-//  PURPOSE: Display a context menu for the given node
-//
-void WebBrowserChromeUI::ShowContextMenu(nsIWebBrowserChrome *aChrome, uint32_t aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-    // TODO code to test context flags and display a popup menu should go here
-}
-
-//
-//  FUNCTION: ShowTooltip()
-//
-//  PURPOSE: Show a tooltip
-//
-void WebBrowserChromeUI::ShowTooltip(nsIWebBrowserChrome *aChrome, int32_t aXCoords, int32_t aYCoords, const char16_t *aTipText)
-{
-    // TODO code to show a tooltip should go here
-}
-
-//
-//  FUNCTION: HideTooltip()
-//
-//  PURPOSE: Hide the tooltip
-//
-void WebBrowserChromeUI::HideTooltip(nsIWebBrowserChrome *aChrome)
-{
-    // TODO code to hide a tooltip should go here
-}
-
-void WebBrowserChromeUI::ShowWindow(nsIWebBrowserChrome *aChrome, bool aShow)
-{
-  HWND win = GetBrowserDlgFromChrome(aChrome);
-  ::ShowWindow(win, aShow ? SW_RESTORE : SW_HIDE);
-}
-
-void WebBrowserChromeUI::SizeTo(nsIWebBrowserChrome *aChrome, int32_t aWidth, int32_t aHeight)
-{
-  HWND hchrome = GetBrowserDlgFromChrome(aChrome);
-  HWND hbrowser = GetBrowserFromChrome(aChrome);
-  RECT chromeRect, browserRect;
-
-  ::GetWindowRect(hchrome,  &chromeRect);
-  ::GetWindowRect(hbrowser, &browserRect);
-
-  int32_t decoration_x = (browserRect.left - chromeRect.left) + 
-                         (chromeRect.right - browserRect.right);
-  int32_t decoration_y = (browserRect.top - chromeRect.top) + 
-                         (chromeRect.bottom - browserRect.bottom);
-
-  ::MoveWindow(hchrome, chromeRect.left, chromeRect.top,
-      aWidth+decoration_x,
-      aHeight+decoration_y, TRUE);
-}
-
-//
-//  FUNCTION: GetResourceStringByID()
-//
-//  PURPOSE: Get the resource string for the ID
-//
-void WebBrowserChromeUI::GetResourceStringById(int32_t aID, char ** aReturn)
-{
-    char resBuf[MAX_LOADSTRING];
-    int retval = LoadString( ghInstanceApp, aID, (LPTSTR)resBuf, sizeof(resBuf) );
-    if (retval != 0)
-    {
-        size_t resLen = strlen(resBuf);
-        *aReturn = (char *)calloc(resLen+1, sizeof(char *));
-        if (!*aReturn) return;
-            strncpy(*aReturn, resBuf, resLen);
-    }
-    return;
-}
-
-//-----------------------------------------------------------------------------
-// AppCallbacks
-//-----------------------------------------------------------------------------
-
-nsresult AppCallbacks::CreateBrowserWindow(uint32_t aChromeFlags,
-           nsIWebBrowserChrome *aParent,
-           nsIWebBrowserChrome **aNewWindow)
-{
-  WebBrowserChrome * chrome = new WebBrowserChrome();
-  if (!chrome)
-    return NS_ERROR_FAILURE;
-
-  // the interface to return and one addref, which we assume will be
-  // immediately released
-  *aNewWindow = static_cast<nsIWebBrowserChrome*>(chrome);
-  // now an extra addref; the window owns itself (to be released by
-  // WebBrowserChromeUI::Destroy)
-  NS_ADDREF(*aNewWindow);
-
-  chrome->SetChromeFlags(aChromeFlags);
-  chrome->SetParent(aParent);
-
-  // Insert the browser
-  nsCOMPtr<nsIWebBrowser> newBrowser;
-  chrome->CreateBrowser(-1, -1, -1, -1, getter_AddRefs(newBrowser));
-  if (!newBrowser)
-    return NS_ERROR_FAILURE;
-
-  // Place it where we want it.
-  ResizeEmbedding(static_cast<nsIWebBrowserChrome*>(chrome));
-
-  // if opened as chrome, it'll be made visible after the chrome has loaded.
-  // otherwise, go ahead and show it now.
-  if (!(aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME))
-    WebBrowserChromeUI::ShowWindow(*aNewWindow, true);
-
-  return NS_OK;
-}
-
-void AppCallbacks::EnableChromeWindow(nsIWebBrowserChrome *aWindow,
-                      bool aEnabled)
-{
-  HWND hwnd = GetBrowserDlgFromChrome(aWindow);
-  ::EnableWindow(hwnd, aEnabled ? TRUE : FALSE);
-}
-
-uint32_t AppCallbacks::RunEventLoop(bool &aRunCondition)
-{
-  MSG msg;
-  HANDLE hFakeEvent = ::CreateEvent(nullptr, TRUE, FALSE, nullptr);
-
-  while (aRunCondition ) {
-    // Process pending messages
-    while (::PeekMessage(&msg, nullptr, 0, 0, PM_NOREMOVE)) {
-      if (!::GetMessage(&msg, nullptr, 0, 0)) {
-        // WM_QUIT
-        aRunCondition = false;
-        break;
-      }
-
-      ::TranslateMessage(&msg);
-      ::DispatchMessage(&msg);
-    }
-
-    // Do idle stuff
-    ::MsgWaitForMultipleObjects(1, &hFakeEvent, FALSE, 100, QS_ALLEVENTS);
-  }
-  ::CloseHandle(hFakeEvent);
-  return (uint32_t)msg.wParam;
-}