don't fire notifications on initialization

fix brave/brave-browser#9481
brave · Jul 21, 2020 · 6e1d820 · 6e1d820
1 parent f17da73
commit 6e1d820
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc
@@ -114,6 +114,7 @@ BravePrefProvider::BravePrefProvider(PrefService* prefs,
                                      bool store_last_modified,
                                      bool restore_session)
     : PrefProvider(prefs, off_the_record, store_last_modified, restore_session),
+      initialized_(false),
       weak_factory_(this) {
   brave_pref_change_registrar_.Init(prefs_);
   brave_pref_change_registrar_.Add(
@@ -138,8 +139,9 @@ BravePrefProvider::BravePrefProvider(PrefService* prefs,
 
   MigrateShieldsSettings(off_the_record);
 
-  AddObserver(this);
   OnCookieSettingsChanged(ContentSettingsType::PLUGINS);
+  initialized_ = true;
+  AddObserver(this);
 }
 
 BravePrefProvider::~BravePrefProvider() {}
@@ -442,7 +444,7 @@ void BravePrefProvider::UpdateCookieRules(ContentSettingsType content_type,
   }
 
   // Notify brave cookie changes as ContentSettingsType::COOKIES
-  if (content_type == ContentSettingsType::PLUGINS) {
+  if (initialized_ && content_type == ContentSettingsType::PLUGINS) {
     // PostTask here to avoid content settings autolock DCHECK
     base::PostTask(
         FROM_HERE,

diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.h b/components/content_settings/core/browser/brave_content_settings_pref_provider.h
@@ -75,6 +75,8 @@ class BravePrefProvider : public PrefProvider,
   std::map<bool /* is_incognito */, std::vector<Rule>> cookie_rules_;
   std::map<bool /* is_incognito */, std::vector<Rule>> brave_cookie_rules_;
 
+  bool initialized_;
+
   base::WeakPtrFactory<BravePrefProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BravePrefProvider);