Merge pull request #16179 from brave/issues/23002_search_result_ad_ta…

…b_helper

Search result ad view/click confirmation.

browser/brave_ads/ads_tab_helper.cc

@@ -8,8 +8,6 @@
 #include <string>
 
 #include "brave/browser/brave_ads/ads_service_factory.h"
-#include "brave/browser/brave_ads/search_result_ad/search_result_ad_service_factory.h"
-#include "brave/components/brave_ads/content/browser/search_result_ad/search_result_ad_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
@@ -45,9 +43,6 @@ AdsTabHelper::AdsTabHelper(content::WebContents* web_contents)
     return;
   }
 
-  search_result_ad_service_ =
-      SearchResultAdServiceFactory::GetForProfile(profile);
-
 #if !BUILDFLAG(IS_ANDROID)
   BrowserList::AddObserver(this);
   OnBrowserSetLastActive(BrowserList::GetInstance()->GetLastActive());
@@ -128,10 +123,6 @@ void AdsTabHelper::DidFinishNavigation(
   redirect_chain_ = navigation_handle->GetRedirectChain();
 
   if (!navigation_handle->IsSameDocument()) {
-    if (search_result_ad_service_) {
-      search_result_ad_service_->OnDidFinishNavigation(tab_id_);
-    }
-
     should_process_ = navigation_handle->GetRestoreType() ==
                       content::RestoreType::kNotRestored;
 
@@ -146,11 +137,6 @@ void AdsTabHelper::DidFinishNavigation(
 void AdsTabHelper::DocumentOnLoadCompletedInPrimaryMainFrame() {
   content::RenderFrameHost* render_frame_host =
       web_contents()->GetPrimaryMainFrame();
-  if (search_result_ad_service_) {
-    search_result_ad_service_->MaybeRetrieveSearchResultAd(
-        render_frame_host, tab_id_, should_process_);
-  }
-
   if (should_process_) {
     RunIsolatedJavaScript(render_frame_host);
   }
@@ -207,10 +193,6 @@ void AdsTabHelper::OnVisibilityChanged(content::Visibility visibility) {
 }
 
 void AdsTabHelper::WebContentsDestroyed() {
-  if (search_result_ad_service_) {
-    search_result_ad_service_->OnDidCloseTab(tab_id_);
-  }
-
   if (!ads_service_) {
     return;
   }

browser/brave_ads/ads_tab_helper.h

@@ -36,7 +36,6 @@ class DomDistillerResult;
 namespace brave_ads {
 
 class AdsService;
-class SearchResultAdService;
 
 class AdsTabHelper : public content::WebContentsObserver,
 #if !BUILDFLAG(IS_ANDROID)
@@ -84,8 +83,6 @@ class AdsTabHelper : public content::WebContentsObserver,
 
   SessionID tab_id_;
   raw_ptr<AdsService> ads_service_ = nullptr;  // NOT OWNED
-  raw_ptr<SearchResultAdService> search_result_ad_service_ =
-      nullptr;  // NOT OWNED
   bool is_active_ = false;
   bool is_browser_active_ = true;
   std::vector<GURL> redirect_chain_;