Handle SI by bat-native-ads library.

Author: aseren

browser/brave_ads/ads_service_impl.cc

@@ -37,6 +37,7 @@
 #include "bat/ads/ads.h"
 #include "bat/ads/ads_history_info.h"
 #include "bat/ads/inline_content_ad_info.h"
+#include "bat/ads/new_tab_page_ad_info.h"
 #include "bat/ads/pref_names.h"
 #include "bat/ads/resources/grit/bat_ads_resources.h"
 #include "bat/ads/statement_info.h"
@@ -683,13 +684,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_);
+
+  PrefetchNewTabPageAd();
+
+  PurgeOrphanedAdEventsForType(ads::mojom::AdType::kNewTabPageAd);
+
+  file_task_runner_->PostTask(
+      FROM_HERE, base::BindOnce(&RemoveDeprecatedAdsDataFiles, base_path_));
+}
+
 void AdsServiceImpl::ShutdownBatAds() {
   if (!connected()) {
     return;
@@ -1107,6 +1118,22 @@ void AdsServiceImpl::OnOpenNewTabWithAd(const std::string& json) {
   OpenNewTabWithUrl(notification.target_url);
 }
 
+absl::optional<std::string> AdsServiceImpl::GetPrefetchedNewTabPageAd() {
+  if (!connected()) {
+    return absl::nullopt;
+  }
+
+  absl::optional<std::string> 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,
@@ -1212,6 +1239,25 @@ 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;
+  }
+
+  prefetched_new_tab_page_ad_info_ = json;
+}
+
 void AdsServiceImpl::OnURLRequestStarted(
     const GURL& final_url,
     const network::mojom::URLResponseHead& response_head) {

browser/brave_ads/ads_service_impl.h

@@ -17,9 +17,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
+#include "base/values.h"
 #include "bat/ads/ads.h"
 #include "bat/ads/ads_client.h"
 #include "bat/ads/database.h"
+#include "bat/ads/new_tab_page_ad_info.h"
 #include "bat/ads/public/interfaces/ads.mojom.h"
 #include "bat/ledger/mojom_structs.h"
 #include "brave/browser/brave_ads/background_helper/background_helper.h"
@@ -163,6 +165,8 @@ class AdsServiceImpl : public AdsService,
       const std::string& creative_instance_id,
       const ads::mojom::InlineContentAdEventType event_type) override;
 
+  absl::optional<std::string> GetPrefetchedNewTabPageAd() override;
+
   void PurgeOrphanedAdEventsForType(const ads::mojom::AdType ad_type) override;
 
   void GetAdsHistory(const double from_timestamp,
@@ -207,6 +211,7 @@ class AdsServiceImpl : public AdsService,
   void OnCreate();
 
   void OnInitialize(const bool success);
+  void SetupOnFirstInitialize();
 
   void ShutdownBatAds();
   void OnShutdownBatAds(const bool success);
@@ -254,6 +259,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);
@@ -463,7 +472,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_;
 
@@ -484,6 +493,8 @@ class AdsServiceImpl : public AdsService,
 
   std::unique_ptr<ads::Database> database_;
 
+  absl::optional<std::string> prefetched_new_tab_page_ad_info_;
+
   ui::IdleState last_idle_state_;
   int last_idle_time_;
 

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 =
@@ -172,6 +169,10 @@ NTPBackgroundImagesBridge::CreateBrandedWallpaper(base::Value* data) {
   auto* creative_instance_id =
       data->FindStringKey(ntp_background_images::kCreativeInstanceIDKey);
 
+  const std::string wallpaper_id = base::GenerateGUID();
+  view_counter_service_->BrandedWallpaperWillBeDisplayed(wallpaper_id,
+                                                         creative_instance_id);
+
   return Java_NTPBackgroundImagesBridge_createBrandedWallpaper(
       env, ConvertUTF8ToJavaString(env, *image_path), focal_point_x,
       focal_point_y, ConvertUTF8ToJavaString(env, *logo_image_path),

browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc

@@ -573,7 +573,7 @@ void BraveNewTabMessageHandler::HandleGetWallpaperData(
     return;
   }
 
-  auto data = service->GetCurrentWallpaperForDisplay();
+  base::Value data = service->GetCurrentWallpaperForDisplay();
 
   if (!data.is_dict()) {
     ResolveJavascriptCallback(args[0], std::move(wallpaper));
@@ -591,11 +591,14 @@ void BraveNewTabMessageHandler::HandleGetWallpaperData(
     return;
   }
 
-  constexpr char kBrandedWallpaperKey[] = "brandedWallpaper";
+  const std::string* creative_instance_id =
+      data.FindStringKey(ntp_background_images::kCreativeInstanceIDKey);
   const std::string wallpaper_id = base::GenerateGUID();
+  service->BrandedWallpaperWillBeDisplayed(wallpaper_id, creative_instance_id);
+
+  constexpr char kBrandedWallpaperKey[] = "brandedWallpaper";
   data.SetStringKey(ntp_background_images::kWallpaperIDKey, wallpaper_id);
   wallpaper.SetKey(kBrandedWallpaperKey, std::move(data));
-  service->BrandedWallpaperWillBeDisplayed(wallpaper_id);
   ResolveJavascriptCallback(args[0], std::move(wallpaper));
 }
 

browser/ui/webui/new_tab_page/brave_new_tab_message_handler.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
+#include "base/values.h"
 #include "brave/components/tor/buildflags/buildflags.h"
 #include "brave/components/tor/tor_launcher_observer.h"
 #include "components/prefs/pref_change_registrar.h"

components/brave_ads/browser/ads_service.h

@@ -20,13 +20,10 @@
 #include "components/sessions/core/session_id.h"
 #include "url/gurl.h"
 
-namespace ads {
-struct AdsHistoryInfo;
-}
-
 namespace base {
 class DictionaryValue;
 class ListValue;
+class Value;
 }
 
 namespace user_prefs {
@@ -142,6 +139,8 @@ class AdsService : public KeyedService {
       const std::string& creative_instance_id,
       const ads::mojom::InlineContentAdEventType event_type) = 0;
 
+  virtual absl::optional<std::string> GetPrefetchedNewTabPageAd() = 0;
+
   virtual void PurgeOrphanedAdEventsForType(
       const ads::mojom::AdType ad_type) = 0;
 

components/brave_ads/common/features.cc

@@ -23,6 +23,9 @@ const base::Feature kAllowedToFallbackToCustomAdNotifications{
 const base::Feature kRequestAdsEnabledApi{"RequestAdsEnabledApi",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kNewTabPageSponsoredImageAds{
+    "NewTabPageSponsoredImageAds", base::FEATURE_ENABLED_BY_DEFAULT};
+
 namespace {
 
 // Set to true to support multiple displays or false to only support the primary

components/brave_ads/common/features.h

@@ -41,6 +41,8 @@ bool IsAllowedToFallbackToCustomAdNotificationsEnabled();
 extern const base::Feature kRequestAdsEnabledApi;
 bool IsRequestAdsEnabledApiEnabled();
 
+extern const base::Feature kNewTabPageSponsoredImageAds;
+
 }  // namespace features
 }  // namespace brave_ads
 

components/ntp_background_images/browser/ntp_sponsored_images_data.cc

@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/notreached.h"
 #include "base/strings/stringprintf.h"
+#include "bat/ads/new_tab_page_ad_info.h"
 #include "brave/components/ntp_background_images/browser/url_constants.h"
 #include "content/public/common/url_constants.h"
 
@@ -196,6 +197,10 @@ Campaign NTPSponsoredImagesData::GetCampaignFromValue(
 
   Campaign campaign;
 
+  if (const std::string* campaign_id = value.FindStringKey(kCampaignIdKey)) {
+    campaign.campaign_id = *campaign_id;
+  }
+
   Logo default_logo;
   if (auto* logo = value.FindDictKey(kLogoKey)) {
     default_logo = GetLogoFromValue(installed_dir, url_prefix, logo);
@@ -287,11 +292,11 @@ base::Value NTPSponsoredImagesData::GetBackgroundAt(size_t campaign_index,
   DCHECK(campaign_index < campaigns.size() && background_index >= 0 &&
          background_index < campaigns[campaign_index].backgrounds.size());
 
-  base::Value data(base::Value::Type::DICTIONARY);
   const auto campaign = campaigns[campaign_index];
   if (!campaign.IsValid())
-    return data;
+    return base::Value();
 
+  base::Value data(base::Value::Type::DICTIONARY);
   data.SetStringKey(kThemeNameKey, theme_name);
   data.SetBoolKey(kIsSponsoredKey, !IsSuperReferral());
   data.SetBoolKey(kIsBackgroundKey, false);
@@ -324,6 +329,41 @@ base::Value NTPSponsoredImagesData::GetBackgroundAt(size_t campaign_index,
   return data;
 }
 
+base::Value NTPSponsoredImagesData::GetBackgroundByAdInfo(
+    const ads::NewTabPageAdInfo& ad_info) {
+  // Find campaign
+  LOG(ERROR) << ad_info.campaign_id;
+  size_t campaign_index = 0;
+  for (; campaign_index != campaigns.size(); ++campaign_index) {
+    LOG(ERROR) << campaigns[campaign_index].campaign_id;
+    if (campaigns[campaign_index].campaign_id == ad_info.campaign_id) {
+      break;
+    }
+  }
+  if (campaign_index == campaigns.size()) {
+    LOG(ERROR) << "Ad campaign wasn't found in NTP sposored images data: "
+               << ad_info.campaign_id;
+    return base::Value();
+  }
+
+  const auto& sponsored_backgrounds = campaigns[campaign_index].backgrounds;
+  size_t background_index = 0;
+  for (; background_index != sponsored_backgrounds.size(); ++background_index) {
+    LOG(ERROR) << sponsored_backgrounds[background_index].creative_instance_id;
+    if (sponsored_backgrounds[background_index].creative_instance_id ==
+        ad_info.creative_instance_id) {
+      break;
+    }
+  }
+  if (background_index == sponsored_backgrounds.size()) {
+    LOG(ERROR) << "Creative instance wasn't found in NTP sposored images data: "
+               << ad_info.creative_instance_id;
+    return base::Value();
+  }
+
+  return GetBackgroundAt(campaign_index, background_index);
+}
+
 void NTPSponsoredImagesData::PrintCampaignsParsingResult() const {
   VLOG(2) << __func__ << ": This is "
           << (IsSuperReferral() ? " NTP SR Data" : " NTP SI Data");

components/ntp_background_images/browser/ntp_sponsored_images_data.h

@@ -16,6 +16,10 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
+namespace ads {
+struct NewTabPageAdInfo;
+}  // namespace ads
+
 namespace ntp_background_images {
 
 struct TopSite {
@@ -78,6 +82,7 @@ struct Campaign {
 
   bool IsValid() const;
 
+  std::string campaign_id;
   std::vector<SponsoredBackground> backgrounds;
 };
 
@@ -103,6 +108,7 @@ struct NTPSponsoredImagesData {
                          const base::FilePath& installed_dir);
 
   base::Value GetBackgroundAt(size_t campaign_index, size_t background_index);
+  base::Value GetBackgroundByAdInfo(const ads::NewTabPageAdInfo& ad_info);
 
   bool IsSuperReferral() const;
   void PrintCampaignsParsingResult() const;