From d6996b56a0bc8d0a5ee0106bd3d5c20456cf9795 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 4 May 2022 14:03:12 -0400
Subject: [PATCH] For #25113 - Remove showClearSiteData feature flag

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt         | 5 -----
 .../fenix/settings/quicksettings/ClearSiteDataView.kt       | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index b0bb982c9..eb385ed74 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -67,11 +67,6 @@ object FeatureFlags {
      */
     const val showHomeOnboarding = false
 
-    /**
-     * Enables showing the option to clear site data.
-     */
-    const val showClearSiteData = true
-
     /**
      * Enables history improvement features.
      */
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt
index c3b8e7cfa..5e388f46f 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt
@@ -18,7 +18,6 @@ import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.QuicksettingsClearSiteDataBinding
 import org.mozilla.fenix.ext.components
@@ -59,11 +58,6 @@ class ClearSiteDataView(
     )
 
     fun update(webInfoState: WebsiteInfoState) {
-        if (!FeatureFlags.showClearSiteData) {
-            setVisibility(false)
-            return
-        }
-
         websiteUrl = webInfoState.websiteUrl
 
         setVisibility(true)