Bug 1685031 - Remove unused shutdown observer in nsAndroidBridge. r=geckoview-reviewers,agi

Shutdown observer in nsAndroidBridge does nothing. So let's remove this.

Differential Revision: https://phabricator.services.mozilla.com/D100760

widget/android/AndroidBridge.cpp

@@ -40,7 +40,6 @@
 
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
-#include "nsIObserverService.h"
 #include "WidgetUtils.h"
 
 #include "mozilla/java/EventDispatcherWrappers.h"
@@ -568,8 +567,7 @@ jobject AndroidBridge::GetGlobalContextRef() {
 }
 
 /* Implementation file */
-NS_IMPL_ISUPPORTS(nsAndroidBridge, nsIAndroidEventDispatcher, nsIAndroidBridge,
-                  nsIObserver)
+NS_IMPL_ISUPPORTS(nsAndroidBridge, nsIAndroidEventDispatcher, nsIAndroidBridge)
 
 nsAndroidBridge::nsAndroidBridge() {
   if (jni::IsAvailable()) {
@@ -578,8 +576,6 @@ nsAndroidBridge::nsAndroidBridge() {
                        /* window */ nullptr);
     mEventDispatcher = dispatcher;
   }
-
-  AddObservers();
 }
 
 NS_IMETHODIMP
@@ -610,29 +606,6 @@ NS_IMETHODIMP nsAndroidBridge::IsContentDocumentDisplayed(
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsAndroidBridge::Observe(nsISupports* aSubject, const char* aTopic,
-                         const char16_t* aData) {
-  if (!strcmp(aTopic, "xpcom-shutdown")) {
-    RemoveObservers();
-  }
-  return NS_OK;
-}
-
-void nsAndroidBridge::AddObservers() {
-  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-  if (obs) {
-    obs->AddObserver(this, "xpcom-shutdown", false);
-  }
-}
-
-void nsAndroidBridge::RemoveObservers() {
-  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-  if (obs) {
-    obs->RemoveObserver(this, "xpcom-shutdown");
-  }
-}
-
 uint32_t AndroidBridge::GetScreenOrientation() {
   ALOG_BRIDGE("AndroidBridge::GetScreenOrientation");
 

widget/android/AndroidBridge.h

@@ -32,7 +32,6 @@
 #include "mozilla/Types.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/jni/Utils.h"
-#include "nsIObserver.h"
 #include "nsDataHashtable.h"
 
 #include "Units.h"
@@ -343,11 +342,10 @@ class AutoLocalJNIFrame {
     }                                                \
   }
 
-class nsAndroidBridge final : public nsIAndroidBridge, public nsIObserver {
+class nsAndroidBridge final : public nsIAndroidBridge {
  public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIANDROIDBRIDGE
-  NS_DECL_NSIOBSERVER
 
   NS_FORWARD_SAFE_NSIANDROIDEVENTDISPATCHER(mEventDispatcher)
 
@@ -356,9 +354,6 @@ class nsAndroidBridge final : public nsIAndroidBridge, public nsIObserver {
  private:
   ~nsAndroidBridge();
 
-  void AddObservers();
-  void RemoveObservers();
-
   nsCOMPtr<nsIAndroidEventDispatcher> mEventDispatcher;
 
  protected: