Handle SI by bat-native-ads library.

fix brave/brave-browser#14015

Author: aseren

browser/brave_ads/ads_service_impl.cc

@@ -692,13 +692,23 @@ void AdsServiceImpl::OnInitialize(const bool success) {
 
   StartCheckIdleStateTimer();
 
-  if (!deprecated_data_files_removed_) {
-    deprecated_data_files_removed_ = true;
-    file_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&RemoveDeprecatedAdsDataFiles, base_path_));
+  if (!is_setup_on_first_initialize_done_) {
+    SetupOnFirstInitialize();
+    is_setup_on_first_initialize_done_ = true;
   }
 }
 
+void AdsServiceImpl::SetupOnFirstInitialize() {
+  DCHECK(!is_setup_on_first_initialize_done_);
+
+  PurgeOrphanedAdEventsForType(
+      ads::mojom::AdType::kNewTabPageAd,
+      base::BindOnce(&AdsServiceImpl::PrefetchNewTabPageAd, AsWeakPtr()));
+
+  file_task_runner_->PostTask(
+      FROM_HERE, base::BindOnce(&RemoveDeprecatedAdsDataFiles, base_path_));
+}
+
 void AdsServiceImpl::ShutdownBatAds() {
   if (!connected()) {
     return;
@@ -1116,6 +1126,23 @@ void AdsServiceImpl::OnOpenNewTabWithAd(const std::string& json) {
   OpenNewTabWithUrl(notification.target_url);
 }
 
+absl::optional<ads::NewTabPageAdInfo>
+AdsServiceImpl::GetPrefetchedNewTabPageAd() {
+  if (!connected()) {
+    return absl::nullopt;
+  }
+
+  absl::optional<ads::NewTabPageAdInfo> ad_info;
+  if (prefetched_new_tab_page_ad_info_) {
+    ad_info = prefetched_new_tab_page_ad_info_;
+    prefetched_new_tab_page_ad_info_.reset();
+  }
+
+  PrefetchNewTabPageAd();
+
+  return ad_info;
+}
+
 void AdsServiceImpl::OnNewTabPageAdEvent(
     const std::string& uuid,
     const std::string& creative_instance_id,
@@ -1162,12 +1189,13 @@ void AdsServiceImpl::OnInlineContentAdEvent(
 }
 
 void AdsServiceImpl::PurgeOrphanedAdEventsForType(
-    const ads::mojom::AdType ad_type) {
+    const ads::mojom::AdType ad_type,
+    base::OnceClosure callback) {
   if (!connected()) {
     return;
   }
 
-  bat_ads_->PurgeOrphanedAdEventsForType(ad_type);
+  bat_ads_->PurgeOrphanedAdEventsForType(ad_type, std::move(callback));
 }
 
 void AdsServiceImpl::RetryOpeningNewTabWithAd(const std::string& uuid) {
@@ -1221,6 +1249,28 @@ void AdsServiceImpl::RegisterResourceComponentsForLocale(
       locale);
 }
 
+void AdsServiceImpl::PrefetchNewTabPageAd() {
+  if (!connected()) {
+    prefetched_new_tab_page_ad_info_.reset();
+    return;
+  }
+
+  bat_ads_->GetNewTabPageAd(
+      base::BindOnce(&AdsServiceImpl::OnPrefetchNewTabPageAd, AsWeakPtr()));
+}
+
+void AdsServiceImpl::OnPrefetchNewTabPageAd(bool success,
+                                            const std::string& json) {
+  if (!success) {
+    prefetched_new_tab_page_ad_info_.reset();
+    return;
+  }
+
+  ads::NewTabPageAdInfo ad_info;
+  ad_info.FromJson(json);
+  prefetched_new_tab_page_ad_info_ = ad_info;
+}
+
 void AdsServiceImpl::OnURLRequestStarted(
     const GURL& final_url,
     const network::mojom::URLResponseHead& response_head) {

browser/brave_ads/ads_service_impl.h

@@ -175,7 +175,10 @@ class AdsServiceImpl : public AdsService,
       const std::string& creative_instance_id,
       const ads::mojom::InlineContentAdEventType event_type) override;
 
-  void PurgeOrphanedAdEventsForType(const ads::mojom::AdType ad_type) override;
+  absl::optional<ads::NewTabPageAdInfo> GetPrefetchedNewTabPageAd() override;
+
+  void PurgeOrphanedAdEventsForType(const ads::mojom::AdType ad_type,
+                                    base::OnceClosure callback) override;
 
   void GetAdsHistory(const double from_timestamp,
                      const double to_timestamp,
@@ -219,6 +222,7 @@ class AdsServiceImpl : public AdsService,
   void OnCreate();
 
   void OnInitialize(const bool success);
+  void SetupOnFirstInitialize();
 
   void ShutdownBatAds();
   void OnShutdownBatAds(const bool success);
@@ -266,6 +270,10 @@ class AdsServiceImpl : public AdsService,
 
   void RegisterResourceComponentsForLocale(const std::string& locale);
 
+  void PrefetchNewTabPageAd();
+
+  void OnPrefetchNewTabPageAd(bool success, const std::string& json);
+
   void OnURLRequestStarted(
       const GURL& final_url,
       const network::mojom::URLResponseHead& response_head);
@@ -480,7 +488,7 @@ class AdsServiceImpl : public AdsService,
 
   bool is_initialized_ = false;
 
-  bool deprecated_data_files_removed_ = false;
+  bool is_setup_on_first_initialize_done_ = false;
 
   bool is_upgrading_from_pre_brave_ads_build_;
 
@@ -501,6 +509,8 @@ class AdsServiceImpl : public AdsService,
 
   std::unique_ptr<ads::Database> database_;
 
+  absl::optional<ads::NewTabPageAdInfo> prefetched_new_tab_page_ad_info_;
+
   ui::IdleState last_idle_state_;
   int last_idle_time_;
 

browser/notifications/BUILD.gn

@@ -15,6 +15,7 @@ source_set("notifications") {
   deps = [
     "//base",
     "//brave/components/brave_adaptive_captcha/buildflags",
+    "//brave/vendor/bat-native-ads",
     "//chrome/browser/notifications",
     "//third_party/abseil-cpp:absl",
     "//url",

browser/ntp_background_images/android/ntp_background_images_bridge.cc

@@ -148,9 +148,6 @@ base::android::ScopedJavaLocalRef<jobject>
 NTPBackgroundImagesBridge::CreateBrandedWallpaper(base::Value* data) {
   JNIEnv* env = AttachCurrentThread();
 
-  const std::string wallpaper_id = base::GenerateGUID();
-  view_counter_service_->BrandedWallpaperWillBeDisplayed(wallpaper_id);
-
   auto* image_path =
       data->FindStringKey(ntp_background_images::kWallpaperImagePathKey);
   auto* logo_image_path =
@@ -171,6 +168,11 @@ NTPBackgroundImagesBridge::CreateBrandedWallpaper(base::Value* data) {
       data->FindBoolKey(ntp_background_images::kIsSponsoredKey).value_or(false);
   auto* creative_instance_id =
       data->FindStringKey(ntp_background_images::kCreativeInstanceIDKey);
+  const std::string* wallpaper_id =
+      data->FindStringKey(ntp_background_images::kWallpaperIDKey);
+
+  view_counter_service_->BrandedWallpaperWillBeDisplayed(wallpaper_id,
+                                                         creative_instance_id);
 
   return Java_NTPBackgroundImagesBridge_createBrandedWallpaper(
       env, ConvertUTF8ToJavaString(env, *image_path), focal_point_x,
@@ -180,7 +182,7 @@ NTPBackgroundImagesBridge::CreateBrandedWallpaper(base::Value* data) {
       ConvertUTF8ToJavaString(env, *theme_name), is_sponsored,
       ConvertUTF8ToJavaString(
           env, creative_instance_id ? *creative_instance_id : ""),
-      ConvertUTF8ToJavaString(env, wallpaper_id));
+      ConvertUTF8ToJavaString(env, wallpaper_id ? *wallpaper_id : ""));
 }
 
 void NTPBackgroundImagesBridge::GetTopSites(

browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc

@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "base/cxx17_backports.h"
-#include "base/guid.h"
 #include "base/json/json_writer.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
@@ -567,7 +566,7 @@ void BraveNewTabMessageHandler::HandleGetWallpaperData(
     return;
   }
 
-  auto data = service->GetCurrentWallpaperForDisplay();
+  base::Value data = service->GetCurrentWallpaperForDisplay();
 
   if (!data.is_dict()) {
     ResolveJavascriptCallback(args[0], std::move(wallpaper));
@@ -585,11 +584,14 @@ void BraveNewTabMessageHandler::HandleGetWallpaperData(
     return;
   }
 
+  const std::string* creative_instance_id =
+      data.FindStringKey(ntp_background_images::kCreativeInstanceIDKey);
+  const std::string* wallpaper_id =
+      data.FindStringKey(ntp_background_images::kWallpaperIDKey);
+  service->BrandedWallpaperWillBeDisplayed(wallpaper_id, creative_instance_id);
+
   constexpr char kBrandedWallpaperKey[] = "brandedWallpaper";
-  const std::string wallpaper_id = base::GenerateGUID();
-  data.SetStringKey(ntp_background_images::kWallpaperIDKey, wallpaper_id);
   wallpaper.SetKey(kBrandedWallpaperKey, std::move(data));
-  service->BrandedWallpaperWillBeDisplayed(wallpaper_id);
   ResolveJavascriptCallback(args[0], std::move(wallpaper));
 }
 

components/brave_ads/browser/ads_service.h

@@ -13,16 +13,13 @@
 #include "base/observer_list.h"
 #include "brave/components/brave_adaptive_captcha/buildflags/buildflags.h"
 #include "brave/components/brave_ads/browser/ads_service_observer.h"
+#include "brave/vendor/bat-native-ads/include/bat/ads/new_tab_page_ad_info.h"
 #include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
 #include "build/build_config.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/sessions/core/session_id.h"
 #include "url/gurl.h"
 
-namespace ads {
-struct AdsHistoryInfo;
-}
-
 namespace base {
 class DictionaryValue;
 class ListValue;
@@ -141,8 +138,10 @@ class AdsService : public KeyedService {
       const std::string& creative_instance_id,
       const ads::mojom::InlineContentAdEventType event_type) = 0;
 
-  virtual void PurgeOrphanedAdEventsForType(
-      const ads::mojom::AdType ad_type) = 0;
+  virtual absl::optional<ads::NewTabPageAdInfo> GetPrefetchedNewTabPageAd() = 0;
+
+  virtual void PurgeOrphanedAdEventsForType(const ads::mojom::AdType ad_type,
+                                            base::OnceClosure callback) = 0;
 
   virtual void GetAdsHistory(const double from_timestamp,
                              const double to_timestamp,

components/ntp_background_images/browser/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
-  "+bat/ads/pref_names.h",
-  "+bat/ads/public",
+  "+bat/ads",
   "+content/public/browser",
   "+content/public/common",
   "+third_party/skia",