Fixes reduced delivery of Brave ads campaigns with subdivision targeting

Author: tmancey

vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications.cc

@@ -243,17 +243,17 @@ CreativeAdNotificationList EligibleAds::FilterIneligibleAds(
 
   CreativeAdNotificationList eligible_ads = ads;
 
+  eligible_ads = ApplyFrequencyCapping(
+      eligible_ads,
+      ShouldCapLastServedAd(creative_ads) ? last_served_ad_ : AdInfo(),
+      ad_events, browsing_history);
+
   eligible_ads = FilterSeenAdvertisersAndRoundRobinIfNeeded(
       eligible_ads, AdType::kAdNotification);
 
   eligible_ads =
       FilterSeenAdsAndRoundRobinIfNeeded(eligible_ads, AdType::kAdNotification);
 
-  eligible_ads = ApplyFrequencyCapping(
-      eligible_ads,
-      ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(),
-      ad_events, browsing_history);
-
   eligible_ads = PaceAds(eligible_ads);
 
   eligible_ads = PrioritizeAds(eligible_ads);

vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/inline_content_ads/eligible_inline_content_ads.cc

@@ -254,17 +254,17 @@ CreativeInlineContentAdList EligibleAds::FilterIneligibleAds(
 
   CreativeInlineContentAdList eligible_ads = ads;
 
+  eligible_ads = ApplyFrequencyCapping(
+      eligible_ads,
+      ShouldCapLastServedAd(creative_ads) ? last_served_ad_ : AdInfo(),
+      ad_events, browsing_history);
+
   eligible_ads = FilterSeenAdvertisersAndRoundRobinIfNeeded(
       eligible_ads, AdType::kInlineContentAd);
 
   eligible_ads = FilterSeenAdsAndRoundRobinIfNeeded(eligible_ads,
                                                     AdType::kInlineContentAd);
 
-  eligible_ads = ApplyFrequencyCapping(
-      eligible_ads,
-      ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(),
-      ad_events, browsing_history);
-
   eligible_ads = PaceAds(eligible_ads);
 
   eligible_ads = PrioritizeAds(eligible_ads);

vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_ads.h

@@ -10,20 +10,19 @@
 #include <string>
 
 #include "bat/ads/internal/bundle/creative_ad_info.h"
-#include "bat/ads/internal/frequency_capping/exclusion_rules/split_test_frequency_cap.h"
 
 namespace ads {
 
 template <typename T>
 T FilterSeenAds(const T& ads, const std::map<std::string, bool>& seen_ads) {
   T unseen_ads = ads;
 
-  const auto iter = std::remove_if(
-      unseen_ads.begin(), unseen_ads.end(), [&seen_ads](CreativeAdInfo& ad) {
-        SplitTestFrequencyCap frequency_cap;
-        return frequency_cap.ShouldExclude(ad) ||
-               seen_ads.find(ad.creative_instance_id) != seen_ads.end();
-      });
+  const auto iter =
+      std::remove_if(unseen_ads.begin(), unseen_ads.end(),
+                     [&seen_ads](const CreativeAdInfo& creative_ad) {
+                       return seen_ads.find(creative_ad.creative_instance_id) !=
+                              seen_ads.end();
+                     });
 
   unseen_ads.erase(iter, unseen_ads.end());
 

vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_advertisers.h

@@ -10,7 +10,6 @@
 #include <string>
 
 #include "bat/ads/internal/bundle/creative_ad_info.h"
-#include "bat/ads/internal/frequency_capping/exclusion_rules/split_test_frequency_cap.h"
 
 namespace ads {
 
@@ -19,14 +18,12 @@ T FilterSeenAdvertisers(const T& ads,
                         const std::map<std::string, bool>& seen_advertisers) {
   T unseen_advertisers = ads;
 
-  const auto iter =
-      std::remove_if(unseen_advertisers.begin(), unseen_advertisers.end(),
-                     [&seen_advertisers](CreativeAdInfo& ad) {
-                       SplitTestFrequencyCap frequency_cap;
-                       return frequency_cap.ShouldExclude(ad) ||
-                              seen_advertisers.find(ad.advertiser_id) !=
-                                  seen_advertisers.end();
-                     });
+  const auto iter = std::remove_if(
+      unseen_advertisers.begin(), unseen_advertisers.end(),
+      [&seen_advertisers](const CreativeAdInfo& creative_ad) {
+        return seen_advertisers.find(creative_ad.advertiser_id) !=
+               seen_advertisers.end();
+      });
 
   unseen_advertisers.erase(iter, unseen_advertisers.end());