Refactor FXIOS-14338 ⁃ TabContentBlocker should use Notifiable protocol (#31120)

* FXIOS-14338 #31067 ⁃ TabContentBlocker should use Notifiable protocol

* Quick refactor

* Listen to contentBlockerTabSetupRequired

Author: dicarobinho

firefox-ios/Client/ContentBlocker/TabContentBlocker.swift

@@ -20,16 +20,15 @@ protocol ContentBlockerTab: AnyObject {
 }
 
 @MainActor
-class TabContentBlocker {
+class TabContentBlocker: Notifiable {
     weak var tab: ContentBlockerTab?
     let logger: Logger
 
     var isEnabled: Bool {
         return false
     }
 
-    @objc
-    nonisolated func notifiedTabSetupRequired() {}
+    func notifiedTabSetupRequired() {}
 
     func currentlyEnabledLists() -> [String] {
         return []
@@ -60,11 +59,12 @@ class TabContentBlocker {
     init(tab: ContentBlockerTab, logger: Logger = DefaultLogger.shared) {
         self.tab = tab
         self.logger = logger
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(notifiedTabSetupRequired),
-            name: .contentBlockerTabSetupRequired,
-            object: nil
+        startObservingNotifications(
+            withNotificationCenter: NotificationCenter.default,
+            forObserver: self,
+            observing: [
+                .contentBlockerTabSetupRequired
+            ]
         )
     }
 
@@ -80,4 +80,17 @@ class TabContentBlocker {
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
+
+    // MARK: - Notifiable
+
+    public func handleNotifications(_ notification: Notification) {
+        switch notification.name {
+        case .contentBlockerTabSetupRequired:
+            ensureMainThread {
+                self.notifiedTabSetupRequired
+            }
+        default:
+            return
+        }
+    }
 }

firefox-ios/Client/Frontend/Browser/FirefoxTabContentBlocker.swift

@@ -114,13 +114,11 @@ final class FirefoxTabContentBlocker: TabContentBlocker, TabContentScript {
         )
     }
 
-    override nonisolated func notifiedTabSetupRequired() {
-        ensureMainThread {
-            guard let tab = self.tab as? Tab else { return }
-            self.logger.log("Notified tab setup required", level: .info, category: .adblock)
-            self.setupForTab(completion: { tab.reloadPage() })
-            TabEvent.post(.didChangeContentBlocking, for: tab)
-        }
+    override func notifiedTabSetupRequired() {
+        guard let tab = self.tab as? Tab else { return }
+        self.logger.log("Notified tab setup required", level: .info, category: .adblock)
+        self.setupForTab(completion: { tab.reloadPage() })
+        TabEvent.post(.didChangeContentBlocking, for: tab)
     }
 
     override func currentlyEnabledLists() -> [String] {