fix unit tests

Signed-off-by: Vadym Struts <vstruts@brave.com>

Author: vadimstruts

browser/psst/BUILD.gn

@@ -26,13 +26,13 @@ static_library("psst") {
     "//brave/components/psst/browser/core",
     "//brave/components/psst/common",
     "//chrome/browser/content_settings:content_settings_factory",
-    "//chrome/browser/profiles",
-    "//components/content_settings/core/browser",
-    "//components/permissions",
-    "//components/infobars/core",
     "//chrome/browser/infobars",
+    "//chrome/browser/profiles",
     "//chrome/browser/ui/webui",
+    "//components/content_settings/core/browser",
     "//components/infobars/content",
+    "//components/infobars/core",
+    "//components/permissions",
     "//ui/web_dialogs",
   ]
 }
@@ -64,6 +64,7 @@ source_set("browser_tests") {
 
   deps = [
     "//base",
+    "//brave/browser/psst",
     "//brave/components/brave_shields/content/browser",
     "//brave/components/cosmetic_filters/browser",
     "//brave/components/psst/browser/content",
@@ -72,11 +73,10 @@ source_set("browser_tests") {
     "//brave/components/psst/common",
     "//chrome/test:test_support",
     "//components/component_updater:test_support",
+    "//components/infobars/content",
     "//content/test:test_support",
     "//net:test_support",
     "//url",
-    "//brave/browser/psst",
-    "//components/infobars/content",
   ]
 
   if (is_android) {

browser/psst/psst_ui_delegate_impl.cc

@@ -52,12 +52,11 @@ PsstUiDelegateImpl::PsstUiDelegateImpl(
 }
 PsstUiDelegateImpl::~PsstUiDelegateImpl() = default;
 
-void PsstUiDelegateImpl::Show(
-    const url::Origin& origin,
-    PsstWebsiteSettings dialog_data,
-    const std::string& site_name,
-    base::ListValue tasks,
-    PsstTabWebContentsObserver::ConsentCallback apply_changes_callback) {
+void PsstUiDelegateImpl::Show(const url::Origin& origin,
+                              PsstWebsiteSettings dialog_data,
+                              const std::string& site_name,
+                              base::ListValue tasks,
+                              ConsentCallback apply_changes_callback) {
   auto psst_settings = psst_settings_service_->GetPsstWebsiteSettings(
       origin, dialog_data.user_id);
 

browser/psst/psst_ui_delegate_impl.h

@@ -61,8 +61,7 @@ class PsstUiDelegateImpl : public PsstTabWebContentsObserver::PsstUiDelegate {
             PsstWebsiteSettings dialog_data,
             const std::string& site_name,
             base::ListValue tasks,
-            PsstTabWebContentsObserver::ConsentCallback apply_changes_callback)
-      override;
+            ConsentCallback apply_changes_callback) override;
 
   void UpdateTasks(long progress,
                    const std::vector<PolicyTask>& applied_tasks,
@@ -80,7 +79,7 @@ class PsstUiDelegateImpl : public PsstTabWebContentsObserver::PsstUiDelegate {
   std::optional<PsstWebsiteSettings> dialog_data_;
   std::optional<url::Origin> origin_;
   std::optional<base::ListValue> tasks_;
-  PsstTabWebContentsObserver::ConsentCallback apply_changes_callback_;
+  ConsentCallback apply_changes_callback_;
   raw_ptr<PsstSettingsService> psst_settings_service_ = nullptr;
   base::ObserverList<Observer> observer_list_;
   base::WeakPtrFactory<PsstUiDelegateImpl> weak_ptr_factory_{this};

components/psst/browser/content/psst_tab_web_contents_observer.cc

@@ -203,7 +203,8 @@ void PsstTabWebContentsObserver::NavigationEntryCommitted(
   CHECK(load_details.entry);
   if (!load_details.is_navigation_to_different_page() ||
       !load_details.entry->GetURL().SchemeIsHTTPOrHTTPS() ||
-      load_details.entry->IsRestored()) {
+      load_details.entry->IsRestored() ||
+      !prefs_->GetBoolean(prefs::kPsstEnabled)) {
     return;
   }
 
@@ -367,6 +368,7 @@ void PsstTabWebContentsObserver::OnPolicyScriptResult(
   timeout_timer_.Stop();
 
   if (!script_result.is_dict()) {
+    ui_delegate_->UpdateTasks(100, {}, mojom::PsstStatus::kFailed);
     return;
   }
 

components/psst/browser/content/psst_tab_web_contents_observer.h

@@ -33,14 +33,15 @@ class PsstTabWebContentsObserver : public content::WebContentsObserver {
   using InjectScriptCallback = base::RepeatingCallback<void(
       const std::string&,
       PsstTabWebContentsObserver::InsertScriptInPageCallback)>;
-  using ConsentCallback =
-      base::OnceCallback<void(const std::vector<std::string>& disabled_checks)>;
 
   // Delegate interface for UI-related actions. This class is responsible for
   // facilitating communication with the consent dialog, ensuring that the UI
   // reflects the current state accurately.
   class PsstUiDelegate {
    public:
+    using ConsentCallback = base::OnceCallback<void(
+        const std::vector<std::string>& disabled_checks)>;
+
     virtual ~PsstUiDelegate() = default;
     // Show the consent dialog to the user with the provided data.
     virtual void Show(const url::Origin& origin,
@@ -76,6 +77,8 @@ class PsstTabWebContentsObserver : public content::WebContentsObserver {
 
  private:
   friend class PsstTabWebContentsObserverUnitTestBase;
+  FRIEND_TEST_ALL_PREFIXES(PsstTabWebContentsObserverUnitTest,
+                           ShouldNotProcessRestoredNavigationEntry);
 
   PsstTabWebContentsObserver(content::WebContents* web_contents,
                              PsstRuleRegistry* registry,