Base import of Tycho code (warning: huge commit)

1 files changed, 6 insertions, 12 deletions

diff --git a/dom/base/nsDOMScriptObjectFactory.h b/dom/base/nsDOMScriptObjectFactory.h
index dd4868c1c..0ef6ead0f 100644
--- a/dom/base/nsDOMScriptObjectFactory.h
+++ b/dom/base/nsDOMScriptObjectFactory.h
@@ -20,13 +20,13 @@
 
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsIObserver.h"
-#include "nsIExceptionService.h"
-#include "nsIScriptRuntime.h"
 #include "mozilla/Attributes.h"
 
-class nsDOMScriptObjectFactory MOZ_FINAL : public nsIDOMScriptObjectFactory,
+class nsDOMScriptObjectFactory final : public nsIDOMScriptObjectFactory,
                                            public nsIObserver
 {
+  ~nsDOMScriptObjectFactory() {}
+
 public:
   nsDOMScriptObjectFactory();
 
@@ -36,8 +36,8 @@ public:
   NS_DECL_NSIOBSERVER
 
   // nsIDOMScriptObjectFactory
-  NS_IMETHOD_(nsISupports *) GetClassInfoInstance(nsDOMClassInfoID aID) MOZ_OVERRIDE;
-  NS_IMETHOD_(nsISupports *) GetExternalClassInfoInstance(const nsAString& aName) MOZ_OVERRIDE;
+  NS_IMETHOD_(nsISupports *) GetClassInfoInstance(nsDOMClassInfoID aID) override;
+  NS_IMETHOD_(nsISupports *) GetExternalClassInfoInstance(const nsAString& aName) override;
 
   NS_IMETHOD RegisterDOMClassInfo(const char *aName,
                                   nsDOMClassInfoExternalConstructorFnc aConstructorFptr,
@@ -45,12 +45,6 @@ public:
                                   const nsIID **aInterfaces,
                                   uint32_t aScriptableFlags,
                                   bool aHasClassInterface,
-                                  const nsCID *aConstructorCID) MOZ_OVERRIDE;
+                                  const nsCID *aConstructorCID) override;
 };
 
-class nsDOMExceptionProvider MOZ_FINAL : public nsIExceptionProvider
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIEXCEPTIONPROVIDER
-};