[DanglingPtr] Fix dangling pointers in BraveAdsTabHelperTest

brave · Nov 1, 2024 · 2e949de · 2e949de
1 parent 499ad60
commit 2e949de
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 57 deletions.
diff --git a/browser/brave_ads/ads_service_delegate.cc b/browser/brave_ads/ads_service_delegate.cc
@@ -223,11 +223,17 @@ void AdsServiceDelegate::SnoozeScheduledCaptcha() {
 
 void AdsServiceDelegate::Display(
     const message_center::Notification& notification) {
+  // We cannot store a raw_ptr to NotificationDisplayService due to upstream
+  // browser tests changes NotificationDisplayService instance during test run
+  // which leads to dangling pointer errors.
   GetNotificationDisplayService()->Display(NotificationHandler::Type::BRAVE_ADS,
                                            notification, nullptr);
 }
 
 void AdsServiceDelegate::Close(const std::string& notification_id) {
+  // We cannot store a raw_ptr to NotificationDisplayService due to upstream
+  // browser tests changes NotificationDisplayService instance during test run
+  // which leads to dangling pointer errors.
   GetNotificationDisplayService()->Close(NotificationHandler::Type::BRAVE_ADS,
                                          notification_id);
 }

diff --git a/browser/brave_ads/ads_service_delegate.h b/browser/brave_ads/ads_service_delegate.h
@@ -79,8 +79,8 @@ class AdsServiceDelegate : public AdsService::Delegate {
  private:
   NotificationDisplayService* GetNotificationDisplayService();
 
-  raw_ptr<Profile> profile_ = nullptr;
-  raw_ptr<PrefService> local_state_ = nullptr;
+  raw_ptr<Profile> profile_ = nullptr;          // NOT OWNED
+  raw_ptr<PrefService> local_state_ = nullptr;  // NOT OWNED
   search_engines::SearchEngineChoiceService search_engine_choice_service_;
   raw_ptr<brave_adaptive_captcha::BraveAdaptiveCaptchaService>
       adaptive_captcha_service_ = nullptr;