diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc index 8a010d4f6b31..3e90af8f9eb3 100644 --- a/browser/brave_local_state_prefs.cc +++ b/browser/brave_local_state_prefs.cc @@ -14,7 +14,7 @@ #include "brave/components/brave_referrals/buildflags/buildflags.h" #include "brave/components/brave_shields/browser/ad_block_service.h" #include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" +#include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" #include "brave/components/p3a/brave_p3a_service.h" #include "brave/components/p3a/buildflags.h" #include "chrome/browser/first_run/first_run.h" @@ -45,7 +45,8 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { brave_shields::RegisterPrefsForAdBlockService(registry); RegisterPrefsForBraveStatsUpdater(registry); registry->RegisterBooleanPref(kRemoteDebuggingEnabled, false); - ntp_background_images::RegisterLocalStatePrefs(registry); + ntp_background_images::NTPBackgroundImagesService::RegisterLocalStatePrefs( + registry); #if BUILDFLAG(ENABLE_BRAVE_REFERRALS) RegisterPrefsForBraveReferralsService(registry); #endif diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 54585e995fbc..b5298e781e94 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -15,7 +15,6 @@ #include "brave/components/brave_wallet/browser/buildflags/buildflags.h" #include "brave/components/brave_wayback_machine/buildflags.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" #include "brave/components/speedreader/buildflags.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/components/ntp_background_images/browser/BUILD.gn b/components/ntp_background_images/browser/BUILD.gn index 48a775713a9a..69d079858f0a 100644 --- a/components/ntp_background_images/browser/BUILD.gn +++ b/components/ntp_background_images/browser/BUILD.gn @@ -10,8 +10,6 @@ static_library("browser") { "ntp_background_images_service.h", "ntp_background_images_source.cc", "ntp_background_images_source.h", - "ntp_background_images_utils.cc", - "ntp_background_images_utils.h", "sponsored_images_component_data.cc", "sponsored_images_component_data.h", "switches.cc", diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc index 3e3cf2e8e5b1..4b2867908793 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service.cc @@ -24,20 +24,19 @@ #include "brave/components/ntp_background_images/browser/ntp_background_images_component_installer.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_source.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" #include "brave/components/ntp_background_images/browser/sponsored_images_component_data.h" #include "brave/components/ntp_background_images/browser/switches.h" #include "brave/components/ntp_background_images/browser/url_constants.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "components/component_updater/component_updater_service.h" +#include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" namespace ntp_background_images { namespace { -constexpr char kNTPSIManifestFile[] = "photo.json"; -constexpr char kNTPSRManifestFile[] = "data.json"; +constexpr char kNTPManifestFile[] = "photo.json"; constexpr char kNTPSRMappingTableFile[] = "mapping-table.json"; constexpr char kNTPSRMappingTableComponentPublicKey[] = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp7IWv7wzH/KLrxx7BKWOIIUMDylQNzxwM5Fig2WHc16BoMW9Kaya/g17Bpfp0YIvxdcmDBcB9kFALqQLxi1WQfa9d7YxqcmAGUKo407RMwEa6dQVkIPMFz2ZPGSfFgr526gYOqWh3Q4h8oN94qxBLgFyT25SMK5zQDGyq96ntME4MQRNwpDBUv7DDK7Npwe9iE8cBgzYTvf0taAFn2ZZi1RhS0RzpdynucpKosnc0sVBLTXy+HDvnMr+77T48zM0YmpjIh8Qmrp9CNbKzZUsZzNfnHpL9IZnjwQ51EOYdPGX2r1obChVZN19HzpK5scZEMRKoCMfCepWpEkMSIoPzQIDAQAB"; // NOLINT @@ -84,17 +83,7 @@ std::string HandleComponentData( const base::FilePath& installed_dir, const base::FilePath& super_referral_cache_dir, bool is_super_referral) { - const auto ntp_si_manifest_path = - installed_dir.AppendASCII(kNTPSIManifestFile); - const auto ntp_sr_manifest_path = - installed_dir.AppendASCII(kNTPSRManifestFile); - - base::FilePath json_path; - if (base::PathExists(ntp_si_manifest_path)) - json_path = ntp_si_manifest_path; - else if (base::PathExists(ntp_sr_manifest_path)) - json_path = ntp_sr_manifest_path; - + base::FilePath json_path = installed_dir.AppendASCII(kNTPManifestFile); std::string contents; if (json_path.empty()) { @@ -117,6 +106,21 @@ std::string HandleComponentData( } // namespace +// static +void NTPBackgroundImagesService::RegisterLocalStatePrefs( + PrefRegistrySimple* registry) { + registry->RegisterDictionaryPref( + prefs::kNewTabPageCachedSuperReferralComponentInfo); + registry->RegisterStringPref( + prefs::kNewTabPageCachedSuperReferralComponentData, std::string()); + registry->RegisterStringPref( + prefs::kNewTabPageCachedSuperReferralCode, std::string()); + registry->RegisterListPref( + prefs::kNewTabPageCachedSuperReferralFaviconList); + registry->RegisterBooleanPref( + prefs::kNewTabPageGetInitialSRComponentInProgress, false); +} + NTPBackgroundImagesService::NTPBackgroundImagesService( component_updater::ComponentUpdateService* cus, PrefService* local_pref, @@ -538,6 +542,21 @@ void NTPBackgroundImagesService::RestoreCachedTopSitesFaviconList() { cached_top_site_favicon_list_.push_back(file.GetString()); } +bool NTPBackgroundImagesService::IsValidSuperReferralComponentInfo( + const base::Value& component_info) const { + if (!component_info.is_dict()) + return false; + + if (!component_info.FindStringKey(kPublicKey)) + return false; + if (!component_info.FindStringKey(kComponentID)) + return false; + if (!component_info.FindStringKey(kThemeName)) + return false; + + return true; +} + std::vector NTPBackgroundImagesService::GetCachedTopSitesFaviconList() const { return cached_top_site_favicon_list_; diff --git a/components/ntp_background_images/browser/ntp_background_images_service.h b/components/ntp_background_images/browser/ntp_background_images_service.h index 44099befa7a2..5b059259b44c 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.h +++ b/components/ntp_background_images/browser/ntp_background_images_service.h @@ -22,6 +22,7 @@ namespace component_updater { class ComponentUpdateService; } // namespace component_updater +class PrefRegistrySimple; class PrefService; namespace ntp_background_images { @@ -38,6 +39,8 @@ class NTPBackgroundImagesService { virtual ~Observer() {} }; + static void RegisterLocalStatePrefs(PrefRegistrySimple* registry); + NTPBackgroundImagesService( component_updater::ComponentUpdateService* cus, PrefService* local_pref, @@ -111,6 +114,8 @@ class NTPBackgroundImagesService { void OnGetMappingTableData(const std::string& json_string); std::string GetReferralPromoCode() const; + bool IsValidSuperReferralComponentInfo( + const base::Value& component_info) const; void CacheTopSitesFaviconList(); void RestoreCachedTopSitesFaviconList(); diff --git a/components/ntp_background_images/browser/ntp_background_images_service_unittest.cc b/components/ntp_background_images/browser/ntp_background_images_service_unittest.cc index 1aedb886153e..d5bd0c70ff69 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service_unittest.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service_unittest.cc @@ -12,7 +12,6 @@ #include "brave/components/brave_referrals/browser/brave_referrals_service.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" @@ -116,7 +115,7 @@ class NTPBackgroundImagesServiceTest : public testing::Test { void SetUp() override { auto* registry = pref_service_.registry(); - RegisterLocalStatePrefs(registry); + NTPBackgroundImagesService::RegisterLocalStatePrefs(registry); brave::RegisterPrefsForBraveReferralsService(registry); } @@ -398,7 +397,7 @@ TEST_F(NTPBackgroundImagesServiceTest, WithSuperReferralCodeTest) { EXPECT_TRUE(service_->mapping_table_requested_); EXPECT_FALSE(service_->marked_this_install_is_not_super_referral_forever_); - EXPECT_FALSE(IsValidSuperReferralComponentInfo(*pref_service_.Get( + EXPECT_FALSE(service_->IsValidSuperReferralComponentInfo(*pref_service_.Get( prefs::kNewTabPageCachedSuperReferralComponentInfo))); service_->OnGetMappingTableData(kTestMappingTable); EXPECT_TRUE(pref_service_.GetBoolean( @@ -417,7 +416,7 @@ TEST_F(NTPBackgroundImagesServiceTest, WithSuperReferralCodeTest) { EXPECT_FALSE(pref_service_.GetBoolean( prefs::kNewTabPageGetInitialSRComponentInProgress)); auto* data = service_->GetBackgroundImagesData(true); - EXPECT_TRUE(IsValidSuperReferralComponentInfo(*pref_service_.Get( + EXPECT_TRUE(service_->IsValidSuperReferralComponentInfo(*pref_service_.Get( prefs::kNewTabPageCachedSuperReferralComponentInfo))); EXPECT_TRUE(data->IsSuperReferral()); EXPECT_FALSE(pref_service_.GetString( @@ -427,7 +426,7 @@ TEST_F(NTPBackgroundImagesServiceTest, WithSuperReferralCodeTest) { service_->OnGetComponentJsonData(true, kTestEmptyComponent); EXPECT_TRUE(pref_service_.GetString( prefs::kNewTabPageCachedSuperReferralCode).empty()); - EXPECT_FALSE(IsValidSuperReferralComponentInfo(*pref_service_.Get( + EXPECT_FALSE(service_->IsValidSuperReferralComponentInfo(*pref_service_.Get( prefs::kNewTabPageCachedSuperReferralComponentInfo))); EXPECT_TRUE(pref_service_.GetString( prefs::kNewTabPageCachedSuperReferralComponentData).empty()); diff --git a/components/ntp_background_images/browser/ntp_background_images_source_unittest.cc b/components/ntp_background_images/browser/ntp_background_images_source_unittest.cc index 9e5726575f2f..fbd082a9fe69 100644 --- a/components/ntp_background_images/browser/ntp_background_images_source_unittest.cc +++ b/components/ntp_background_images/browser/ntp_background_images_source_unittest.cc @@ -12,7 +12,6 @@ #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_source.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,7 +24,7 @@ class NTPBackgroundImagesSourceTest : public testing::Test { void SetUp() override { auto* registry = local_pref_.registry(); - ntp_background_images::RegisterLocalStatePrefs(registry); + NTPBackgroundImagesService::RegisterLocalStatePrefs(registry); brave::RegisterPrefsForBraveReferralsService(registry); service_.reset(new NTPBackgroundImagesService( nullptr, &local_pref_, base::FilePath())); diff --git a/components/ntp_background_images/browser/ntp_background_images_utils.cc b/components/ntp_background_images/browser/ntp_background_images_utils.cc deleted file mode 100644 index 0cc1692be0ed..000000000000 --- a/components/ntp_background_images/browser/ntp_background_images_utils.cc +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2020 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. - -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" - -#include - -#include "brave/components/ntp_background_images/browser/url_constants.h" -#include "brave/components/ntp_background_images/common/pref_names.h" -#include "components/prefs/pref_registry_simple.h" - -namespace ntp_background_images { - -void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { - registry->RegisterDictionaryPref( - prefs::kNewTabPageCachedSuperReferralComponentInfo); - registry->RegisterStringPref( - prefs::kNewTabPageCachedSuperReferralComponentData, std::string()); - registry->RegisterStringPref( - prefs::kNewTabPageCachedSuperReferralCode, std::string()); - registry->RegisterListPref( - prefs::kNewTabPageCachedSuperReferralFaviconList); - registry->RegisterBooleanPref( - prefs::kNewTabPageGetInitialSRComponentInProgress, false); -} - -bool IsValidSuperReferralComponentInfo(const base::Value& component_info) { - if (!component_info.is_dict()) - return false; - - if (!component_info.FindStringKey(kPublicKey)) - return false; - if (!component_info.FindStringKey(kComponentID)) - return false; - if (!component_info.FindStringKey(kThemeName)) - return false; - - return true; -} - -} // namespace ntp_background_images diff --git a/components/ntp_background_images/browser/ntp_background_images_utils.h b/components/ntp_background_images/browser/ntp_background_images_utils.h deleted file mode 100644 index e07b63ebec4b..000000000000 --- a/components/ntp_background_images/browser/ntp_background_images_utils.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2020 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. - -#ifndef BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_UTILS_H_ -#define BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_UTILS_H_ - -#include - -#include "base/values.h" - -class PrefRegistrySimple; - -namespace ntp_background_images { - -void RegisterLocalStatePrefs(PrefRegistrySimple* registry); -bool IsValidSuperReferralComponentInfo(const base::Value& component_info); - -} // namespace ntp_background_images - -#endif // BRAVE_COMPONENTS_NTP_BACKGROUND_IMAGES_BROWSER_NTP_BACKGROUND_IMAGES_UTILS_H_ diff --git a/components/ntp_background_images/browser/view_counter_service_unittest.cc b/components/ntp_background_images/browser/view_counter_service_unittest.cc index a82b2d5dd220..f8fbf4c39460 100644 --- a/components/ntp_background_images/browser/view_counter_service_unittest.cc +++ b/components/ntp_background_images/browser/view_counter_service_unittest.cc @@ -12,7 +12,6 @@ #include "brave/components/brave_referrals/browser/brave_referrals_service.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" -#include "brave/components/ntp_background_images/browser/ntp_background_images_utils.h" #include "brave/components/ntp_background_images/browser/view_counter_service.h" #include "brave/components/ntp_background_images/common/pref_names.h" #include "components/prefs/testing_pref_service.h" @@ -58,7 +57,7 @@ class NTPBackgroundImagesViewCounterTest : public testing::Test { ViewCounterService::RegisterProfilePrefs(registry); auto* local_registry = local_pref_.registry(); brave::RegisterPrefsForBraveReferralsService(local_registry); - RegisterLocalStatePrefs(local_registry); + NTPBackgroundImagesService::RegisterLocalStatePrefs(local_registry); service_ = std::make_unique( nullptr,