From 5bdfb7423856136d501bd5412ad16d37103dda54 Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Tue, 28 Jan 2020 09:14:39 +0900 Subject: [PATCH] Store components data with unique folder If same folder name is used, other component can use it. Fix https://github.com/brave/brave-browser/issues/7946 --- .../browser/ntp_sponsored_images_component_installer.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/ntp_sponsored_images/browser/ntp_sponsored_images_component_installer.cc b/components/ntp_sponsored_images/browser/ntp_sponsored_images_component_installer.cc index dd72bbec2469..14d66f326bc9 100644 --- a/components/ntp_sponsored_images/browser/ntp_sponsored_images_component_installer.cc +++ b/components/ntp_sponsored_images/browser/ntp_sponsored_images_component_installer.cc @@ -24,7 +24,6 @@ using brave_component_updater::BraveOnDemandUpdater; namespace { constexpr char kNTPSponsoredImagesDisplayName[] = "NTP sponsored images"; -constexpr char kNTPSponsoredImagesBaseDirectory[] = "NTPSponsoredImages"; constexpr size_t kHashSize = 32; class NTPSponsoredImagesComponentInstallerPolicy @@ -54,6 +53,7 @@ class NTPSponsoredImagesComponentInstallerPolicy std::vector GetMimeTypes() const override; private: + const std::string component_id_; OnComponentReadyCallback ready_callback_; uint8_t component_hash_[kHashSize]; @@ -63,7 +63,8 @@ class NTPSponsoredImagesComponentInstallerPolicy NTPSponsoredImagesComponentInstallerPolicy:: NTPSponsoredImagesComponentInstallerPolicy( const RegionalComponentData& data, OnComponentReadyCallback callback) - : ready_callback_(callback) { + : component_id_(data.component_id), + ready_callback_(callback) { // Generate hash from public key. std::string decoded_public_key; base::Base64Decode(data.component_base64_public_key, &decoded_public_key); @@ -107,7 +108,7 @@ bool NTPSponsoredImagesComponentInstallerPolicy::VerifyInstallation( base::FilePath NTPSponsoredImagesComponentInstallerPolicy:: GetRelativeInstallDir() const { - return base::FilePath::FromUTF8Unsafe(kNTPSponsoredImagesBaseDirectory); + return base::FilePath::FromUTF8Unsafe(component_id_); } void NTPSponsoredImagesComponentInstallerPolicy::GetHash(