Bug 36830: Revert a small part of the fix for bug 33203 that was breaking observer notification.

content/html/content/public/nsIFormSubmitObserver.h

@@ -30,7 +30,7 @@
 #ifndef nsIFormSubmitObserver_h__
 #define nsIFormSubmitObserver_h__
 
-#include "nsIObserver.h"
+#include "nsISupports.h"
 #include "prtypes.h"
 #include "nsIDOMWindow.h"
 #include "nsIURI.h"
@@ -43,7 +43,7 @@ class nsString;
 
 #define NS_FORMSUBMIT_SUBJECT "formsubmit"
 
-class nsIFormSubmitObserver : public nsIObserver {
+class nsIFormSubmitObserver : public nsISupports {
 public:
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)
 

extensions/wallet/src/nsWalletService.cpp

@@ -63,8 +63,9 @@ nsWalletlibService::~nsWalletlibService()
   NS_IF_RELEASE(gKeyedStreamGenerator);
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS5(nsWalletlibService,
+NS_IMPL_THREADSAFE_ISUPPORTS6(nsWalletlibService,
                               nsIWalletService,
+                              nsIObserver,
                               nsIFormSubmitObserver,
                               nsIDocumentLoaderObserver,
                               nsIPasswordSink,

extensions/wallet/src/nsWalletService.h

@@ -33,6 +33,7 @@
 #include "nsIURI.h"
 
 class nsWalletlibService : public nsIWalletService,
+                           public nsIObserver,
                            public nsIFormSubmitObserver,
                            public nsIDocumentLoaderObserver,
                            public nsIPasswordSink,

layout/html/forms/public/nsIFormSubmitObserver.h

@@ -30,7 +30,7 @@
 #ifndef nsIFormSubmitObserver_h__
 #define nsIFormSubmitObserver_h__
 
-#include "nsIObserver.h"
+#include "nsISupports.h"
 #include "prtypes.h"
 #include "nsIDOMWindow.h"
 #include "nsIURI.h"
@@ -43,7 +43,7 @@ class nsString;
 
 #define NS_FORMSUBMIT_SUBJECT "formsubmit"
 
-class nsIFormSubmitObserver : public nsIObserver {
+class nsIFormSubmitObserver : public nsISupports {
 public:
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)