import change from rmottola/Arctic-Fox:

- Bug 1087646 - Properly serialize nullprincipal URIs across IPC. (1fcc5a63e)
- bug 1137538 - remove nsIIdentityInfo and nsNSSSocketInfo::GetPreviousCert Bug 1136471 - Remove unused nsIIdentityInfo.getValidEVPolicyOid(). (f23ed7a6f)
- Bug 1049476 - 0001. webidl change - Support user certificate parameter (ba92ac3c6)
- Bug 1049476 - 0002. Support user certificate parameter in API. (30ec1a9c8)
- Bug 1049476 - 0003. Add EAP-TLS to wifi capabilities. (69920f968)
- Bug 1130400. Part 1. Pass the passed in anchor frame to SetPopupPosition in nsMenuPopupFrame::LayoutPopup if we have one. r=enndeakin (2de244c51)
- Bug 1130400. Part 2. Use a reflow callback to set the position of xul popups. r=enndeakin (aa2117085)
- Bug 1130400. Add test. (9047c9013)
- Bug 1043143: Step 2a: Add a class like nsDownloader but using memory instead of a file. (fad673f10)
- Bug 1034143: Step 2b: Add the ability to read jar files from arbitrary memory. (e1dc9faa6)
- Bug 1034143: Step 1: Fix tests for bug 945152 and bug 1008126. r=smaug (e6b6cc408)
- Bug 1043143: Step 3: Convert nsJARChannel from temporary files to temporary memory. r=honzab (79e381e50)
- Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj (f21f630cb)
- Bug 1148527 - Indentation fix after bug 1145631 (a8153b9c5)

accessible/base/NotificationController.h

@@ -86,7 +86,7 @@ private:
  * Used to process notifications from core for the document accessible.
  */
 class NotificationController final : public EventQueue,
-                                         public nsARefreshObserver
+                                     public nsARefreshObserver
 {
 public:
   NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);

accessible/base/nsAccessibilityService.h

@@ -45,10 +45,10 @@ xpcAccessibleApplication* XPCApplicationAcc();
 } // namespace mozilla
 
 class nsAccessibilityService final : public mozilla::a11y::DocManager,
-                                         public mozilla::a11y::FocusManager,
-                                         public mozilla::a11y::SelectionManager,
-                                         public nsIAccessibilityService,
-                                         public nsIObserver
+                                     public mozilla::a11y::FocusManager,
+                                     public mozilla::a11y::SelectionManager,
+                                     public nsIAccessibilityService,
+                                     public nsIObserver
 {
 public:
   typedef mozilla::a11y::Accessible Accessible;

accessible/generic/HyperTextAccessible.h

@@ -54,14 +54,14 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // Accessible
-  virtual nsIAtom* LandmarkRole() const MOZ_OVERRIDE;
-  virtual int32_t GetLevelInternal() MOZ_OVERRIDE;
-  virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
-  virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
-  virtual uint64_t NativeState() MOZ_OVERRIDE;
+  virtual nsIAtom* LandmarkRole() const override;
+  virtual int32_t GetLevelInternal() override;
+  virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
+  virtual mozilla::a11y::role NativeRole() override;
+  virtual uint64_t NativeState() override;
 
-  virtual void InvalidateChildren() MOZ_OVERRIDE;
-  virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
+  virtual void InvalidateChildren() override;
+  virtual bool RemoveChild(Accessible* aAccessible) override;
 
   // HyperTextAccessible (static helper method)
 
@@ -429,8 +429,8 @@ protected:
   virtual ~HyperTextAccessible() { }
 
   // Accessible
-  virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
-  virtual void CacheChildren() MOZ_OVERRIDE;
+  virtual ENameValueFlag NativeName(nsString& aName) override;
+  virtual void CacheChildren() override;
 
   // HyperTextAccessible
 

accessible/windows/msaa/IUnknownImpl.h

@@ -51,13 +51,13 @@ private:
 #define DECL_IUNKNOWN                                                          \
 public:                                                                        \
   virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**);            \
-  virtual ULONG STDMETHODCALLTYPE AddRef() final                           \
+  virtual ULONG STDMETHODCALLTYPE AddRef() final                               \
   {                                                                            \
     MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt");                       \
     ++mRefCnt;                                                                 \
     return mRefCnt;                                                            \
   }                                                                            \
-  virtual ULONG STDMETHODCALLTYPE Release() final                          \
+  virtual ULONG STDMETHODCALLTYPE Release() final                              \
   {                                                                            \
      MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release");                          \
      --mRefCnt;                                                                \

accessible/windows/uia/uiaRawElmProvider.h

@@ -21,7 +21,7 @@ class AccessibleWrap;
  * IRawElementProviderSimple implementation (maintains IAccessibleEx approach).
  */
 class uiaRawElmProvider final : public IAccessibleEx,
