Merge pull request #7549 from brave/ie_drop_fpv1

13443: Drop fingerprinting V1 shields settings.
brave · Jan 12, 2021 · eb7a674 · eb7a674
1 parent aed75a9
commit eb7a674
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/components/brave_shields/common/brave_shield_constants.h b/components/brave_shields/common/brave_shield_constants.h
@@ -27,6 +27,9 @@ const char kLinkedInEmbeds[] = "linked-in-embeds";
 const char kObsoleteAds[] = "ads";
 const char kObsoleteCookies[] = "cookies";
 
+// Some users were not properly migrated from fingerprinting V1.
+const char kObsoleteFingerprinting[] = "fingerprinting";
+
 }  // namespace brave_shields
 
 #endif  // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_CONSTANTS_H_
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
@@ -210,6 +210,19 @@ void BravePrefProvider::MigrateShieldsSettingsFromResourceIds() {
       for (base::DictionaryValue::Iterator j(*resource_dictionary);
            !j.IsAtEnd(); j.Advance()) {
         const std::string& resource_identifier(j.key());
+
+        if (resource_identifier == brave_shields::kObsoleteFingerprinting) {
+          // Just drop, because these preferences were not effective anyway.
+          continue;
+        }
+
+        // Drop a "global" value of brave shields, that actually shouldn't exist
+        // at all since we don't have any global toggle for this.
+        if (resource_identifier == brave_shields::kBraveShields &&
+            patterns_string == "*,*") {
+          continue;
+        }
+
         int setting = CONTENT_SETTING_DEFAULT;
         bool is_integer = j.value().GetAsInteger(&setting);
         DCHECK(is_integer);