Bug 1589446 - Send the network id notification on networkID change (Linux) r=kershaw

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

--HG--
extra : moz-landing-system : lando

netwerk/system/linux/nsNetworkLinkService.cpp

@@ -128,48 +128,55 @@ void nsNetworkLinkService::OnNetworkChanged() {
 
     RefPtr<nsNetworkLinkService> self = this;
     NS_DispatchToMainThread(NS_NewRunnableFunction(
-        "nsNetworkLinkService::OnNetworkChanged",
-        [self]() { self->SendEvent(NS_NETWORK_LINK_DATA_CHANGED); }));
+        "nsNetworkLinkService::OnNetworkChanged", [self]() {
+          self->NotifyObservers(NS_NETWORK_LINK_TOPIC,
+                                NS_NETWORK_LINK_DATA_CHANGED);
+        }));
   }
 }
 
 void nsNetworkLinkService::OnNetworkIDChanged() {
   RefPtr<nsNetworkLinkService> self = this;
   NS_DispatchToMainThread(NS_NewRunnableFunction(
-      "nsNetworkLinkService::OnNetworkIDChanged",
-      [self]() { self->SendEvent(NS_NETWORK_LINK_DATA_NETWORKID_CHANGED); }));
+      "nsNetworkLinkService::OnNetworkIDChanged", [self]() {
+        self->NotifyObservers(NS_NETWORK_ID_CHANGED_TOPIC, nullptr);
+      }));
 }
 
 void nsNetworkLinkService::OnLinkUp() {
   RefPtr<nsNetworkLinkService> self = this;
-  NS_DispatchToMainThread(NS_NewRunnableFunction(
-      "nsNetworkLinkService::OnLinkUp",
-      [self]() { self->SendEvent(NS_NETWORK_LINK_DATA_UP); }));
+  NS_DispatchToMainThread(
+      NS_NewRunnableFunction("nsNetworkLinkService::OnLinkUp", [self]() {
+        self->NotifyObservers(NS_NETWORK_LINK_TOPIC, NS_NETWORK_LINK_DATA_UP);
+      }));
 }
 
 void nsNetworkLinkService::OnLinkDown() {
   RefPtr<nsNetworkLinkService> self = this;
-  NS_DispatchToMainThread(NS_NewRunnableFunction(
-      "nsNetworkLinkService::OnLinkDown",
-      [self]() { self->SendEvent(NS_NETWORK_LINK_DATA_DOWN); }));
+  NS_DispatchToMainThread(
+      NS_NewRunnableFunction("nsNetworkLinkService::OnLinkDown", [self]() {
+        self->NotifyObservers(NS_NETWORK_LINK_TOPIC, NS_NETWORK_LINK_DATA_DOWN);
+      }));
 }
 
 void nsNetworkLinkService::OnLinkStatusKnown() { mStatusIsKnown = true; }
 
-/* Sends the given event. Assumes aEventID never goes out of scope (static
+/* Sends the given event. Assumes aTopic/aData never goes out of scope (static
  * strings are ideal).
  */
-void nsNetworkLinkService::SendEvent(const char* aEventID) {
+void nsNetworkLinkService::NotifyObservers(const char* aTopic,
+                                           const char* aData) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  LOG(("SendEvent: %s\n", aEventID));
+  LOG(("nsNetworkLinkService::NotifyObservers: topic:%s data:%s\n", aTopic,
+       aData ? aData : ""));
 
   nsCOMPtr<nsIObserverService> observerService =
       mozilla::services::GetObserverService();
 
   if (observerService) {
-    observerService->NotifyObservers(static_cast<nsINetworkLinkService*>(this),
-                                     NS_NETWORK_LINK_TOPIC,
-                                     NS_ConvertASCIItoUTF16(aEventID).get());
+    observerService->NotifyObservers(
+        static_cast<nsINetworkLinkService*>(this), aTopic,
+        aData ? NS_ConvertASCIItoUTF16(aData).get() : nullptr);
   }
 }

netwerk/system/linux/nsNetworkLinkService.h

@@ -37,7 +37,7 @@ class nsNetworkLinkService : public nsINetworkLinkService,
   nsresult Shutdown();
 
   // Sends the network event.
-  void SendEvent(const char* aEventID);
+  void NotifyObservers(const char* aTopic, const char* aData);
 
   mozilla::Atomic<bool, mozilla::Relaxed> mStatusIsKnown;