Backed out changeset fe1ed0ded678 (bug 1211974) for robocop orange

dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp

@@ -277,8 +277,7 @@ speechd_cb(size_t msg_id, size_t client_id, SPDNotificationType state)
 
 NS_INTERFACE_MAP_BEGIN(SpeechDispatcherService)
   NS_INTERFACE_MAP_ENTRY(nsISpeechService)
-  NS_INTERFACE_MAP_ENTRY(nsIObserver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISpeechService)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_ADDREF(SpeechDispatcherService)
@@ -441,17 +440,6 @@ SpeechDispatcherService::RegisterVoices()
   mInitialized = true;
 }
 
-// nsIObserver
-
-NS_IMETHODIMP
-SpeechDispatcherService::Observe(nsISupports* aSubject, const char* aTopic,
-                                 const char16_t* aData)
-{
-  return NS_OK;
-}
-
-// nsISpeechService
-
 // TODO: Support SSML
 NS_IMETHODIMP
 SpeechDispatcherService::Speak(const nsAString& aText, const nsAString& aUri,

dom/media/webspeech/synth/speechd/SpeechDispatcherService.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/StaticPtr.h"
 #include "nsAutoPtr.h"
-#include "nsIObserver.h"
 #include "nsISpeechService.h"
 #include "nsIThread.h"
 #include "nsRefPtrHashtable.h"
@@ -23,13 +22,11 @@ namespace dom {
 class SpeechDispatcherCallback;
 class SpeechDispatcherVoice;
 
-class SpeechDispatcherService final : public nsIObserver,
-                                      public nsISpeechService
+class SpeechDispatcherService final : public nsISpeechService
 {
   friend class SpeechDispatcherCallback;
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIOBSERVER
   NS_DECL_NSISPEECHSERVICE
 
   SpeechDispatcherService();