-                                    public IRawElementProviderSimple
+                                public IRawElementProviderSimple
 {
 public:
   uiaRawElmProvider(AccessibleWrap* aAcc) : mAcc(aAcc) { }

browser/components/feeds/nsFeedSniffer.h

@@ -10,7 +10,7 @@
 #include "mozilla/Attributes.h"
 
 class nsFeedSniffer final : public nsIContentSniffer,
-                                       nsIStreamListener
+                                   nsIStreamListener
 {
 public:
   NS_DECL_ISUPPORTS

caps/moz.build

@@ -17,6 +17,7 @@ XPIDL_MODULE = 'caps'
 EXPORTS += [
     'nsJSPrincipals.h',
     'nsNullPrincipal.h',
+    'nsNullPrincipalURI.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -36,6 +37,8 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True

caps/nsNullPrincipal.cpp

@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 sts=2 ts=2 et tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -86,6 +87,24 @@ nsNullPrincipal::Init(uint32_t aAppId, bool aInMozBrowser)
   mAppId = aAppId;
   mInMozBrowser = aInMozBrowser;
 
+  nsCString str;
+  nsresult rv = GenerateNullPrincipalURI(str);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mURI = new nsNullPrincipalURI(str);
+
+  return NS_OK;
+}
+
+void
+nsNullPrincipal::GetScriptLocation(nsACString &aStr)
+{
+  mURI->GetSpec(aStr);
+}
+
+nsresult
+nsNullPrincipal::GenerateNullPrincipalURI(nsACString &aStr)
+{
   // FIXME: bug 327161 -- make sure the uuid generator is reseeding-resistant.
   nsresult rv;
   nsCOMPtr<nsIUUIDGenerator> uuidgen =
@@ -104,28 +123,19 @@ nsNullPrincipal::Init(uint32_t aAppId, bool aInMozBrowser)
 
   // Use an nsCString so we only do the allocation once here and then share
   // with nsJSPrincipals
-  nsCString str;
-  str.SetCapacity(prefixLen + suffixLen);
+  aStr.SetCapacity(prefixLen + suffixLen);
 
-  str.Append(NS_NULLPRINCIPAL_PREFIX);
-  str.Append(chars);
+  aStr.Append(NS_NULLPRINCIPAL_PREFIX);
+  aStr.Append(chars);
 
-  if (str.Length() != prefixLen + suffixLen) {
+  if (aStr.Length() != prefixLen + suffixLen) {
     NS_WARNING("Out of memory allocating null-principal URI");
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  mURI = new nsNullPrincipalURI(str);
-
   return NS_OK;
 }
 
-void
-nsNullPrincipal::GetScriptLocation(nsACString &aStr)
-{
-  mURI->GetSpec(aStr);
-}
-
 #ifdef DEBUG
 void nsNullPrincipal::dumpImpl()
 {

caps/nsNullPrincipal.h

@@ -31,7 +31,7 @@ class nsNullPrincipal final : public nsJSPrincipals
 {
 public:
   nsNullPrincipal();
-  
+
   // Our refcount is managed by nsJSPrincipals.  Use this macro to avoid an
   // extra refcount member.
 
@@ -49,6 +49,8 @@ public:
 
   virtual void GetScriptLocation(nsACString &aStr) override;
 
+  static nsresult GenerateNullPrincipalURI(nsACString &aStr);
+
 #ifdef DEBUG
   virtual void dumpImpl() override;
 #endif 

caps/nsNullPrincipalURI.cpp

@@ -9,6 +9,8 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
 
+#include "mozilla/ipc/URIParams.h"
+
 #include "nsNetUtil.h"
 #include "nsEscape.h"
 #include "nsCRT.h"
@@ -17,6 +19,12 @@
 //// nsNullPrincipalURI
 
 nsNullPrincipalURI::nsNullPrincipalURI(const nsCString &aSpec)
+{
+  InitializeFromSpec(aSpec);
+}
+
+void
+nsNullPrincipalURI::InitializeFromSpec(const nsCString &aSpec)
 {
   int32_t dividerPosition = aSpec.FindChar(':');
   NS_ASSERTION(dividerPosition != -1, "Malformed URI!");
@@ -44,6 +52,7 @@ NS_INTERFACE_MAP_BEGIN(nsNullPrincipalURI)
   else
   NS_INTERFACE_MAP_ENTRY(nsIURI)
   NS_INTERFACE_MAP_ENTRY(nsISizeOf)
+  NS_INTERFACE_MAP_ENTRY(nsIIPCSerializableURI)
 NS_INTERFACE_MAP_END
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -272,6 +281,31 @@ nsNullPrincipalURI::SchemeIs(const char *aScheme, bool *_schemeIs)
   return NS_OK;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+//// nsIIPCSerializableURI
+
+void
+nsNullPrincipalURI::Serialize(mozilla::ipc::URIParams &aParams)
+{
+  aParams = mozilla::ipc::NullPrincipalURIParams();
+}
+
+bool
+nsNullPrincipalURI::Deserialize(const mozilla::ipc::URIParams &aParams)
+{
+  if (aParams.type() != mozilla::ipc::URIParams::TNullPrincipalURIParams) {
+    MOZ_ASSERT_UNREACHABLE("unexpected URIParams type");
+    return false;
+  }
+
+  nsCString str;
+  nsresult rv = nsNullPrincipal::GenerateNullPrincipalURI(str);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  InitializeFromSpec(str);
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //// nsISizeOf
 

caps/nsNullPrincipalURI.h

@@ -16,6 +16,7 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
+#include "nsIIPCSerializableURI.h"
 #include "mozilla/MemoryReporting.h"
 
 // {51fcd543-3b52-41f7-b91b-6b54102236e6}
@@ -24,11 +25,13 @@
     {0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} }
 
 class nsNullPrincipalURI final : public nsIURI
-                                   , public nsISizeOf
+                               , public nsISizeOf
+                               , public nsIIPCSerializableURI
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIURI
+  NS_DECL_NSIIPCSERIALIZABLEURI
 
   // nsISizeOf
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override;
@@ -36,9 +39,14 @@ public:
 
   explicit nsNullPrincipalURI(const nsCString &aSpec);
 
+  // NB: This constructor exists only for deserialization.
+  nsNullPrincipalURI() { }
+
 private:
   ~nsNullPrincipalURI() {}
 
+  void InitializeFromSpec(const nsCString &aSpec);
+
   nsCString mScheme;
   nsCString mPath;
 };

caps/nsScriptSecurityManager.h

@@ -33,8 +33,8 @@ class ClassInfoData;
 { 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }}
 
 class nsScriptSecurityManager final : public nsIScriptSecurityManager,
-                                          public nsIChannelEventSink,
-                                          public nsIObserver
+                                      public nsIChannelEventSink,
+                                      public nsIObserver
 {
 public:
     static void Shutdown();

chrome/nsChromeProtocolHandler.h

@@ -19,7 +19,7 @@
 }
 
 class nsChromeProtocolHandler final : public nsIProtocolHandler,
-                                          public nsSupportsWeakReference
+                                      public nsSupportsWeakReference
 {
 public:
     NS_DECL_THREADSAFE_ISUPPORTS

docshell/shistory/src/nsSHEntryShared.h

@@ -31,7 +31,7 @@ class nsISupportsArray;
 //
 // nsSHEntryShared is the vehicle for this sharing.
 class nsSHEntryShared final : public nsIBFCacheEntry,
-                                  public nsIMutationObserver
+                              public nsIMutationObserver
 {
   public:
     static void EnsureHistoryTracker();

docshell/shistory/src/nsSHistory.h

@@ -28,9 +28,9 @@ class nsISHEntry;
 class nsISHTransaction;
 
 class nsSHistory final : public PRCList,
-                             public nsISHistory,
-                             public nsISHistoryInternal,
-                             public nsIWebNavigation
+                         public nsISHistory,
+                         public nsISHistoryInternal,
+                         public nsIWebNavigation
 {
 public:
   nsSHistory();

dom/archivereader/ArchiveReader.h

@@ -33,7 +33,7 @@ class ArchiveRequest;
  * This is the ArchiveReader object
  */
 class ArchiveReader final : public nsISupports,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/archivereader/ArchiveZipFile.cpp

@@ -21,7 +21,7 @@ USING_ARCHIVEREADER_NAMESPACE
  * Input stream object for zip files
  */
 class ArchiveInputStream final : public nsIInputStream,
-                                     public nsISeekableStream
+                                 public nsISeekableStream
 {
 public:
   ArchiveInputStream(uint64_t aParentSize,

dom/asmjscache/AsmJSCache.cpp

@@ -1108,7 +1108,7 @@ FindHashMatch(const Metadata& aMetadata, const ReadParams& aReadParams,
 
 // A runnable that executes for a cache access originating in the main process.
 class SingleProcessRunnable final : public File,
-                                        private MainProcessRunnable
+                                    private MainProcessRunnable
 {
 public:
   // In the single-process case, the calling JS compilation thread holds the
@@ -1186,7 +1186,7 @@ private:
 // in the content process. This runnable gets registered as an IPDL subprotocol
 // actor so that it can communicate with the corresponding ChildProcessRunnable.
 class ParentProcessRunnable final : public PAsmJSCacheEntryParent,
-                                        public MainProcessRunnable
+                                    public MainProcessRunnable
 {
 public:
   // The given principal comes from an IPC::Principal which will be dec-refed
@@ -1357,7 +1357,7 @@ DeallocEntryParent(PAsmJSCacheEntryParent* aActor)
 namespace {
 
 class ChildProcessRunnable final : public File,
-                                       public PAsmJSCacheEntryChild
+                                   public PAsmJSCacheEntryChild
 {
 public:
   NS_DECL_NSIRUNNABLE

dom/base/Attr.h

@@ -29,7 +29,7 @@ namespace dom {
 // Attribute helper class used to wrap up an attribute with a dom
 // object that implements nsIDOMAttr and nsIDOMNode
 class Attr final : public nsIAttribute,
-                       public nsIDOMAttr
+                   public nsIDOMAttr
 {
   virtual ~Attr() {}
 

dom/base/Comment.h

@@ -14,7 +14,7 @@ namespace mozilla {
 namespace dom {
 
 class Comment final : public nsGenericDOMDataNode,
-                          public nsIDOMComment
+                      public nsIDOMComment
 {
 private:
   void Init()

dom/base/Console.h

@@ -26,7 +26,7 @@ class ConsoleCallData;
 struct ConsoleStackEntry;
 
 class Console final : public nsIObserver
-                        , public nsWrapperCache
+                    , public nsWrapperCache
 {
   ~Console();
 

dom/base/DOMImplementation.h

@@ -25,7 +25,7 @@ namespace dom {
 class DocumentType;
 
 class DOMImplementation final : public nsIDOMDOMImplementation
-                                  , public nsWrapperCache
+                              , public nsWrapperCache
 {
   ~DOMImplementation()
   {

dom/base/DOMParser.h

@@ -21,8 +21,8 @@ namespace mozilla {
 namespace dom {
 
 class DOMParser final : public nsIDOMParser,
-                            public nsSupportsWeakReference,
-                            public nsWrapperCache
+                        public nsSupportsWeakReference,
+                        public nsWrapperCache
 {
   typedef mozilla::dom::GlobalObject GlobalObject;
 

dom/base/DOMRect.h

@@ -76,7 +76,7 @@ protected:
 };
 
 class DOMRect final : public DOMRectReadOnly
-                        , public nsIDOMClientRect
+                    , public nsIDOMClientRect
 {
 public:
   explicit DOMRect(nsISupports* aParent, double aX = 0, double aY = 0,
@@ -147,7 +147,7 @@ private:
 };
 
 class DOMRectList final : public nsIDOMClientRectList,
-                              public nsWrapperCache
+                          public nsWrapperCache
 {
   ~DOMRectList() {}
 

dom/base/Element.h

@@ -1509,45 +1509,44 @@ _elementName::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const
 
 #define NS_FORWARD_NSIDOMELEMENT_TO_GENERIC                                   \
 typedef mozilla::dom::Element Element;                                        \
-NS_IMETHOD GetTagName(nsAString& aTagName) final override             \
+NS_IMETHOD GetTagName(nsAString& aTagName) final override                     \
 {                                                                             \
   Element::GetTagName(aTagName);                                              \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetId(nsAString& aId) final override                       \
+NS_IMETHOD GetId(nsAString& aId) final override                               \
 {                                                                             \
   Element::GetId(aId);                                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetId(const nsAString& aId) final override                 \
+NS_IMETHOD SetId(const nsAString& aId) final override                         \
 {                                                                             \
   Element::SetId(aId);                                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClassName(nsAString& aClassName) final override         \
+NS_IMETHOD GetClassName(nsAString& aClassName) final override                 \
 {                                                                             \
   Element::GetClassName(aClassName);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetClassName(const nsAString& aClassName) final override   \
+NS_IMETHOD SetClassName(const nsAString& aClassName) final override           \
 {                                                                             \
   Element::SetClassName(aClassName);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClassList(nsISupports** aClassList) final override      \
+NS_IMETHOD GetClassList(nsISupports** aClassList) final override              \
 {                                                                             \
   Element::GetClassList(aClassList);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final       \
-  override                                                                \
+NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final override  \
 {                                                                             \
   NS_ADDREF(*aAttributes = Attributes());                                     \
   return NS_OK;                                                               \
 }                                                                             \
 using Element::GetAttribute;                                                  \
-NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final  \
-  override                                                                \
+NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final      \
+  override                                                                    \
 {                                                                             \
   nsString attr;                                                              \
   GetAttribute(name, attr);                                                   \
@@ -1556,13 +1555,13 @@ NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final  \
 }                                                                             \
 NS_IMETHOD GetAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& localName,                         \
-                          nsAString& _retval) final override          \
+                          nsAString& _retval) final override                  \
 {                                                                             \
   Element::GetAttributeNS(namespaceURI, localName, _retval);                  \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttribute(const nsAString& name,                                \
-                        const nsAString& value) override                  \
+                        const nsAString& value) override                      \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::SetAttribute(name, value, rv);                                     \
@@ -1570,22 +1569,21 @@ NS_IMETHOD SetAttribute(const nsAString& name,                                \
 }                                                                             \
 NS_IMETHOD SetAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& qualifiedName,                     \
-                          const nsAString& value) final override      \
+                          const nsAString& value) final override              \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::SetAttributeNS(namespaceURI, qualifiedName, value, rv);            \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 using Element::RemoveAttribute;                                               \
-NS_IMETHOD RemoveAttribute(const nsAString& name) final override      \
+NS_IMETHOD RemoveAttribute(const nsAString& name) final override              \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   RemoveAttribute(name, rv);                                                  \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI,                   \
-                             const nsAString& localName) final            \
-  override                                                                \
+                             const nsAString& localName) final override       \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::RemoveAttributeNS(namespaceURI, localName, rv);                    \
@@ -1593,31 +1591,31 @@ NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI,                   \
 }                                                                             \
 using Element::HasAttribute;                                                  \
 NS_IMETHOD HasAttribute(const nsAString& name,                                \
-                           bool* _retval) final override              \
+                           bool* _retval) final override                      \
 {                                                                             \
   *_retval = HasAttribute(name);                                              \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& localName,                         \
-                          bool* _retval) final override               \
+                          bool* _retval) final override                       \
 {                                                                             \
   *_retval = Element::HasAttributeNS(namespaceURI, localName);                \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD HasAttributes(bool* _retval) final override                \
+NS_IMETHOD HasAttributes(bool* _retval) final override                        \
 {                                                                             \
   *_retval = Element::HasAttributes();                                        \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD GetAttributeNode(const nsAString& name,                            \
-                            nsIDOMAttr** _retval) final override      \
+                            nsIDOMAttr** _retval) final override              \
 {                                                                             \
   NS_IF_ADDREF(*_retval = Element::GetAttributeNode(name));                   \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr,                              \
-                            nsIDOMAttr** _retval) final override      \
+                            nsIDOMAttr** _retval) final override              \
 {                                                                             \
   if (!newAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
@@ -1628,7 +1626,7 @@ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr,                              \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr,                           \
-                               nsIDOMAttr** _retval) final override   \
+                               nsIDOMAttr** _retval) final override           \
 {                                                                             \
   if (!oldAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
@@ -1640,14 +1638,14 @@ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr,                           \
 }                                                                             \
 NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI,                  \
                               const nsAString& localName,                     \
-                              nsIDOMAttr** _retval) final override    \
+                              nsIDOMAttr** _retval) final override            \
 {                                                                             \
   NS_IF_ADDREF(*_retval = Element::GetAttributeNodeNS(namespaceURI,           \
                                                       localName));            \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr,                            \
-                              nsIDOMAttr** _retval) final override    \
+                              nsIDOMAttr** _retval) final override            \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr);       \
@@ -1655,34 +1653,33 @@ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr,                            \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD GetElementsByTagName(const nsAString& name,                        \
-                                nsIDOMHTMLCollection** _retval) final     \
-                                                                override  \
+                                nsIDOMHTMLCollection** _retval) final         \
+                                                                override      \
 {                                                                             \
   Element::GetElementsByTagName(name, _retval);                               \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD GetElementsByTagNameNS(const nsAString& namespaceURI,              \
                                   const nsAString& localName,                 \
-                                  nsIDOMHTMLCollection** _retval) final   \
-                                                                  override\
+                                  nsIDOMHTMLCollection** _retval) final       \
+                                                                  override    \
 {                                                                             \
   return Element::GetElementsByTagNameNS(namespaceURI, localName,             \
                                          _retval);                            \
 }                                                                             \
 NS_IMETHOD GetElementsByClassName(const nsAString& classes,                   \
-                                  nsIDOMHTMLCollection** _retval) final   \
-                                                                  override\
+                                  nsIDOMHTMLCollection** _retval) final       \
+                                                                  override    \
 {                                                                             \
   return Element::GetElementsByClassName(classes, _retval);                   \
 }                                                                             \
-NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final        \
-  override                                                                \
+NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final override   \
 {                                                                             \
   nsIHTMLCollection* list = FragmentOrElement::Children();                    \
   return CallQueryInterface(list, aChildElements);                            \
 }                                                                             \
-NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
-  override                                                                \
+NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final     \
+  override                                                                    \
 {                                                                             \
   Element* element = Element::GetFirstElementChild();                         \
   if (!element) {                                                             \
@@ -1691,8 +1688,8 @@ NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
   }                                                                           \
   return CallQueryInterface(element, aFirstElementChild);                     \
 }                                                                             \
-NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final   \
-  override                                                                \
+NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final       \
+  override                                                                    \
 {                                                                             \
   Element* element = Element::GetLastElementChild();                          \
   if (!element) {                                                             \
@@ -1702,7 +1699,7 @@ NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final   \
   return CallQueryInterface(element, aLastElementChild);                      \
 }                                                                             \
 NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
-  final override                                                      \
+  final override                                                              \
 {                                                                             \
   Element* element = Element::GetPreviousElementSibling();                    \
   if (!element) {                                                             \
@@ -1712,7 +1709,7 @@ NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
   return CallQueryInterface(element, aPreviousElementSibling);                \
 }                                                                             \
 NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling)         \
-  final override                                                      \
+  final override                                                              \
 {                                                                             \
   Element* element = Element::GetNextElementSibling();                        \
   if (!element) {                                                             \
@@ -1721,126 +1718,123 @@ NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling)         \
   }                                                                           \
   return CallQueryInterface(element, aNextElementSibling);                    \
 }                                                                             \
-NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final       \
-  override                                                                \
+NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final override  \
 {                                                                             \
   *aChildElementCount = Element::ChildElementCount();                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD MozRemove() final override                                 \
+NS_IMETHOD MozRemove() final override                                         \
 {                                                                             \
   nsINode::Remove();                                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final           \
-  override                                                                \
+NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final override      \
 {                                                                             \
   *_retval = Element::GetClientRects().take();                                \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final        \
-  override                                                                \
+NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final override   \
 {                                                                             \
   *_retval = Element::GetBoundingClientRect().take();                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override           \
+NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override                   \
 {                                                                             \
   *aScrollTop = Element::ScrollTop();                                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override            \
+NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override                    \
 {                                                                             \
   Element::SetScrollTop(aScrollTop);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override         \
+NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override                 \
 {                                                                             \
   *aScrollLeft = Element::ScrollLeft();                                       \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override          \
+NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override                  \
 {                                                                             \
   Element::SetScrollLeft(aScrollLeft);                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override       \
+NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override               \
 {                                                                             \
   *aScrollWidth = Element::ScrollWidth();                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override     \
+NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override             \
 {                                                                             \
   *aScrollHeight = Element::ScrollHeight();                                   \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientTop(int32_t* aClientTop) final override           \
+NS_IMETHOD GetClientTop(int32_t* aClientTop) final override                   \
 {                                                                             \
   *aClientTop = Element::ClientTop();                                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override         \
+NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override                 \
 {                                                                             \
   *aClientLeft = Element::ClientLeft();                                       \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override       \
+NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override               \
 {                                                                             \
   *aClientWidth = Element::ClientWidth();                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override     \
+NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override             \
 {                                                                             \
   *aClientHeight = Element::ClientHeight();                                   \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override   \
+NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override           \
 {                                                                             \
   *aScrollLeftMax = Element::ScrollLeftMax();                                 \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override     \
+NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override             \
 {                                                                             \
   *aScrollTopMax = Element::ScrollTopMax();                                   \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD MozMatchesSelector(const nsAString& selector,                      \
-                              bool* _retval) final override           \
+                              bool* _retval) final override                   \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   *_retval = Element::MozMatchesSelector(selector, rv);                       \
   return rv.ErrorCode();                                                      \
 }                                                                             \
-NS_IMETHOD SetCapture(bool retargetToElement) final override          \
+NS_IMETHOD SetCapture(bool retargetToElement) final override                  \
 {                                                                             \
   Element::SetCapture(retargetToElement);                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD ReleaseCapture(void) final override                        \
+NS_IMETHOD ReleaseCapture(void) final override                                \
 {                                                                             \
   Element::ReleaseCapture();                                                  \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD MozRequestFullScreen(void) final override                  \
+NS_IMETHOD MozRequestFullScreen(void) final override                          \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::MozRequestFullScreen(nullptr, JS::UndefinedHandleValue, rv);       \
   return rv.ErrorCode();                                                      \
 }                                                                             \
-NS_IMETHOD MozRequestPointerLock(void) final override                 \
+NS_IMETHOD MozRequestPointerLock(void) final override                         \
 {                                                                             \
   Element::MozRequestPointerLock();                                           \
   return NS_OK;                                                               \
 }                                                                             \
 using nsINode::QuerySelector;                                                 \
 NS_IMETHOD QuerySelector(const nsAString& aSelector,                          \
-                         nsIDOMElement **aReturn) final override      \
+                         nsIDOMElement **aReturn) final override              \
 {                                                                             \
   return nsINode::QuerySelector(aSelector, aReturn);                          \
 }                                                                             \
 using nsINode::QuerySelectorAll;                                              \
 NS_IMETHOD QuerySelectorAll(const nsAString& aSelector,                       \
-                            nsIDOMNodeList **aReturn) final override  \
+                            nsIDOMNodeList **aReturn) final override          \
 {                                                                             \
   return nsINode::QuerySelectorAll(aSelector, aReturn);                       \
 }

dom/base/EventSource.h

@@ -37,11 +37,11 @@ class AsyncVerifyRedirectCallbackFwr;
 struct EventSourceInit;
 
 class EventSource final : public DOMEventTargetHelper
-                            , public nsIObserver
-                            , public nsIStreamListener
-                            , public nsIChannelEventSink
-                            , public nsIInterfaceRequestor
-                            , public nsSupportsWeakReference
+                        , public nsIObserver
+                        , public nsIStreamListener
+                        , public nsIChannelEventSink
+                        , public nsIInterfaceRequestor
+                        , public nsSupportsWeakReference
 {
 friend class AsyncVerifyRedirectCallbackFwr;
 

dom/base/File.cpp

@@ -52,8 +52,8 @@ namespace dom {
 // from NS_NewByteInputStream is held alive as long as the
 // stream is.  We do that by passing back this class instead.
 class DataOwnerAdapter final : public nsIInputStream,
-                                   public nsISeekableStream,
-                                   public nsIIPCSerializableInputStream
+                               public nsISeekableStream,
+                               public nsIIPCSerializableInputStream
 {
   typedef FileImplMemory::DataOwner DataOwner;
 public:

dom/base/File.h

@@ -52,10 +52,10 @@ class FileImpl;
 class OwningArrayBufferOrArrayBufferViewOrBlobOrString;
 
 class File final : public nsIDOMFile
-                     , public nsIXHRSendable
-                     , public nsIMutable
-                     , public nsSupportsWeakReference
-                     , public nsWrapperCache
+                 , public nsIXHRSendable
+                 , public nsIMutable
+                 , public nsSupportsWeakReference
+                 , public nsWrapperCache
 {
 public:
   NS_DECL_NSIDOMBLOB
@@ -524,7 +524,8 @@ public:
     return true;
   }
 
-  class DataOwner final : public mozilla::LinkedListElement<DataOwner> {
+  class DataOwner final : public mozilla::LinkedListElement<DataOwner>
+  {
   public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DataOwner)
     DataOwner(void* aMemoryBuffer, uint64_t aLength)
@@ -814,7 +815,7 @@ private:
 };
 
 class FileList final : public nsIDOMFileList,
-                           public nsWrapperCache
+                       public nsWrapperCache
 {
   ~FileList() {}
 

dom/base/ImportManager.h

@@ -62,7 +62,7 @@ class ImportManager;
 typedef nsTHashtable<nsPtrHashKey<nsINode>> NodeTable;
 
 class ImportLoader final : public nsIStreamListener
-                             , public nsIDOMEventListener
+                         , public nsIDOMEventListener
 {
 
   // A helper inner class to decouple the logic of updating the import graph

dom/base/MessageChannel.h

@@ -22,7 +22,7 @@ namespace dom {
 class MessagePort;
 
 class MessageChannel final : public nsISupports
-                               , public nsWrapperCache
+                           , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/base/MessagePortList.h

@@ -19,7 +19,7 @@ namespace mozilla {
 namespace dom {
 
 class MessagePortList final : public nsISupports
-                                , public nsWrapperCache
+                            , public nsWrapperCache
 {
   ~MessagePortList() {}
 

dom/base/Navigator.h

@@ -106,8 +106,8 @@ class AudioChannelManager;
 } // namespace system
 
 class Navigator final : public nsIDOMNavigator
-                          , public nsIMozNavigatorNetwork
-                          , public nsWrapperCache
+                      , public nsIMozNavigatorNetwork
+                      , public nsWrapperCache
 {
 public:
   explicit Navigator(nsPIDOMWindow* aInnerWindow);

dom/base/NodeIterator.h

@@ -23,8 +23,8 @@ namespace mozilla {
 namespace dom {
 
 class NodeIterator final : public nsIDOMNodeIterator,
-                               public nsTraversal,
-                               public nsStubMutationObserver
+                           public nsTraversal,
+                           public nsStubMutationObserver
 {
 public:
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/base/ShadowRoot.h

@@ -134,7 +134,7 @@ public:
     mIsComposedDocParticipant = aIsComposedDocParticipant;
   }
 
-  virtual void DestroyContent() MOZ_OVERRIDE;
+  virtual void DestroyContent() override;
 protected:
   virtual ~ShadowRoot();
 

dom/base/SubtleCrypto.h

@@ -22,7 +22,7 @@ class Promise;
 typedef ArrayBufferViewOrArrayBuffer CryptoOperationData;
 
 class SubtleCrypto final : public nsISupports,
-                               public nsWrapperCache
+                           public nsWrapperCache
 {
   ~SubtleCrypto() {}
 

dom/base/TextInputProcessor.h

@@ -21,7 +21,7 @@ class TextEventDispatcher;
 } // namespace widget
 
 class TextInputProcessor final : public nsITextInputProcessor
-                                   , public widget::TextEventDispatcherListener
+                               , public widget::TextEventDispatcherListener
 {
   typedef mozilla::widget::IMENotification IMENotification;
   typedef mozilla::widget::TextEventDispatcher TextEventDispatcher;

dom/base/URLSearchParams.h

@@ -27,7 +27,7 @@ public:
 };
 
 class URLSearchParams final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
   ~URLSearchParams();
 

dom/base/WebSocket.cpp

@@ -63,11 +63,11 @@ namespace mozilla {
 namespace dom {
 
 class WebSocketImpl final : public nsIInterfaceRequestor
-                              , public nsIWebSocketListener
-                              , public nsIObserver
-                              , public nsSupportsWeakReference
-                              , public nsIRequest
-                              , public nsIEventTarget
+                          , public nsIWebSocketListener
+                          , public nsIObserver
+                          , public nsSupportsWeakReference
+                          , public nsIRequest
+                          , public nsIEventTarget
 {
 public:
   NS_DECL_NSIINTERFACEREQUESTOR

dom/base/WindowNamedPropertiesHandler.h

@@ -24,33 +24,33 @@ public:
                        JS::Handle<jsid> aId,
                        bool /* unused */,
                        JS::MutableHandle<JSPropertyDescriptor> aDesc)
-                       const MOZ_OVERRIDE;
+                       const override;
   virtual bool
   defineProperty(JSContext* aCx, JS::Handle<JSObject*> aProxy,
                  JS::Handle<jsid> aId,
                  JS::MutableHandle<JSPropertyDescriptor> aDesc,
-                 JS::ObjectOpResult &result) const MOZ_OVERRIDE;
+                 JS::ObjectOpResult &result) const override;
   virtual bool
   ownPropNames(JSContext* aCx, JS::Handle<JSObject*> aProxy, unsigned flags,
-               JS::AutoIdVector& aProps) const MOZ_OVERRIDE;
+               JS::AutoIdVector& aProps) const override;
   virtual bool
   delete_(JSContext* aCx, JS::Handle<JSObject*> aProxy, JS::Handle<jsid> aId,
-          JS::ObjectOpResult &aResult) const MOZ_OVERRIDE;
+          JS::ObjectOpResult &aResult) const override;
   virtual bool
   preventExtensions(JSContext* aCx, JS::Handle<JSObject*> aProxy,
-                    JS::ObjectOpResult& aResult) const MOZ_OVERRIDE
+                    JS::ObjectOpResult& aResult) const override
   {
     return aResult.failCantPreventExtensions();
   }
   virtual bool
   isExtensible(JSContext* aCx, JS::Handle<JSObject*> aProxy,
-               bool* aIsExtensible) const MOZ_OVERRIDE
+               bool* aIsExtensible) const override
   {
     *aIsExtensible = true;
     return true;
   }
   virtual const char*
-  className(JSContext *aCx, JS::Handle<JSObject*> aProxy) const MOZ_OVERRIDE
+  className(JSContext *aCx, JS::Handle<JSObject*> aProxy) const override
   {
     return "WindowProperties";
   }

dom/base/nsContentPermissionHelper.h

@@ -107,7 +107,7 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest
  * RemotePermissionRequest will send a prompt ipdl request to b2g process.
  */
 class RemotePermissionRequest final : public nsISupports
-                                        , public mozilla::dom::PContentPermissionRequestChild
+                                    , public mozilla::dom::PContentPermissionRequestChild
 {
 public:
   NS_DECL_ISUPPORTS

dom/base/nsContentUtils.cpp

@@ -401,7 +401,7 @@ EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 }
 
 class SameOriginCheckerImpl final : public nsIChannelEventSink,
-                                        public nsIInterfaceRequestor
+                                    public nsIInterfaceRequestor
 {
   ~SameOriginCheckerImpl() {}
 

dom/base/nsDOMMutationObserver.h

@@ -29,7 +29,7 @@ class nsDOMMutationObserver;
 using mozilla::dom::MutationObservingInfo;
 
 class nsDOMMutationRecord final : public nsISupports,
-                                      public nsWrapperCache
+                                  public nsWrapperCache
 {
   virtual ~nsDOMMutationRecord() {}
 
@@ -338,7 +338,7 @@ public:
   { 0x9e, 0xab, 0x07, 0x47, 0xa9, 0xe4, 0x65, 0xb4 } }
 
 class nsDOMMutationObserver final : public nsISupports,
-                                        public nsWrapperCache
+                                    public nsWrapperCache
 {
 public:
   nsDOMMutationObserver(already_AddRefed<nsPIDOMWindow>&& aOwner,

dom/base/nsDOMScriptObjectFactory.h

@@ -23,7 +23,7 @@
 #include "mozilla/Attributes.h"
 
 class nsDOMScriptObjectFactory final : public nsIDOMScriptObjectFactory,
-                                           public nsIObserver
+                                       public nsIObserver
 {
   ~nsDOMScriptObjectFactory() {}
 

dom/base/nsDOMSerializer.h

@@ -15,7 +15,7 @@
 class nsINode;
 
 class nsDOMSerializer final : public nsIDOMSerializer,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   nsDOMSerializer();

dom/base/nsDOMWindowUtils.h

@@ -55,7 +55,7 @@ private:
 };
 
 class nsDOMWindowUtils final : public nsIDOMWindowUtils,
-                                   public nsSupportsWeakReference
+                               public nsSupportsWeakReference
 {
   typedef mozilla::widget::TextEventDispatcher
     TextEventDispatcher;

dom/base/nsDocument.h

@@ -596,8 +596,8 @@ protected:
     
     // XXXbz I wish we could just derive the _allcaps thing from _i
 #define DECL_SHIM(_i, _allcaps)                                              \
-    class _i##Shim final : public nsIInterfaceRequestor,                 \
-                               public _i                                     \
+    class _i##Shim final : public nsIInterfaceRequestor,                     \
+                           public _i                                         \
     {                                                                        \
       ~_i##Shim() {}                                                         \
     public:                                                                  \

dom/base/nsFocusManager.h

@@ -32,8 +32,8 @@ struct nsDelayedBlurOrFocusEvent;
  */
 
 class nsFocusManager final : public nsIFocusManager,
-                                 public nsIObserver,
-                                 public nsSupportsWeakReference
+                             public nsIObserver,
+                             public nsSupportsWeakReference
 {
   typedef mozilla::widget::InputContextAction InputContextAction;
 

dom/base/nsFormData.h

@@ -26,9 +26,9 @@ class GlobalObject;
 } // namespace mozilla
 
 class nsFormData final : public nsIDOMFormData,
-                             public nsIXHRSendable,
-                             public nsFormSubmission,
-                             public nsWrapperCache
+                         public nsIXHRSendable,
+                         public nsFormSubmission,
+                         public nsWrapperCache
 {
 private:
   ~nsFormData() {}

dom/base/nsFrameLoader.h

@@ -56,8 +56,8 @@ class QX11EmbedContainer;
 #endif
 
 class nsFrameLoader final : public nsIFrameLoader,
-                                public nsStubMutationObserver,
-                                public mozilla::dom::ipc::MessageManagerCallback
+                            public nsStubMutationObserver,
+                            public mozilla::dom::ipc::MessageManagerCallback
 {
   friend class AutoResetInShow;
   typedef mozilla::dom::PBrowserParent PBrowserParent;

dom/base/nsFrameMessageManager.h

@@ -152,10 +152,10 @@ private:
 };
 
 class nsFrameMessageManager final : public nsIContentFrameMessageManager,
-                                        public nsIMessageBroadcaster,
-                                        public nsIFrameScriptLoader,
-                                        public nsIProcessScriptLoader,
-                                        public nsIProcessChecker
+                                    public nsIMessageBroadcaster,
+                                    public nsIFrameScriptLoader,
+                                    public nsIProcessScriptLoader,
+                                    public nsIProcessChecker
 {
   friend class mozilla::dom::MessageManagerReporter;
   typedef mozilla::dom::StructuredCloneData StructuredCloneData;

dom/base/nsGenConImageContent.cpp

@@ -21,7 +21,7 @@
 using namespace mozilla;
 
 class nsGenConImageContent final : public nsXMLElement,
-                                       public nsImageLoadingContent
+                                   public nsImageLoadingContent
 {
 public:
   explicit nsGenConImageContent(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)

dom/base/nsGlobalWindow.cpp

@@ -479,7 +479,7 @@ static const char sPopStatePrefStr[] = "browser.history.allowPopState";
  * on nsGlobalWindow, where any script could see it.
  */
 class nsGlobalWindowObserver final : public nsIObserver,
-                                         public nsIInterfaceRequestor
+                                     public nsIInterfaceRequestor
 {
 public:
   explicit nsGlobalWindowObserver(nsGlobalWindow* aWindow) : mWindow(aWindow) {}
@@ -609,7 +609,7 @@ class nsOuterWindowProxy : public js::Wrapper
 public:
   MOZ_CONSTEXPR nsOuterWindowProxy() : js::Wrapper(0) { }
 
-  virtual bool finalizeInBackground(JS::Value priv) const MOZ_OVERRIDE {
+  virtual bool finalizeInBackground(JS::Value priv) const override {
     return false;
   }
 
@@ -618,63 +618,63 @@ public:
                                         JS::Handle<JSObject*> proxy,
                                         JS::Handle<jsid> id,
                                         JS::MutableHandle<JSPropertyDescriptor> desc)
-                                        const MOZ_OVERRIDE;
+                                        const override;
   virtual bool defineProperty(JSContext* cx,
                               JS::Handle<JSObject*> proxy,
                               JS::Handle<jsid> id,
                               JS::MutableHandle<JSPropertyDescriptor> desc,
-                              JS::ObjectOpResult &result) const MOZ_OVERRIDE;
+                              JS::ObjectOpResult &result) const override;
   virtual bool ownPropertyKeys(JSContext *cx,
                                JS::Handle<JSObject*> proxy,
-                               JS::AutoIdVector &props) const MOZ_OVERRIDE;
+                               JS::AutoIdVector &props) const override;
   virtual bool delete_(JSContext *cx, JS::Handle<JSObject*> proxy,
                        JS::Handle<jsid> id,
-                       JS::ObjectOpResult &aResult) const MOZ_OVERRIDE;
+                       JS::ObjectOpResult &aResult) const override;
   virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                         JS::MutableHandle<JSObject*> vp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> vp) const override;
   virtual bool preventExtensions(JSContext* cx,
                                  JS::Handle<JSObject*> proxy,
-                                 JS::ObjectOpResult& result) const MOZ_OVERRIDE;
+                                 JS::ObjectOpResult& result) const override;
   virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible)
-                            const MOZ_OVERRIDE;
+                            const override;
   virtual bool has(JSContext *cx, JS::Handle<JSObject*> proxy,
-                   JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
+                   JS::Handle<jsid> id, bool *bp) const override;
   virtual bool get(JSContext *cx, JS::Handle<JSObject*> proxy,
                    JS::Handle<JSObject*> receiver,
                    JS::Handle<jsid> id,
-                   JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                   JS::MutableHandle<JS::Value> vp) const override;
   virtual bool set(JSContext *cx, JS::Handle<JSObject*> proxy,
                    JS::Handle<JSObject*> receiver,
                    JS::Handle<jsid> id,
                    JS::MutableHandle<JS::Value> vp,
-                   JS::ObjectOpResult &result) const MOZ_OVERRIDE;
+                   JS::ObjectOpResult &result) const override;
 
   // SpiderMonkey extensions
   virtual bool getPropertyDescriptor(JSContext* cx,
                                      JS::Handle<JSObject*> proxy,
                                      JS::Handle<jsid> id,
                                      JS::MutableHandle<JSPropertyDescriptor> desc)
-                                     const MOZ_OVERRIDE;
+                                     const override;
   virtual bool hasOwn(JSContext *cx, JS::Handle<JSObject*> proxy,
-                      JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
+                      JS::Handle<jsid> id, bool *bp) const override;
   virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> proxy,
-                                            JS::AutoIdVector &props) const MOZ_OVERRIDE;
+                                            JS::AutoIdVector &props) const override;
   virtual const char *className(JSContext *cx,
-                                JS::Handle<JSObject*> wrapper) const MOZ_OVERRIDE;
+                                JS::Handle<JSObject*> wrapper) const override;
 
-  virtual void finalize(JSFreeOp *fop, JSObject *proxy) const MOZ_OVERRIDE;
+  virtual void finalize(JSFreeOp *fop, JSObject *proxy) const override;
 
-  virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE {
+  virtual bool isCallable(JSObject *obj) const override {
     return false;
   }
-  virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE {
+  virtual bool isConstructor(JSObject *obj) const override {
     return false;
   }
 
   virtual bool watch(JSContext *cx, JS::Handle<JSObject*> proxy,
-                     JS::Handle<jsid> id, JS::Handle<JSObject*> callable) const MOZ_OVERRIDE;
+                     JS::Handle<jsid> id, JS::Handle<JSObject*> callable) const override;
   virtual bool unwatch(JSContext *cx, JS::Handle<JSObject*> proxy,
-                       JS::Handle<jsid> id) const MOZ_OVERRIDE;
+                       JS::Handle<jsid> id) const override;
 
   static void ObjectMoved(JSObject *obj, const JSObject *old);
 
@@ -1035,7 +1035,7 @@ class nsChromeOuterWindowProxy : public nsOuterWindowProxy
 public:
   MOZ_CONSTEXPR nsChromeOuterWindowProxy() : nsOuterWindowProxy() { }
 
-  virtual const char *className(JSContext *cx, JS::Handle<JSObject*> wrapper) const MOZ_OVERRIDE;
+  virtual const char *className(JSContext *cx, JS::Handle<JSObject*> wrapper) const override;
 
   static const nsChromeOuterWindowProxy singleton;
 };
@@ -8880,7 +8880,7 @@ nsGlobalWindow::NotifyDOMWindowDestroyed(nsGlobalWindow* aWindow) {
 // with principals that are either the system principal or an expanded principal.
 // This may not return true for all non-web-content compartments.
 struct BrowserCompartmentMatcher : public js::CompartmentFilter {
-  virtual bool match(JSCompartment* c) const MOZ_OVERRIDE
+  virtual bool match(JSCompartment* c) const override
   {
     nsCOMPtr<nsIPrincipal> pc = nsJSPrincipals::get(JS_GetCompartmentPrincipals(c));
     return nsContentUtils::IsSystemOrExpandedPrincipal(pc);
@@ -8898,7 +8898,7 @@ class MultiCompartmentMatcher : public js::CompartmentFilter {
   }
   
 public: 
-  virtual bool match(JSCompartment* c) const MOZ_OVERRIDE
+  virtual bool match(JSCompartment* c) const override
   {
     return compartments.has(c);
   }

dom/base/nsLocation.h

@@ -26,8 +26,8 @@ class nsIDocShellLoadInfo;
 //*****************************************************************************
 
 class nsLocation final : public nsIDOMLocation
-                           , public nsWrapperCache
-                           , public mozilla::dom::URLSearchParamsObserver
+                       , public nsWrapperCache
+                       , public mozilla::dom::URLSearchParamsObserver
 {
   typedef mozilla::ErrorResult ErrorResult;
 

dom/base/nsMimeTypeArray.h

@@ -17,7 +17,7 @@ class nsMimeType;
 class nsPluginElement;
 
 class nsMimeTypeArray final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   explicit nsMimeTypeArray(nsPIDOMWindow* aWindow);

dom/base/nsObjectLoadingContent.cpp

@@ -377,10 +377,10 @@ public:
   }
 
   // nsRunnable
-  NS_IMETHOD Run() MOZ_OVERRIDE;
+  NS_IMETHOD Run() override;
 
   // nsITimerCallback
-  NS_IMETHOD Notify(nsITimer* timer) MOZ_OVERRIDE;
+  NS_IMETHOD Notify(nsITimer* timer) override;
 
 protected:
   virtual ~nsStopPluginRunnable() {}
@@ -1292,8 +1292,8 @@ nsObjectLoadingContent::GetBaseURI(nsIURI **aResult)
 // see an interface requestor even though WebIDL bindings don't expose
 // that stuff.
 class ObjectInterfaceRequestorShim final : public nsIInterfaceRequestor,
-                                               public nsIChannelEventSink,
-                                               public nsIStreamListener
+                                           public nsIChannelEventSink,
+                                           public nsIStreamListener
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/base/nsPluginArray.h

@@ -18,8 +18,8 @@ class nsPluginElement;
 class nsMimeType;
 
 class nsPluginArray final : public nsIObserver,
-                                public nsSupportsWeakReference,
-                                public nsWrapperCache
+                            public nsSupportsWeakReference,
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -76,7 +76,7 @@ private:
 };
 
 class nsPluginElement final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/base/nsRange.h

@@ -32,8 +32,8 @@ class Selection;
 }
 
 class nsRange final : public nsIDOMRange,
-                          public nsStubMutationObserver,
-                          public nsWrapperCache
+                      public nsStubMutationObserver,
+                      public nsWrapperCache
 {
   typedef mozilla::ErrorResult ErrorResult;
   typedef mozilla::dom::DOMRect DOMRect;

dom/base/nsTextNode.cpp

@@ -28,7 +28,7 @@ using namespace mozilla::dom;
  * class used to implement attr() generated content
  */
 class nsAttributeTextNode final : public nsTextNode,
-                                      public nsStubMutationObserver
+                                  public nsStubMutationObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED

dom/base/nsWindowMemoryReporter.h

@@ -140,8 +140,8 @@ public:
  *
  */
 class nsWindowMemoryReporter final : public nsIMemoryReporter,
-                                         public nsIObserver,
-                                         public nsSupportsWeakReference
+                                     public nsIObserver,
+                                     public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS

dom/base/nsXMLHttpRequest.cpp

@@ -2053,11 +2053,15 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
           }
           nsCOMPtr<nsIFile> jarFile;
           jarChannel->GetJarFile(getter_AddRefs(jarFile));
-          rv = mArrayBufferBuilder.mapToFileInPackage(file, jarFile);
-          if (NS_WARN_IF(NS_FAILED(rv))) {
+          if (!jarFile) {
             mIsMappedArrayBuffer = false;
           } else {
-            channel->SetContentType(NS_LITERAL_CSTRING("application/mem-mapped"));
+            rv = mArrayBufferBuilder.mapToFileInPackage(file, jarFile);
+            if (NS_WARN_IF(NS_FAILED(rv))) {
+              mIsMappedArrayBuffer = false;
+            } else {
+              channel->SetContentType(NS_LITERAL_CSTRING("application/mem-mapped"));
+            }
           }
         }
       }

dom/base/nsXMLHttpRequest.h

@@ -147,7 +147,7 @@ public:
 };
 
 class nsXMLHttpRequestUpload final : public nsXHREventTarget,
-                                         public nsIXMLHttpRequestUpload
+                                     public nsIXMLHttpRequestUpload
 {
 public:
   explicit nsXMLHttpRequestUpload(mozilla::DOMEventTargetHelper* aOwner)
@@ -180,15 +180,15 @@ class nsXMLHttpRequestXPCOMifier;
 // Make sure that any non-DOM interfaces added here are also added to
 // nsXMLHttpRequestXPCOMifier.
 class nsXMLHttpRequest final : public nsXHREventTarget,
-                                   public nsIXMLHttpRequest,
-                                   public nsIJSXMLHttpRequest,
-                                   public nsIStreamListener,
-                                   public nsIChannelEventSink,
-                                   public nsIProgressEventSink,
-                                   public nsIInterfaceRequestor,
-                                   public nsSupportsWeakReference,
-                                   public nsITimerCallback,
-                                   public nsISizeOfEventTarget
+                               public nsIXMLHttpRequest,
+                               public nsIJSXMLHttpRequest,
+                               public nsIStreamListener,
+                               public nsIChannelEventSink,
+                               public nsIProgressEventSink,
+                               public nsIInterfaceRequestor,
+                               public nsSupportsWeakReference,
+                               public nsITimerCallback,
+                               public nsISizeOfEventTarget
 {
   friend class nsXHRParseEndListener;
   friend class nsXMLHttpRequestXPCOMifier;
@@ -635,7 +635,8 @@ protected:
   nsCOMPtr<nsIStreamListener> mXMLParserStreamListener;
 
   // used to implement getAllResponseHeaders()
-  class nsHeaderVisitor : public nsIHttpHeaderVisitor {
+  class nsHeaderVisitor : public nsIHttpHeaderVisitor
+  {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIHTTPHEADERVISITOR
@@ -824,10 +825,10 @@ private:
 // A shim class designed to expose the non-DOM interfaces of
 // XMLHttpRequest via XPCOM stuff.
 class nsXMLHttpRequestXPCOMifier final : public nsIStreamListener,
-                                             public nsIChannelEventSink,
-                                             public nsIProgressEventSink,
-                                             public nsIInterfaceRequestor,
-                                             public nsITimerCallback
+                                         public nsIChannelEventSink,
+                                         public nsIProgressEventSink,
+                                         public nsIInterfaceRequestor,
+                                         public nsITimerCallback
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpRequestXPCOMifier,

dom/base/test/chrome.ini

@@ -2,6 +2,9 @@
 support-files =
   file_url.jsm
   file_empty.html
+  file_bug945152.jar
+  file_bug945152_worker.js
+  file_bug1008126_worker.js
 
 [test_anonymousContent_xul_window.xul]
 [test_bug715041.xul]
@@ -18,3 +21,7 @@ support-files =
 [test_messagemanager_principal.html]
 [test_messagemanager_send_principal.html]
 skip-if = buildapp == 'mulet'
+[test_bug945152.html]
+run-if = os == 'linux'
+[test_bug1008126.html]
+run-if = os == 'linux'

dom/base/test/file_bug1008126_worker.js

@@ -3,9 +3,9 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-var gJar1 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt";
-var gJar2 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_2.txt";
-var gJar3 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_big.txt";
+var gEntry1 = "data_1.txt";
+var gEntry2 = "data_2.txt";
+var gEntry3 = "data_big.txt";
 var gPaddingChar = ".";
 var gPaddingSize = 10000;
 var gPadding = "";
@@ -37,6 +37,11 @@ function checkData(xhr, data, mapped, cb) {
 }
 
 self.onmessage = function onmessage(event) {
+  var jar = event.data;
+
+  function makeJarURL(entry) {
+    return "jar:" + jar + "!/" + entry;
+  }
 
   var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
 
@@ -71,7 +76,7 @@ self.onmessage = function onmessage(event) {
       }
     };
     xhr.onload = runTests;
-    xhr.open("GET", gJar3, true);
+    xhr.open("GET", makeJarURL(gEntry3), true);
     xhr.responseType = "moz-chunked-arraybuffer";
     xhr.send();
   }
@@ -104,7 +109,7 @@ self.onmessage = function onmessage(event) {
       loadendCount++;
       checkData(xhr, gData2, false, function() {} );
     };
-    xhr.open("GET", gJar2, false);
+    xhr.open("GET", makeJarURL(gEntry2), false);
     xhr.responseType = "arraybuffer";
     xhr.send();
     checkEventCount(runTests);
@@ -112,7 +117,7 @@ self.onmessage = function onmessage(event) {
 
   function test_sync_xhr_data1() {
     ok(true, "Test sync XHR with data1");
-    xhr.open("GET", gJar1, false);
+    xhr.open("GET", makeJarURL(gEntry1), false);
     xhr.responseType = "arraybuffer";
     xhr.send();
     checkData(xhr, gData1, true, runTests);
@@ -120,7 +125,7 @@ self.onmessage = function onmessage(event) {
 
   function test_sync_xhr_data2() {
     ok(true, "Test sync XHR with data2");
-    xhr.open("GET", gJar2, false);
+    xhr.open("GET", makeJarURL(gEntry2), false);
     xhr.responseType = "arraybuffer";
     xhr.send();
     checkData(xhr, gData2, false, runTests);
@@ -131,7 +136,7 @@ self.onmessage = function onmessage(event) {
     xhr.onload = function() {
       checkData(xhr, gData1, true, runTests);
     };
-    xhr.open("GET", gJar1, true);
+    xhr.open("GET", makeJarURL(gEntry1), true);
     xhr.responseType = "arraybuffer";
     xhr.send();
   }
@@ -141,7 +146,7 @@ self.onmessage = function onmessage(event) {
     xhr.onload = function() {
       checkData(xhr, gData2, false, runTests);
     };
-    xhr.open("GET", gJar2, true);
+    xhr.open("GET", makeJarURL(gEntry2), true);
     xhr.responseType = "arraybuffer";
     xhr.send();
   }

dom/base/test/file_bug945152_worker.js

@@ -26,10 +26,15 @@ function checkData(response, data_head, cb) {
 }
 
 self.onmessage = function onmessage(event) {
+  var jar = event.data;
+
+  function makeJarURL(entry) {
+    return "jar:" + jar + "!/" + entry;
+  }
 
   function test_mapped_sync() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt', false);
+    xhr.open('GET', makeJarURL('data_1.txt'), false);
     xhr.responseType = 'arraybuffer';
     xhr.send();
     if (xhr.status) {
@@ -42,7 +47,7 @@ self.onmessage = function onmessage(event) {
 
   function test_mapped_async() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt');
+    xhr.open('GET', makeJarURL('data_1.txt'));
     xhr.responseType = 'arraybuffer';
     xhr.onreadystatechange = function() {
       if (xhr.readyState !== xhr.DONE) {
@@ -62,7 +67,7 @@ self.onmessage = function onmessage(event) {
   // handled by memory allocation instead of memory mapping.
   function test_non_mapped() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_2.txt');
+    xhr.open('GET', makeJarURL('data_2.txt'));
     xhr.responseType = 'arraybuffer';
     xhr.onreadystatechange = function() {
       if (xhr.readyState !== xhr.DONE) {

dom/base/test/mochitest.ini

@@ -159,8 +159,6 @@ support-files =
   file_bug902350_frame.html
   file_bug907892.html
   file_bug945152.jar
-  file_bug945152_worker.js
-  file_bug1008126_worker.js
   file_general_document.html
   file_html_in_xhr.html
   file_html_in_xhr.sjs
@@ -653,11 +651,7 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e1
 [test_bug907892.html]
 [test_bug922681.html]
 [test_bug927196.html]
-[test_bug945152.html]
-run-if = os == 'linux'
 [test_bug982153.html]
-[test_bug1008126.html]
-run-if = os == 'linux'
 [test_bug1057176.html]
 [test_bug1070015.html]
 [test_bug1101364.html]

dom/base/test/test_bug1008126.html

@@ -10,8 +10,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1008126
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1008126</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1008126">Mozilla Bug 1008126</a>
@@ -20,10 +20,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1008126
 
 </div>
 <pre id="test">
-<script type="application/javascript">
+<script type="application/javascript;version=1.7">
+function translateChrome(uriStr) {
+  const { Cc, Ci } = SpecialPowers;
+  let ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+  let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
+  let uri = ios.newURI(uriStr, null, ios.newURI(document.baseURI, null, null));
+  return chromeReg.convertChromeURL(uri).spec;
+}
 
 function runTest() {
-
   var worker = new Worker("file_bug1008126_worker.js");
 
   worker.onmessage = function(event) {
@@ -36,11 +42,11 @@ function runTest() {
 
   worker.onerror = function(event) {
     is(event.target, worker);
-    ok(false, "Worker had an error: " + event.message);
+    ok(false, "Worker had an error: " + event.filename + ":" + event.lineno + ":" + event.colno + ": " + event.message);
     SimpleTest.finish();
   };
 
-  worker.postMessage(true);
+  worker.postMessage(translateChrome("file_bug945152.jar"));
 }
 
 SimpleTest.waitForExplicitFinish();

dom/base/test/test_bug945152.html

@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=945152
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 945152</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=945152">Mozilla Bug 945152</a>
@@ -16,7 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=945152
 
 </div>
 <pre id="test">
-<script type="application/javascript">
+<script type="application/javascript;version=1.7">
+function translateChrome(uriStr) {
+  const { Cc, Ci } = SpecialPowers;
+  let ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+  let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
+  let uri = ios.newURI(uriStr, null, ios.newURI(document.baseURI, null, null));
+  return chromeReg.convertChromeURL(uri).spec;
+}
 
 function runTest() {
   var worker = new Worker("file_bug945152_worker.js");
@@ -31,11 +38,11 @@ function runTest() {
 
   worker.onerror = function(event) {
     is(event.target, worker);
-    ok(false, "Worker had an error: " + event.data);
+    ok(false, "Worker had an error: " + event.filename + ":" + event.lineno + ":" + event.colno + ": " + event.message);
     SimpleTest.finish();
   };
 
-  worker.postMessage(true);
+  worker.postMessage(translateChrome("file_bug945152.jar"));
 }
 
 SimpleTest.waitForExplicitFinish();

dom/bindings/DOMJSProxyHandler.h

@@ -54,28 +54,28 @@ public:
   // other lower-level methods.
   bool getOwnPropertyDescriptor(JSContext* cx, JS::Handle<JSObject*> proxy,
                                 JS::Handle<jsid> id,
-                                JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
+                                JS::MutableHandle<JSPropertyDescriptor> desc) const override;
   virtual bool ownPropertyKeys(JSContext* cx, JS::Handle<JSObject*> proxy,
-                               JS::AutoIdVector &props) const MOZ_OVERRIDE;
+                               JS::AutoIdVector &props) const override;
 
   bool getPropertyDescriptor(JSContext* cx, JS::Handle<JSObject*> proxy,
                              JS::Handle<jsid> id,
-                             JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
+                             JS::MutableHandle<JSPropertyDescriptor> desc) const override;
 
   virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                         JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> objp) const override;
 
   // We override getOwnEnumerablePropertyKeys() and implement it directly
   // instead of using the default implementation, which would call
   // ownPropertyKeys and then filter out the non-enumerable ones. This avoids
   // unnecessary work during enumeration.
   virtual bool getOwnEnumerablePropertyKeys(JSContext* cx, JS::Handle<JSObject*> proxy,
-                                            JS::AutoIdVector &props) const MOZ_OVERRIDE;
+                                            JS::AutoIdVector &props) const override;
 
   bool watch(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
-             JS::Handle<JSObject*> callable) const MOZ_OVERRIDE;
+             JS::Handle<JSObject*> callable) const override;
   bool unwatch(JSContext* cx, JS::Handle<JSObject*> proxy,
-               JS::Handle<jsid> id) const MOZ_OVERRIDE;
+               JS::Handle<jsid> id) const override;
 
 protected:
   // Hook for subclasses to implement shared ownPropertyKeys()/keys()
@@ -106,7 +106,7 @@ public:
 
   bool defineProperty(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
                       JS::MutableHandle<JSPropertyDescriptor> desc,
-                      JS::ObjectOpResult &result) const MOZ_OVERRIDE
+                      JS::ObjectOpResult &result) const override
   {
     bool unused;
     return defineProperty(cx, proxy, id, desc, result, &unused);
@@ -115,16 +115,16 @@ public:
                               JS::MutableHandle<JSPropertyDescriptor> desc,
                               JS::ObjectOpResult &result, bool *defined) const;
   bool delete_(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
-               JS::ObjectOpResult &result) const MOZ_OVERRIDE;
+               JS::ObjectOpResult &result) const override;
   bool preventExtensions(JSContext* cx, JS::Handle<JSObject*> proxy,
-                         JS::ObjectOpResult& result) const MOZ_OVERRIDE;
+                         JS::ObjectOpResult& result) const override;
   bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible)
-                    const MOZ_OVERRIDE;
+                    const override;
   bool has(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
-           bool* bp) const MOZ_OVERRIDE;
+           bool* bp) const override;
   bool set(JSContext *cx, JS::Handle<JSObject*> proxy, JS::Handle<JSObject*> receiver,
            JS::Handle<jsid> id, JS::MutableHandle<JS::Value> vp, JS::ObjectOpResult &result)
-           const MOZ_OVERRIDE;
+           const override;
 
   /*
    * If assigning to proxy[id] hits a named setter with OverrideBuiltins or

dom/bluetooth/BluetoothProfileManagerBase.h

@@ -88,17 +88,17 @@ public:
   virtual void GetName(nsACString& aName) = 0;
 };
 
-#define BT_DECL_PROFILE_MGR_BASE                                                 \
-public:                                                                          \
-  NS_DECL_ISUPPORTS                                                              \
-  NS_DECL_NSIOBSERVER                                                            \
-  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,              \
-                                   const nsAString& aServiceUuid,                \
+#define BT_DECL_PROFILE_MGR_BASE                                             \
+public:                                                                      \
+  NS_DECL_ISUPPORTS                                                          \
+  NS_DECL_NSIOBSERVER                                                        \
+  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,          \
+                                   const nsAString& aServiceUuid,            \
                                    int aChannel) override;                   \
   virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
   virtual void GetAddress(nsAString& aDeviceAddress) override;               \
   virtual bool IsConnected() override;                                       \
-  virtual void Connect(const nsAString& aDeviceAddress,                          \
+  virtual void Connect(const nsAString& aDeviceAddress,                      \
                        BluetoothProfileController* aController) override;    \
   virtual void Disconnect(BluetoothProfileController* aController) override; \
   virtual void OnConnect(const nsAString& aErrorStr) override;               \

dom/bluetooth2/BluetoothProfileManagerBase.h

@@ -88,17 +88,17 @@ public:
   virtual void GetName(nsACString& aName) = 0;
 };
 
-#define BT_DECL_PROFILE_MGR_BASE                                                 \
-public:                                                                          \
-  NS_DECL_ISUPPORTS                                                              \
-  NS_DECL_NSIOBSERVER                                                            \
-  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,              \
-                                   const nsAString& aServiceUuid,                \
+#define BT_DECL_PROFILE_MGR_BASE                                             \
+public:                                                                      \
+  NS_DECL_ISUPPORTS                                                          \
+  NS_DECL_NSIOBSERVER                                                        \
+  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,          \
+                                   const nsAString& aServiceUuid,            \
                                    int aChannel) override;                   \
   virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
   virtual void GetAddress(nsAString& aDeviceAddress) override;               \
   virtual bool IsConnected() override;                                       \
-  virtual void Connect(const nsAString& aDeviceAddress,                          \
+  virtual void Connect(const nsAString& aDeviceAddress,                      \
                        BluetoothProfileController* aController) override;    \
   virtual void Disconnect(BluetoothProfileController* aController) override; \
   virtual void OnConnect(const nsAString& aErrorStr) override;               \

dom/cache/AutoUtils.h

@@ -55,7 +55,7 @@ protected:
   bool mSent;
 };
 
-class MOZ_STACK_CLASS AutoChildRequest MOZ_FINAL : public AutoChildBase
+class MOZ_STACK_CLASS AutoChildRequest final : public AutoChildBase
 {
 public:
   explicit AutoChildRequest(TypeUtils* aTypeUtils);
@@ -72,7 +72,7 @@ private:
   PCacheRequestOrVoid mRequestOrVoid;
 };
 
-class MOZ_STACK_CLASS AutoChildRequestList MOZ_FINAL : public AutoChildBase
+class MOZ_STACK_CLASS AutoChildRequestList final : public AutoChildBase
 {
 public:
   AutoChildRequestList(TypeUtils* aTypeUtils, uint32_t aCapacity);
@@ -89,7 +89,7 @@ private:
   nsAutoTArray<PCacheRequest, 32> mRequestList;
 };
 
-class MOZ_STACK_CLASS AutoChildRequestResponse MOZ_FINAL : public AutoChildBase
+class MOZ_STACK_CLASS AutoChildRequestResponse final : public AutoChildBase
 {
 public:
   explicit AutoChildRequestResponse(TypeUtils* aTypeUtils);
@@ -120,7 +120,7 @@ protected:
   bool mSent;
 };
 
-class MOZ_STACK_CLASS AutoParentRequestList MOZ_FINAL : public AutoParentBase
+class MOZ_STACK_CLASS AutoParentRequestList final : public AutoParentBase
 {
 public:
   AutoParentRequestList(mozilla::ipc::PBackgroundParent* aManager,
@@ -136,7 +136,7 @@ private:
   nsAutoTArray<PCacheRequest, 32> mRequestList;
 };
 
-class MOZ_STACK_CLASS AutoParentResponseList MOZ_FINAL : public AutoParentBase
+class MOZ_STACK_CLASS AutoParentResponseList final : public AutoParentBase
 {
 public:
   AutoParentResponseList(mozilla::ipc::PBackgroundParent* aManager,
@@ -152,7 +152,7 @@ private:
   nsAutoTArray<PCacheResponse, 32> mResponseList;
 };
 
-class MOZ_STACK_CLASS AutoParentResponseOrVoid MOZ_FINAL : public AutoParentBase
+class MOZ_STACK_CLASS AutoParentResponseOrVoid final : public AutoParentBase
 {
 public:
   explicit AutoParentResponseOrVoid(mozilla::ipc::PBackgroundParent* aManager);

dom/cache/Cache.h

@@ -38,7 +38,7 @@ class PCacheRequest;
 class PCacheResponse;
 class PCacheResponseOrVoid;
 
-class Cache MOZ_FINAL : public PromiseNativeHandler
+class Cache final : public PromiseNativeHandler
                       , public nsWrapperCache
                       , public TypeUtils
 {
@@ -71,7 +71,7 @@ public:
   static bool PrefEnabled(JSContext* aCx, JSObject* aObj);
 
   nsISupports* GetParentObject() const;
-  virtual JSObject* WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
+  virtual JSObject* WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto) override;
 
   // Called when CacheChild actor is being destroyed
   void DestroyInternal(CacheChild* aActor);
@@ -91,18 +91,18 @@ public:
 
   // TypeUtils methods
   virtual nsIGlobalObject*
-  GetGlobalObject() const MOZ_OVERRIDE;
+  GetGlobalObject() const override;
 
 #ifdef DEBUG
-  virtual void AssertOwningThread() const MOZ_OVERRIDE;
+  virtual void AssertOwningThread() const override;
 #endif
 
   // PromiseNativeHandler methods
   virtual void
-  ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+  ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override;
 
   virtual void
-  RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+  RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override;
 
 private:
   ~Cache();

dom/cache/CacheChild.h

@@ -16,7 +16,7 @@ namespace cache {
 
 class Cache;
 
-class CacheChild MOZ_FINAL : public PCacheChild
+class CacheChild final : public PCacheChild
                            , public ActorChild
 {
 public:
@@ -34,31 +34,31 @@ public:
 
   // Synchronously call ActorDestroy on our Cache listener and then start the
   // actor destruction asynchronously from the parent-side.
-  virtual void StartDestroy() MOZ_OVERRIDE;
+  virtual void StartDestroy() override;
 
 private:
   // PCacheChild methods
   virtual void
-  ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
+  ActorDestroy(ActorDestroyReason aReason) override;
 
   virtual bool
   RecvMatchResponse(const RequestId& requestId, const nsresult& aRv,
-                    const PCacheResponseOrVoid& aResponse) MOZ_OVERRIDE;
+                    const PCacheResponseOrVoid& aResponse) override;
   virtual bool
   RecvMatchAllResponse(const RequestId& requestId, const nsresult& aRv,
-                       nsTArray<PCacheResponse>&& responses) MOZ_OVERRIDE;
+                       nsTArray<PCacheResponse>&& responses) override;
   virtual bool
   RecvAddAllResponse(const RequestId& requestId,
-                     const nsresult& aRv) MOZ_OVERRIDE;
+                     const nsresult& aRv) override;
   virtual bool
   RecvPutResponse(const RequestId& aRequestId,
-                  const nsresult& aRv) MOZ_OVERRIDE;
+                  const nsresult& aRv) override;
   virtual bool
   RecvDeleteResponse(const RequestId& requestId, const nsresult& aRv,
-                     const bool& result) MOZ_OVERRIDE;
+                     const bool& result) override;
   virtual bool
   RecvKeysResponse(const RequestId& requestId, const nsresult& aRv,
-                   nsTArray<PCacheRequest>&& requests) MOZ_OVERRIDE;
+                   nsTArray<PCacheRequest>&& requests) override;
 
   // Use a weak ref so actor does not hold DOM object alive past content use.
   // The Cache object must call ClearListener() to null this before its

dom/cache/CacheParent.h

@@ -21,7 +21,7 @@ namespace cache {
 
 struct SavedResponse;
 
-class CacheParent MOZ_FINAL : public PCacheParent
+class CacheParent final : public PCacheParent
                             , public Manager::Listener
                             , public FetchPut::Listener
 {
@@ -31,44 +31,44 @@ public:
 
 private:
   // PCacheParent method
-  virtual void ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
-  virtual bool RecvTeardown() MOZ_OVERRIDE;
+  virtual void ActorDestroy(ActorDestroyReason aReason) override;
+  virtual bool RecvTeardown() override;
   virtual bool
   RecvMatch(const RequestId& aRequestId, const PCacheRequest& aRequest,
-            const PCacheQueryParams& aParams) MOZ_OVERRIDE;
+            const PCacheQueryParams& aParams) override;
   virtual bool
   RecvMatchAll(const RequestId& aRequestId, const PCacheRequestOrVoid& aRequest,
-               const PCacheQueryParams& aParams) MOZ_OVERRIDE;
+               const PCacheQueryParams& aParams) override;
   virtual bool
   RecvAddAll(const RequestId& aRequestId,
-             nsTArray<PCacheRequest>&& aRequests) MOZ_OVERRIDE;
+             nsTArray<PCacheRequest>&& aRequests) override;
   virtual bool
   RecvPut(const RequestId& aRequestId,
-          const CacheRequestResponse& aPut) MOZ_OVERRIDE;
+          const CacheRequestResponse& aPut) override;
   virtual bool
   RecvDelete(const RequestId& aRequestId, const PCacheRequest& aRequest,
-             const PCacheQueryParams& aParams) MOZ_OVERRIDE;
+             const PCacheQueryParams& aParams) override;
   virtual bool
   RecvKeys(const RequestId& aRequestId, const PCacheRequestOrVoid& aRequest,
-           const PCacheQueryParams& aParams) MOZ_OVERRIDE;
+           const PCacheQueryParams& aParams) override;
 
   // Manager::Listener methods
   virtual void OnCacheMatch(RequestId aRequestId, nsresult aRv,
                             const SavedResponse* aSavedResponse,
-                            StreamList* aStreamList) MOZ_OVERRIDE;
+                            StreamList* aStreamList) override;
   virtual void OnCacheMatchAll(RequestId aRequestId, nsresult aRv,
                                const nsTArray<SavedResponse>& aSavedResponses,
-                               StreamList* aStreamList) MOZ_OVERRIDE;
-  virtual void OnCachePutAll(RequestId aRequestId, nsresult aRv) MOZ_OVERRIDE;
+                               StreamList* aStreamList) override;
+  virtual void OnCachePutAll(RequestId aRequestId, nsresult aRv) override;
   virtual void OnCacheDelete(RequestId aRequestId, nsresult aRv,
-                             bool aSuccess) MOZ_OVERRIDE;
+                             bool aSuccess) override;
   virtual void OnCacheKeys(RequestId aRequestId, nsresult aRv,
                            const nsTArray<SavedRequest>& aSavedRequests,
-                           StreamList* aStreamList) MOZ_OVERRIDE;
+                           StreamList* aStreamList) override;
 
   // FetchPut::Listener methods
   virtual void OnFetchPut(FetchPut* aFetchPut, RequestId aRequestId,
-                          nsresult aRv) MOZ_OVERRIDE;
+                          nsresult aRv) override;
 
   already_AddRefed<nsIInputStream>
   DeserializeCacheStream(const PCacheReadStreamOrVoid& aStreamOrVoid);

dom/cache/CacheStorage.h

@@ -43,7 +43,7 @@ class CacheStorageChild;
 class Feature;
 class PCacheResponseOrVoid;
 
-class CacheStorage MOZ_FINAL : public nsIIPCBackgroundChildCreateCallback
+class CacheStorage final : public nsIIPCBackgroundChildCreateCallback
                              , public nsWrapperCache
                              , public TypeUtils
                              , public PromiseNativeHandler
@@ -72,11 +72,11 @@ public:
   static bool PrefEnabled(JSContext* aCx, JSObject* aObj);
 
   nsISupports* GetParentObject() const;
-  virtual JSObject* WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
+  virtual JSObject* WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto) override;
 
   // nsIIPCbackgroundChildCreateCallback methods
-  virtual void ActorCreated(PBackgroundChild* aActor) MOZ_OVERRIDE;
-  virtual void ActorFailed() MOZ_OVERRIDE;
+  virtual void ActorCreated(PBackgroundChild* aActor) override;
+  virtual void ActorFailed() override;
 
   // Called when CacheStorageChild actor is being destroyed
   void DestroyInternal(CacheStorageChild* aActor);
@@ -92,17 +92,17 @@ public:
                         const nsTArray<nsString>& aKeys);
 
   // TypeUtils methods
-  virtual nsIGlobalObject* GetGlobalObject() const MOZ_OVERRIDE;
+  virtual nsIGlobalObject* GetGlobalObject() const override;
 #ifdef DEBUG
-  virtual void AssertOwningThread() const MOZ_OVERRIDE;
+  virtual void AssertOwningThread() const override;
 #endif
 
   // PromiseNativeHandler methods
   virtual void
-  ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+  ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override;
 
   virtual void
-  RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+  RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override;
 
 private:
   CacheStorage(Namespace aNamespace, nsIGlobalObject* aGlobal,

dom/cache/CacheStorageChild.h

@@ -19,7 +19,7 @@ class CacheStorage;
 class PCacheChild;
 class Feature;
 
-class CacheStorageChild MOZ_FINAL : public PCacheStorageChild
+class CacheStorageChild final : public PCacheStorageChild
                                   , public ActorChild
 {
 public:
@@ -36,26 +36,26 @@ public:
 
   // Synchronously call ActorDestroy on our CacheStorage listener and then start
   // the actor destruction asynchronously from the parent-side.
-  virtual void StartDestroy() MOZ_OVERRIDE;
+  virtual void StartDestroy() override;
 
 private:
   // PCacheStorageChild methods
-  virtual void ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
+  virtual void ActorDestroy(ActorDestroyReason aReason) override;
   virtual bool RecvMatchResponse(const RequestId& aRequestId,
                                  const nsresult& aRv,
-                                 const PCacheResponseOrVoid& response) MOZ_OVERRIDE;
+                                 const PCacheResponseOrVoid& response) override;
   virtual bool RecvHasResponse(const cache::RequestId& aRequestId,
                                const nsresult& aRv,
-                               const bool& aSuccess) MOZ_OVERRIDE;
+                               const bool& aSuccess) override;
   virtual bool RecvOpenResponse(const cache::RequestId& aRequestId,
                                 const nsresult& aRv,
-                                PCacheChild* aActor) MOZ_OVERRIDE;
+                                PCacheChild* aActor) override;
   virtual bool RecvDeleteResponse(const cache::RequestId& aRequestId,
                                   const nsresult& aRv,
-                                  const bool& aResult) MOZ_OVERRIDE;
+                                  const bool& aResult) override;
   virtual bool RecvKeysResponse(const cache::RequestId& aRequestId,
                                 const nsresult& aRv,
-                                nsTArray<nsString>&& aKeys) MOZ_OVERRIDE;
+                                nsTArray<nsString>&& aKeys) override;
 
   // Use a weak ref so actor does not hold DOM object alive past content use.
   // The CacheStorage object must call ClearListener() to null this before its

dom/cache/CacheStorageParent.h

@@ -22,7 +22,7 @@ namespace cache {
 class CacheStreamControlParent;
 class ManagerId;
 
-class CacheStorageParent MOZ_FINAL : public PCacheStorageParent
+class CacheStorageParent final : public PCacheStorageParent
                                    , public PrincipalVerifier::Listener
                                    , public Manager::Listener
 {
@@ -33,35 +33,35 @@ public:
 
 private:
   // PCacheStorageParent methods
-  virtual void ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
-  virtual bool RecvTeardown() MOZ_OVERRIDE;
+  virtual void ActorDestroy(ActorDestroyReason aReason) override;
+  virtual bool RecvTeardown() override;
   virtual bool RecvMatch(const RequestId& aRequestId,
                          const PCacheRequest& aRequest,
-                         const PCacheQueryParams& aParams) MOZ_OVERRIDE;
+                         const PCacheQueryParams& aParams) override;
   virtual bool RecvHas(const RequestId& aRequestId,
-                       const nsString& aKey) MOZ_OVERRIDE;
+                       const nsString& aKey) override;
   virtual bool RecvOpen(const RequestId& aRequestId,
-                        const nsString& aKey) MOZ_OVERRIDE;
+                        const nsString& aKey) override;
   virtual bool RecvDelete(const RequestId& aRequestId,
-                          const nsString& aKey) MOZ_OVERRIDE;
-  virtual bool RecvKeys(const RequestId& aRequestId) MOZ_OVERRIDE;
+                          const nsString& aKey) override;
+  virtual bool RecvKeys(const RequestId& aRequestId) override;
 
   // PrincipalVerifier::Listener methods
   virtual void OnPrincipalVerified(nsresult aRv,
-                                   ManagerId* aManagerId) MOZ_OVERRIDE;
+                                   ManagerId* aManagerId) override;
 
   // Manager::Listener methods
   virtual void OnStorageMatch(RequestId aRequestId, nsresult aRv,
                               const SavedResponse* aResponse,
-                              StreamList* aStreamList) MOZ_OVERRIDE;
+                              StreamList* aStreamList) override;
   virtual void OnStorageHas(RequestId aRequestId, nsresult aRv,
-                            bool aCacheFound) MOZ_OVERRIDE;
+                            bool aCacheFound) override;
   virtual void OnStorageOpen(RequestId aRequestId, nsresult aRv,
-                             CacheId aCacheId) MOZ_OVERRIDE;
+                             CacheId aCacheId) override;
   virtual void OnStorageDelete(RequestId aRequestId, nsresult aRv,
-                               bool aCacheDeleted) MOZ_OVERRIDE;
+                               bool aCacheDeleted) override;
   virtual void OnStorageKeys(RequestId aRequestId, nsresult aRv,
-                             const nsTArray<nsString>& aKeys) MOZ_OVERRIDE;
+                             const nsTArray<nsString>& aKeys) override;
 
   CacheStreamControlParent*
   SerializeReadStream(CacheStreamControlParent *aStreamControl, const nsID& aId,

dom/cache/CacheStreamControlChild.h

@@ -17,7 +17,7 @@ namespace cache {
 
 class ReadStream;
 
-class CacheStreamControlChild MOZ_FINAL : public PCacheStreamControlChild
+class CacheStreamControlChild final : public PCacheStreamControlChild
                                         , public ActorChild
 {
 public:
@@ -30,13 +30,13 @@ public:
   void NoteClosed(const nsID& aId);
 
   // ActorChild methods
-  virtual void StartDestroy() MOZ_OVERRIDE;
+  virtual void StartDestroy() override;
 
 private:
   // PCacheStreamControlChild methods
-  virtual void ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
-  virtual bool RecvClose(const nsID& aId) MOZ_OVERRIDE;
-  virtual bool RecvCloseAll() MOZ_OVERRIDE;
+  virtual void ActorDestroy(ActorDestroyReason aReason) override;
+  virtual bool RecvClose(const nsID& aId) override;
+  virtual bool RecvCloseAll() override;
 
   typedef nsTObserverArray<ReadStream*> ReadStreamList;
   ReadStreamList mListeners;

dom/cache/CacheStreamControlParent.h

@@ -32,8 +32,8 @@ public:
   void Shutdown();
 
   // PCacheStreamControlParent methods
-  virtual void ActorDestroy(ActorDestroyReason aReason) MOZ_OVERRIDE;
-  virtual bool RecvNoteClosed(const nsID& aId) MOZ_OVERRIDE;
+  virtual void ActorDestroy(ActorDestroyReason aReason) override;
+  virtual bool RecvNoteClosed(const nsID& aId) override;
 
 private:
   void NotifyClose(const nsID& aId);

dom/cache/Context.cpp

@@ -28,7 +28,7 @@ using mozilla::dom::quota::PersistenceType;
 
 // Executed when the context is destroyed to release our lock on the
 // QuotaManager.
-class QuotaReleaseRunnable MOZ_FINAL : public nsRunnable
+class QuotaReleaseRunnable final : public nsRunnable
 {
 public:
   QuotaReleaseRunnable(const QuotaInfo& aQuotaInfo, const nsACString& aQuotaId)
@@ -36,7 +36,7 @@ public:
     , mQuotaId(aQuotaId)
   { }
 
-  NS_IMETHOD Run() MOZ_OVERRIDE
+  NS_IMETHOD Run() override
   {
     MOZ_ASSERT(NS_IsMainThread());
     QuotaManager* qm = QuotaManager::Get();
@@ -69,7 +69,7 @@ using mozilla::dom::quota::PersistenceType;
 // Executed to perform the complicated dance of steps necessary to initialize
 // the QuotaManager.  This must be performed for each origin before any disk
 // IO occurrs.
-class Context::QuotaInitRunnable MOZ_FINAL : public nsIRunnable
+class Context::QuotaInitRunnable final : public nsIRunnable
                                            , public Action::Resolver
 {
 public:
@@ -104,7 +104,7 @@ public:
     return rv;
   }
 
-  virtual void Resolve(nsresult aRv) MOZ_OVERRIDE
+  virtual void Resolve(nsresult aRv) override
   {
     // Depending on the error or success path, this can run on either the
     // main thread or the QuotaManager IO thread.  The IO thread is an
@@ -319,7 +319,7 @@ Context::QuotaInitRunnable::Run()
 // Runnable wrapper around Action objects dispatched on the Context.  This
 // runnable executes the Action on the appropriate threads while the Context
 // is initialized.
-class Context::ActionRunnable MOZ_FINAL : public nsIRunnable
+class Context::ActionRunnable final : public nsIRunnable
                                         , public Action::Resolver
 {
 public:
@@ -365,7 +365,7 @@ public:
     mAction->CancelOnInitiatingThread();
   }
 
-  virtual void Resolve(nsresult aRv) MOZ_OVERRIDE
+  virtual void Resolve(nsresult aRv) override
   {
     MOZ_ASSERT(mTarget == NS_GetCurrentThread());
     MOZ_ASSERT(mState == STATE_RUNNING);

dom/cache/Context.h

@@ -41,7 +41,7 @@ class Manager;
 // As an invariant, all Context objects must be destroyed before permitting
 // the "profile-before-change" shutdown event to complete.  This is ensured
 // via the code in ShutdownObserver.cpp.
-class Context MOZ_FINAL
+class Context final
 {
 public:
   static already_AddRefed<Context>

dom/cache/DBAction.h

@@ -44,7 +44,7 @@ protected:
 
 private:
   virtual void
-  RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo) MOZ_OVERRIDE;
+  RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo) override;
 
   nsresult OpenConnection(const QuotaInfo& aQuotaInfo, nsIFile* aQuotaDir,
                           mozIStorageConnection** aConnOut);
@@ -69,7 +69,7 @@ protected:
 private:
   virtual void
   RunWithDBOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo,
-                    nsIFile* aDBDir, mozIStorageConnection* aConn) MOZ_OVERRIDE;
+                    nsIFile* aDBDir, mozIStorageConnection* aConn) override;
 };
 
 } // namespace cache

dom/cache/DBSchema.h

@@ -29,7 +29,7 @@ struct SavedRequest;
 struct SavedResponse;
 
 // TODO: remove static class and use functions in cache namespace (bug 1110485)
-class DBSchema MOZ_FINAL
+class DBSchema final
 {
 public:
   static nsresult CreateSchema(mozIStorageConnection* aConn);

dom/cache/Feature.h

@@ -22,7 +22,7 @@ namespace cache {
 
 class ActorChild;
 
-class Feature MOZ_FINAL : public workers::WorkerFeature
+class Feature final : public workers::WorkerFeature
 {
 public:
   static already_AddRefed<Feature> Create(workers::WorkerPrivate* aWorkerPrivate);
@@ -33,7 +33,7 @@ public:
   bool Notified() const;
 
   // WorkerFeature methods
-  virtual bool Notify(JSContext* aCx, workers::Status aStatus) MOZ_OVERRIDE;
+  virtual bool Notify(JSContext* aCx, workers::Status aStatus) override;
 
 private:
   explicit Feature(workers::WorkerPrivate *aWorkerPrivate);

dom/cache/FetchPut.cpp

@@ -25,7 +25,7 @@ namespace mozilla {
 namespace dom {
 namespace cache {
 
-class FetchPut::Runnable MOZ_FINAL : public nsRunnable
+class FetchPut::Runnable final : public nsRunnable
 {
 public:
   explicit Runnable(FetchPut* aFetchPut)
@@ -34,7 +34,7 @@ public:
     MOZ_ASSERT(mFetchPut);
   }
 
-  NS_IMETHOD Run() MOZ_OVERRIDE
+  NS_IMETHOD Run() override
   {
     if (NS_IsMainThread())
     {
@@ -58,7 +58,7 @@ private:
   nsRefPtr<FetchPut> mFetchPut;
 };
 
-class FetchPut::FetchObserver MOZ_FINAL : public FetchDriverObserver
+class FetchPut::FetchObserver final : public FetchDriverObserver
 {
 public:
   explicit FetchObserver(FetchPut* aFetchPut)
@@ -66,13 +66,13 @@ public:
   {
   }
 
-  virtual void OnResponseAvailable(InternalResponse* aResponse) MOZ_OVERRIDE
+  virtual void OnResponseAvailable(InternalResponse* aResponse) override
   {
     MOZ_ASSERT(!mInternalResponse);
     mInternalResponse = aResponse;
   }
 
-  virtual void OnResponseEnd() MOZ_OVERRIDE
+  virtual void OnResponseEnd() override
   {
     mFetchPut->FetchComplete(this, mInternalResponse);
     mFetchPut = nullptr;

dom/cache/FetchPut.h

@@ -29,7 +29,7 @@ class Response;
 
 namespace cache {
 
-class FetchPut MOZ_FINAL : public Manager::Listener
+class FetchPut final : public Manager::Listener
                          , public TypeUtils
 {
 public:
@@ -83,15 +83,15 @@ private:
   void DoPutOnWorkerThread();
   static bool MatchInPutList(const PCacheRequest& aRequest,
                              const nsTArray<CacheRequestResponse>& aPutList);
-  virtual void OnCachePutAll(RequestId aRequestId, nsresult aRv) MOZ_OVERRIDE;
+  virtual void OnCachePutAll(RequestId aRequestId, nsresult aRv) override;
 
   void MaybeSetError(nsresult aRv);
   void MaybeNotifyListener();
 
   // TypeUtils methods
-  virtual nsIGlobalObject* GetGlobalObject() const MOZ_OVERRIDE;
+  virtual nsIGlobalObject* GetGlobalObject() const override;
 #ifdef DEBUG
-  virtual void AssertOwningThread() const MOZ_OVERRIDE;
+  virtual void AssertOwningThread() const override;
 #endif
 
   Listener* mListener;

dom/cache/FileUtils.h

@@ -20,7 +20,7 @@ namespace dom {
 namespace cache {
 
 // TODO: remove static class and use functions in cache namespace (bug 1110485)
-class FileUtils MOZ_FINAL
+class FileUtils final
 {
 public:
   enum BodyFileType

dom/cache/Manager.cpp

@@ -42,7 +42,7 @@ using mozilla::dom::cache::SyncDBAction;
 // An Action that is executed when a Context is first created.  It ensures that
 // the directory and database are setup properly.  This lets other actions
 // not worry about these details.
-class SetupAction MOZ_FINAL : public SyncDBAction
+class SetupAction final : public SyncDBAction
 {
 public:
   SetupAction()
@@ -51,7 +51,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     // TODO: init maintainance marker (bug 1110446)
     // TODO: perform maintainance if necessary (bug 1110446)
@@ -79,7 +79,7 @@ public:
 
 // Action that is executed when we determine that content has stopped using
 // a body file that has been orphaned.
-class DeleteOrphanedBodyAction MOZ_FINAL : public Action
+class DeleteOrphanedBodyAction final : public Action
 {
 public:
   explicit DeleteOrphanedBodyAction(const nsTArray<nsID>& aDeletedBodyIdList)
@@ -92,7 +92,7 @@ public:
   }
 
   virtual void
-  RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo) MOZ_OVERRIDE
+  RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo) override
   {
     MOZ_ASSERT(aResolver);
     MOZ_ASSERT(aQuotaInfo.mDir);
@@ -346,11 +346,11 @@ private:
     MaybeDestroyInstance();
   }
 
-  class ShutdownAllRunnable MOZ_FINAL : public nsRunnable
+  class ShutdownAllRunnable final : public nsRunnable
   {
   public:
     NS_IMETHOD
-    Run() MOZ_OVERRIDE
+    Run() override
     {
       mozilla::ipc::AssertIsOnBackgroundThread();
       ShutdownAllOnBackgroundThread();
@@ -421,7 +421,7 @@ protected:
   Complete(Listener* aListener, nsresult aRv) = 0;
 
   virtual void
-  CompleteOnInitiatingThread(nsresult aRv) MOZ_OVERRIDE
+  CompleteOnInitiatingThread(nsresult aRv) override
   {
     NS_ASSERT_OWNINGTHREAD(Manager::BaseAction);
     Listener* listener = mManager->GetListener(mListenerId);
@@ -442,7 +442,7 @@ protected:
 
 // Action that is executed when we determine that content has stopped using
 // a Cache object that has been orphaned.
-class Manager::DeleteOrphanedCacheAction MOZ_FINAL : public SyncDBAction
+class Manager::DeleteOrphanedCacheAction final : public SyncDBAction
 {
 public:
   DeleteOrphanedCacheAction(Manager* aManager, CacheId aCacheId)
@@ -453,7 +453,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     mozStorageTransaction trans(aConn, false,
                                 mozIStorageConnection::TRANSACTION_IMMEDIATE);
@@ -468,7 +468,7 @@ public:
   }
 
   virtual void
-  CompleteOnInitiatingThread(nsresult aRv) MOZ_OVERRIDE
+  CompleteOnInitiatingThread(nsresult aRv) override
   {
     mManager->NoteOrphanedBodyIdList(mDeletedBodyIdList);
 
@@ -484,7 +484,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::CacheMatchAction MOZ_FINAL : public Manager::BaseAction
+class Manager::CacheMatchAction final : public Manager::BaseAction
 {
 public:
   CacheMatchAction(Manager* aManager, ListenerId aListenerId,
@@ -502,7 +502,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     nsresult rv = DBSchema::CacheMatch(aConn, mCacheId, mRequest, mParams,
                                        &mFoundResponse, &mResponse);
@@ -524,7 +524,7 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     if (!mFoundResponse) {
       aListener->OnCacheMatch(mRequestId, aRv, nullptr, nullptr);
@@ -535,7 +535,7 @@ public:
     mStreamList = nullptr;
   }
 
-  virtual bool MatchesCacheId(CacheId aCacheId) const MOZ_OVERRIDE
+  virtual bool MatchesCacheId(CacheId aCacheId) const override
   {
     return aCacheId == mCacheId;
   }
@@ -551,7 +551,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::CacheMatchAllAction MOZ_FINAL : public Manager::BaseAction
+class Manager::CacheMatchAllAction final : public Manager::BaseAction
 {
 public:
   CacheMatchAllAction(Manager* aManager, ListenerId aListenerId,
@@ -568,7 +568,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     nsresult rv = DBSchema::CacheMatchAll(aConn, mCacheId, mRequestOrVoid,
                                           mParams, mSavedResponses);
@@ -593,14 +593,14 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     mStreamList->Activate(mCacheId);
     aListener->OnCacheMatchAll(mRequestId, aRv, mSavedResponses, mStreamList);
     mStreamList = nullptr;
   }
 
-  virtual bool MatchesCacheId(CacheId aCacheId) const MOZ_OVERRIDE
+  virtual bool MatchesCacheId(CacheId aCacheId) const override
   {
     return aCacheId == mCacheId;
   }
@@ -618,7 +618,7 @@ private:
 // This is the most complex Action.  It puts a request/response pair into the
 // Cache.  It does not complete until all of the body data has been saved to
 // disk.  This means its an asynchronous Action.
-class Manager::CachePutAllAction MOZ_FINAL : public DBAction
+class Manager::CachePutAllAction final : public DBAction
 {
 public:
   CachePutAllAction(Manager* aManager, ListenerId aListenerId,
@@ -654,7 +654,7 @@ private:
 
   virtual void
   RunWithDBOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo,
-                    nsIFile* aDBDir, mozIStorageConnection* aConn) MOZ_OVERRIDE
+                    nsIFile* aDBDir, mozIStorageConnection* aConn) override
   {
     MOZ_ASSERT(aResolver);
     MOZ_ASSERT(aDBDir);
@@ -800,7 +800,7 @@ private:
   }
 
   virtual void
-  CompleteOnInitiatingThread(nsresult aRv) MOZ_OVERRIDE
+  CompleteOnInitiatingThread(nsresult aRv) override
   {
     NS_ASSERT_OWNINGTHREAD(Action);
 
@@ -819,14 +819,14 @@ private:
   }
 
   virtual void
-  CancelOnInitiatingThread() MOZ_OVERRIDE
+  CancelOnInitiatingThread() override
   {
     NS_ASSERT_OWNINGTHREAD(Action);
     Action::CancelOnInitiatingThread();
     CancelAllStreamCopying();
   }
 
-  virtual bool MatchesCacheId(CacheId aCacheId) const MOZ_OVERRIDE
+  virtual bool MatchesCacheId(CacheId aCacheId) const override
   {
     NS_ASSERT_OWNINGTHREAD(Action);
     return aCacheId == mCacheId;
@@ -990,7 +990,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::CacheDeleteAction MOZ_FINAL : public Manager::BaseAction
+class Manager::CacheDeleteAction final : public Manager::BaseAction
 {
 public:
   CacheDeleteAction(Manager* aManager, ListenerId aListenerId,
@@ -1006,7 +1006,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     mozStorageTransaction trans(aConn, false,
                                 mozIStorageConnection::TRANSACTION_IMMEDIATE);
@@ -1025,13 +1025,13 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     mManager->NoteOrphanedBodyIdList(mDeletedBodyIdList);
     aListener->OnCacheDelete(mRequestId, aRv, mSuccess);
   }
 
-  virtual bool MatchesCacheId(CacheId aCacheId) const MOZ_OVERRIDE
+  virtual bool MatchesCacheId(CacheId aCacheId) const override
   {
     return aCacheId == mCacheId;
   }
@@ -1046,7 +1046,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::CacheKeysAction MOZ_FINAL : public Manager::BaseAction
+class Manager::CacheKeysAction final : public Manager::BaseAction
 {
 public:
   CacheKeysAction(Manager* aManager, ListenerId aListenerId,
@@ -1063,7 +1063,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     nsresult rv = DBSchema::CacheKeys(aConn, mCacheId, mRequestOrVoid, mParams,
                                       mSavedRequests);
@@ -1088,14 +1088,14 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     mStreamList->Activate(mCacheId);
     aListener->OnCacheKeys(mRequestId, aRv, mSavedRequests, mStreamList);
     mStreamList = nullptr;
   }
 
-  virtual bool MatchesCacheId(CacheId aCacheId) const MOZ_OVERRIDE
+  virtual bool MatchesCacheId(CacheId aCacheId) const override
   {
     return aCacheId == mCacheId;
   }
@@ -1110,7 +1110,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::StorageMatchAction MOZ_FINAL : public Manager::BaseAction
+class Manager::StorageMatchAction final : public Manager::BaseAction
 {
 public:
   StorageMatchAction(Manager* aManager, ListenerId aListenerId,
@@ -1128,7 +1128,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     nsresult rv = DBSchema::StorageMatch(aConn, mNamespace, mRequest, mParams,
                                          &mFoundResponse, &mSavedResponse);
@@ -1150,7 +1150,7 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     if (!mFoundResponse) {
       aListener->OnStorageMatch(mRequestId, aRv, nullptr, nullptr);
@@ -1172,7 +1172,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::StorageHasAction MOZ_FINAL : public Manager::BaseAction
+class Manager::StorageHasAction final : public Manager::BaseAction
 {
 public:
   StorageHasAction(Manager* aManager, ListenerId aListenerId,
@@ -1186,7 +1186,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     CacheId cacheId;
     return DBSchema::StorageGetCacheId(aConn, mNamespace, mKey,
@@ -1194,7 +1194,7 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     aListener->OnStorageHas(mRequestId, aRv, mCacheFound);
   }
@@ -1207,7 +1207,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::StorageOpenAction MOZ_FINAL : public Manager::BaseAction
+class Manager::StorageOpenAction final : public Manager::BaseAction
 {
 public:
   StorageOpenAction(Manager* aManager, ListenerId aListenerId,
@@ -1221,7 +1221,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     // Cache does not exist, create it instead
     mozStorageTransaction trans(aConn, false,
@@ -1249,7 +1249,7 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     aListener->OnStorageOpen(mRequestId, aRv, mCacheId);
   }
@@ -1262,7 +1262,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::StorageDeleteAction MOZ_FINAL : public Manager::BaseAction
+class Manager::StorageDeleteAction final : public Manager::BaseAction
 {
 public:
   StorageDeleteAction(Manager* aManager, ListenerId aListenerId,
@@ -1277,7 +1277,7 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     mozStorageTransaction trans(aConn, false,
                                 mozIStorageConnection::TRANSACTION_IMMEDIATE);
@@ -1303,7 +1303,7 @@ public:
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     if (mCacheDeleted) {
       // If content is referencing this cache, mark it orphaned to be
@@ -1331,7 +1331,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class Manager::StorageKeysAction MOZ_FINAL : public Manager::BaseAction
+class Manager::StorageKeysAction final : public Manager::BaseAction
 {
 public:
   StorageKeysAction(Manager* aManager, ListenerId aListenerId,
@@ -1342,13 +1342,13 @@ public:
 
   virtual nsresult
   RunSyncWithDBOnTarget(const QuotaInfo& aQuotaInfo, nsIFile* aDBDir,
-                        mozIStorageConnection* aConn) MOZ_OVERRIDE
+                        mozIStorageConnection* aConn) override
   {
     return DBSchema::StorageGetKeys(aConn, mNamespace, mKeys);
   }
 
   virtual void
-  Complete(Listener* aListener, nsresult aRv) MOZ_OVERRIDE
+  Complete(Listener* aListener, nsresult aRv) override
   {
     if (NS_FAILED(aRv)) {
       mKeys.Clear();

dom/cache/Manager.h

@@ -59,7 +59,7 @@ class StreamList;
 // As an invariant, all Manager objects must cease all IO before shutdown.  This
 // is enforced by the ShutdownObserver.  If content still holds references to
 // Cache DOM objects during shutdown, then all operations will begin rejecting.
-class Manager MOZ_FINAL
+class Manager final
 {
 public:
   // Callback interface implemented by clients of Manager, such as CacheParent

dom/cache/ManagerId.h

@@ -20,11 +20,11 @@ namespace mozilla {
 namespace dom {
 namespace cache {
 
-class ManagerId MOZ_FINAL
+class ManagerId final
 {
 public:
   // nsTArray comparator that compares by value instead of pointer values.
-  class MOZ_STACK_CLASS Comparator MOZ_FINAL
+  class MOZ_STACK_CLASS Comparator final
   {
   public:
     bool Equals(ManagerId *aA, ManagerId* aB) const { return *aA == *aB; }

dom/cache/PrincipalVerifier.h

@@ -21,7 +21,7 @@ namespace cache {
 
 class ManagerId;
 
-class PrincipalVerifier MOZ_FINAL : public nsRunnable
+class PrincipalVerifier final : public nsRunnable
 {
 public:
   // An interface to be implemented by code wishing to use the

dom/cache/QuotaClient.cpp

@@ -60,18 +60,18 @@ GetBodyUsage(nsIFile* aDir, UsageInfo* aUsageInfo)
   return NS_OK;
 }
 
-class CacheQuotaClient MOZ_FINAL : public Client
+class CacheQuotaClient final : public Client
 {
 public:
   virtual Type
-  GetType() MOZ_OVERRIDE
+  GetType() override
   {
     return DOMCACHE;
   }
 
   virtual nsresult
   InitOrigin(PersistenceType aPersistenceType, const nsACString& aGroup,
-             const nsACString& aOrigin, UsageInfo* aUsageInfo) MOZ_OVERRIDE
+             const nsACString& aOrigin, UsageInfo* aUsageInfo) override
   {
     return NS_OK;
   }
@@ -79,7 +79,7 @@ public:
   virtual nsresult
   GetUsageForOrigin(PersistenceType aPersistenceType, const nsACString& aGroup,
                     const nsACString& aOrigin,
-                    UsageInfo* aUsageInfo) MOZ_OVERRIDE
+                    UsageInfo* aUsageInfo) override
   {
     QuotaManager* qm = QuotaManager::Get();
     MOZ_ASSERT(qm);
@@ -149,25 +149,25 @@ public:
 
   virtual void
   OnOriginClearCompleted(PersistenceType aPersistenceType,
-                         const nsACString& aOrigin) MOZ_OVERRIDE
+                         const nsACString& aOrigin) override
   {
     // nothing to do
   }
 
   virtual void
-  ReleaseIOThreadObjects() MOZ_OVERRIDE
+  ReleaseIOThreadObjects() override
   {
     // nothing to do
   }
 
   virtual bool
-  IsFileServiceUtilized() MOZ_OVERRIDE
+  IsFileServiceUtilized() override
   {
     return false;
   }
 
   virtual bool
-  IsTransactionServiceActivated() MOZ_OVERRIDE
+  IsTransactionServiceActivated() override
   {
     // TODO: implement nsIOfflineStorage interface (bug 1110487)
     return false;
@@ -175,14 +175,14 @@ public:
 
   virtual void
   WaitForStoragesToComplete(nsTArray<nsIOfflineStorage*>& aStorages,
-                            nsIRunnable* aCallback) MOZ_OVERRIDE
+                            nsIRunnable* aCallback) override
   {
     // TODO: implement nsIOfflineStorage interface (bug 1110487)
   }
 
 
   virtual void
-  ShutdownTransactionService() MOZ_OVERRIDE
+  ShutdownTransactionService() override
   {
     MOZ_ASSERT(NS_IsMainThread());
 
@@ -194,7 +194,7 @@ private:
   ~CacheQuotaClient() { }
 
 public:
-  NS_INLINE_DECL_REFCOUNTING(CacheQuotaClient, MOZ_OVERRIDE)
+  NS_INLINE_DECL_REFCOUNTING(CacheQuotaClient, override)
 };
 
 } // anonymous namespace;

dom/cache/ReadStream.cpp

@@ -47,7 +47,7 @@ using mozilla::ipc::PFileDescriptorSetParent;
 
 // ----------------------------------------------------------------------------
 
-class ReadStreamChild MOZ_FINAL : public ReadStream
+class ReadStreamChild final : public ReadStream
 {
 public:
   ReadStreamChild(PCacheStreamControlChild* aControl, const nsID& aId,
@@ -66,7 +66,7 @@ public:
     NoteClosed();
   }
 
-  virtual void NoteClosedOnOwningThread() MOZ_OVERRIDE
+  virtual void NoteClosedOnOwningThread() override
   {
     NS_ASSERT_OWNINGTHREAD(ReadStream);
 
@@ -79,7 +79,7 @@ public:
     mControl->NoteClosed(mId);
   }
 
-  virtual void ForgetOnOwningThread() MOZ_OVERRIDE
+  virtual void ForgetOnOwningThread() override
   {
     NS_ASSERT_OWNINGTHREAD(ReadStream);
 
@@ -91,7 +91,7 @@ public:
     mControl->RemoveListener(this);
   }
 
-  virtual void SerializeControl(PCacheReadStream* aReadStreamOut) MOZ_OVERRIDE
+  virtual void SerializeControl(PCacheReadStream* aReadStreamOut) override
   {
     MOZ_ASSERT(aReadStreamOut);
     MOZ_ASSERT(!mClosed);
@@ -101,7 +101,7 @@ public:
 
   virtual void
   SerializeFds(PCacheReadStream* aReadStreamOut,
-               const nsTArray<FileDescriptor>& fds) MOZ_OVERRIDE
+               const nsTArray<FileDescriptor>& fds) override
   {
     MOZ_ASSERT(!mClosed);
     PFileDescriptorSetChild* fdSet = nullptr;
@@ -125,7 +125,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-class ReadStreamParent MOZ_FINAL : public ReadStream
+class ReadStreamParent final : public ReadStream
 {
 public:
   ReadStreamParent(PCacheStreamControlParent* aControl, const nsID& aId,
@@ -144,7 +144,7 @@ public:
     NoteClosed();
   }
 
-  virtual void NoteClosedOnOwningThread() MOZ_OVERRIDE
+  virtual void NoteClosedOnOwningThread() override
   {
     NS_ASSERT_OWNINGTHREAD(ReadStream);
 
@@ -159,7 +159,7 @@ public:
     mControl = nullptr;
   }
 
-  virtual void ForgetOnOwningThread() MOZ_OVERRIDE
+  virtual void ForgetOnOwningThread() override
   {
     NS_ASSERT_OWNINGTHREAD(ReadStream);
 
@@ -173,7 +173,7 @@ public:
     mControl = nullptr;
   }
 
-  virtual void SerializeControl(PCacheReadStream* aReadStreamOut) MOZ_OVERRIDE
+  virtual void SerializeControl(PCacheReadStream* aReadStreamOut) override
   {
     MOZ_ASSERT(aReadStreamOut);
     MOZ_ASSERT(!mClosed);
@@ -184,7 +184,7 @@ public:
 
   virtual void
   SerializeFds(PCacheReadStream* aReadStreamOut,
-               const nsTArray<FileDescriptor>& fds) MOZ_OVERRIDE
+               const nsTArray<FileDescriptor>& fds) override
   {
     MOZ_ASSERT(!mClosed);
     MOZ_ASSERT(mControl);
@@ -227,7 +227,7 @@ using mozilla::ipc::PFileDescriptorSetChild;
 // be done on the thread associated with the PBackground actor.  Must be
 // cancelable to execute on Worker threads (which can occur when the
 // ReadStream is constructed on a child process Worker thread).
-class ReadStream::NoteClosedRunnable MOZ_FINAL : public nsCancelableRunnable
+class ReadStream::NoteClosedRunnable final : public nsCancelableRunnable
 {
 public:
   explicit NoteClosedRunnable(ReadStream* aStream)
@@ -259,7 +259,7 @@ private:
 // it on the thread associated with the PBackground actor.  Must be
 // cancelable to execute on Worker threads (which can occur when the
 // ReadStream is constructed on a child process Worker thread).
-class ReadStream::ForgetRunnable MOZ_FINAL : public nsCancelableRunnable
+class ReadStream::ForgetRunnable final : public nsCancelableRunnable
 {
 public:
   explicit ForgetRunnable(ReadStream* aStream)

dom/camera/DOMCameraCapabilities.h

@@ -30,7 +30,7 @@ namespace dom {
  * CameraRecorderVideoProfile
  */
 class CameraRecorderVideoProfile final : public nsISupports
-                                           , public nsWrapperCache
+                                       , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -69,7 +69,7 @@ private:
  * CameraRecorderAudioProfile
  */
 class CameraRecorderAudioProfile final : public nsISupports
-                                           , public nsWrapperCache
+                                       , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -103,7 +103,7 @@ private:
  * CameraRecorderProfile
  */
 class CameraRecorderProfile final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -149,7 +149,7 @@ private:
 template<class T> class CameraClosedListenerProxy;
 
 class CameraRecorderProfiles final : public nsISupports
-                                       , public nsWrapperCache
+                                   , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -182,7 +182,7 @@ private:
  * CameraCapabilities
  */
 class CameraCapabilities final : public nsISupports
-                                   , public nsWrapperCache
+                               , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/camera/DOMCameraControl.h

@@ -46,7 +46,7 @@ class StartRecordingHelper;
 
 // Main camera control.
 class nsDOMCameraControl final : public DOMMediaStream
-                                   , public nsSupportsWeakReference
+                               , public nsSupportsWeakReference
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOM_CAMERA_CONTROL_CID)

dom/camera/DOMCameraDetectedFace.h

@@ -17,7 +17,7 @@ namespace mozilla {
 namespace dom {
 
 class DOMCameraDetectedFace final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/cellbroadcast/CellBroadcastMessage.h

@@ -20,7 +20,7 @@ namespace dom {
 class CellBroadcastEtwsInfo;
 
 class CellBroadcastMessage final : public nsISupports
-                                     , public nsWrapperCache
+                                 , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -92,7 +92,7 @@ private:
 };
 
 class CellBroadcastEtwsInfo final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS

dom/cellbroadcast/ipc/CellBroadcastIPCService.h

@@ -16,7 +16,7 @@ namespace dom {
 namespace cellbroadcast {
 
 class CellBroadcastIPCService final : public PCellBroadcastChild
-                                        , public nsICellBroadcastService
+                                    , public nsICellBroadcastService
 
 {
 public:
@@ -55,4 +55,4 @@ private:
 } // namespace dom
 } // namespace mozilla
 
-#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h
+#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h

dom/cellbroadcast/ipc/CellBroadcastParent.h

@@ -16,7 +16,7 @@ namespace dom {
 namespace cellbroadcast {
 
 class CellBroadcastParent final : public PCellBroadcastParent
-                                    , public nsICellBroadcastListener
+                                , public nsICellBroadcastListener
 {
 public:
   NS_DECL_ISUPPORTS

dom/crypto/CryptoKey.h

@@ -59,8 +59,8 @@ Thus, internally, a key has the following fields:
 struct JsonWebKey;
 
 class CryptoKey final : public nsISupports,
-                            public nsWrapperCache,
-                            public nsNSSShutDownObject
+                        public nsWrapperCache,
+                        public nsNSSShutDownObject
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS