Merge pull request #5283 from brave/ntp_super_referral_images2

Reflect referrals service change to ntp background images service

Author: simonhong

.github/CODEOWNERS

@@ -49,3 +49,6 @@ script/brave_license_helper.py @fmarier
 # Crypto Wallets
 browser/brave_wallet/ @bbondy @ryanml
 components/brave_wallet/ @bbondy @ryanml
+
+# Brave Referrals Service
+components/brave_referrals/browser/brave_referrals_service* @simonhong

components/ntp_background_images/browser/ntp_background_images_service.cc

@@ -218,22 +218,20 @@ void NTPBackgroundImagesService::CheckSuperReferralComponent() {
     // If not, this install will be act as a non SR install forever.
     // To resolve that situation,
     // |kNewTabPageGetInitialSRComponentInProgress| introduced.
-    // If |kReferralCheckedForPromoCodeFile| is true and
-    // |kNewTabPageCheckingMappingTableInProgress| is false, this means not
-    // first launch. So, we can mark this install as non-SR.
-    // If both |kReferralCheckedForPromoCodeFile| and
-    // |kNewTabPageCheckingMappingTableInProgress| are true, browser had some
-    // trouble at first launch.
+    // If |kReferralCheckedForPromoCodeFile| or |kReferralInitialization|
+    // is true and |kNewTabPageCheckingMappingTableInProgress| is false,
+    // this means not first launch. Then, we can mark this install as non-SR.
+    // If both (|kReferralCheckedForPromoCodeFile| or |kReferralInitialization|)
+    // and |kNewTabPageCheckingMappingTableInProgress| are true,
+    // browser had some trouble at first run.
     // If |kNewTabPageGetInitialSRComponentInProgress| is true, we assume that
-    // initial component downloading is not finished properly.
+    // initial component downloading is in-progress
     // So, We will try initialization again.
     // If referral code is non empty, that means browser is shutdown after
     // getting referal code. In this case, we should start downloading mapping
     // table.
-    // If both |kReferralCheckedForPromoCodeFile| and
-    // |kNewTabPageCheckingMappingTableInProgress| are true, browser had some
-    // troublewhile getting mapping table at first fresh launch.
-    if (local_pref_->GetBoolean(kReferralCheckedForPromoCodeFile) &&
+    if ((local_pref_->GetBoolean(kReferralCheckedForPromoCodeFile) ||
+         local_pref_->GetBoolean(kReferralInitialization)) &&
         !local_pref_->GetBoolean(
              prefs::kNewTabPageGetInitialSRComponentInProgress)) {
       MarkThisInstallIsNotSuperReferralForever();

components/ntp_background_images/browser/ntp_background_images_service_unittest.cc

@@ -142,6 +142,7 @@ TEST_F(NTPBackgroundImagesServiceTest, InternalDataTest) {
   service_->AddObserver(&observer);
 
   pref_service_.SetBoolean(kReferralCheckedForPromoCodeFile, true);
+  pref_service_.SetBoolean(kReferralInitialization, true);
 
   // Check with json file w/o schema version with empty object.
   service_->si_images_data_.reset();
@@ -460,6 +461,7 @@ TEST_F(NTPBackgroundImagesServiceTest,
        CheckRecoverShutdownWhileMappingTableFetchingWithDefaultCode) {
   // Make this install has initialized super referral service.
   pref_service_.SetBoolean(kReferralCheckedForPromoCodeFile, true);
+  pref_service_.SetBoolean(kReferralInitialization, true);
   pref_service_.SetBoolean(
       prefs::kNewTabPageGetInitialSRComponentInProgress, true);
   pref_service_.SetString(kReferralPromoCode, "BRV001");
@@ -481,6 +483,7 @@ TEST_F(NTPBackgroundImagesServiceTest,
        CheckRecoverShutdownWhileMappingTableFetchingWithNonDefaultCode) {
   // Make this install has initialized super referral service.
   pref_service_.SetBoolean(kReferralCheckedForPromoCodeFile, true);
+  pref_service_.SetBoolean(kReferralInitialization, true);
   pref_service_.SetBoolean(
       prefs::kNewTabPageGetInitialSRComponentInProgress, true);
   pref_service_.SetString(kReferralPromoCode, "BRV003");