Uplift of #29415 (squashed) to release

Author: brave-builds

ios/brave-ios/Sources/Web/WebKit/TabWKNavigationHandler.swift

@@ -320,6 +320,7 @@ class TabWKNavigationHandler: NSObject, WKNavigationDelegate {
     tab.lastCommittedURL = webView.url
     tab.isRestoring = false
     tab.contentsMimeType = pendingMIMEType
+    tab.updateSecureContentStateAndNotifyObserversIfNeeded()
 
     pendingMIMEType = nil
 

ios/brave-ios/Sources/Web/WebKit/WebKitTabState.swift

@@ -46,6 +46,19 @@ class WebKitTabState: TabState, TabStateImpl {
   func updateSecureContentState() async {
     visibleSecureContentState = await secureContentState
   }
+
+  func updateSecureContentStateAndNotifyObserversIfNeeded() {
+    Task { @MainActor in
+      let currentState = visibleSecureContentState
+      await updateSecureContentState()
+      if currentState != visibleSecureContentState {
+        observers.forEach {
+          $0.tabDidChangeVisibleSecurityState(self)
+        }
+      }
+    }
+  }
+
   @MainActor private var secureContentState: SecureContentState {
     get async {
       guard let webView = webView, let committedURL = self.lastCommittedURL else {
@@ -129,15 +142,7 @@ class WebKitTabState: TabState, TabStateImpl {
       }
     }
 
-    Task { @MainActor in
-      let currentState = visibleSecureContentState
-      await updateSecureContentState()
-      if currentState != visibleSecureContentState {
-        observers.forEach {
-          $0.tabDidChangeVisibleSecurityState(self)
-        }
-      }
-    }
+    updateSecureContentStateAndNotifyObserversIfNeeded()
   }
 
   private func webViewIsLoadingDidChange(_ isLoading: Bool) {
@@ -180,12 +185,7 @@ class WebKitTabState: TabState, TabStateImpl {
   }
 
   private func webViewSecurityStateDidChange() {
-    Task { @MainActor in
-      await updateSecureContentState()
-      observers.forEach {
-        $0.tabDidChangeVisibleSecurityState(self)
-      }
-    }
+    updateSecureContentStateAndNotifyObserversIfNeeded()
   }
 
   private func webViewSampledPageTopColorDidChange() {