From ac5fab7747d0f43ebf9097c2b8757268fe0b5ef7 Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Thu, 24 Mar 2022 02:03:14 +0000
Subject: [PATCH] Uplift of #12694 (squashed) to beta

---
 .../settings/brave_overrides/privacy_page.js          | 11 -----------
 .../brave_personalization_options.html                |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/browser/resources/settings/brave_overrides/privacy_page.js b/browser/resources/settings/brave_overrides/privacy_page.js
index 32a771ed33f1..3af2e3bfdf0e 100644
--- a/browser/resources/settings/brave_overrides/privacy_page.js
+++ b/browser/resources/settings/brave_overrides/privacy_page.js
@@ -36,17 +36,6 @@ RegisterPolymerTemplateModifications({
           </settings-subpage>
         </template>
       `)
-      const isDeAmpFeatureEnabled = loadTimeData.getBoolean('isDeAmpFeatureEnabled')
-      if (isDeAmpFeatureEnabled) {
-        pages.insertAdjacentHTML("afterend", `
-          <settings-toggle-button
-            class="hr"
-            pref="{{prefs.brave.de_amp.enabled}}"
-            label="${I18nBehavior.i18n("deAmpSettingLabel")}"
-            sub-label="${I18nBehavior.i18n("deAmpSettingSubLabel")}">
-          </settings-toggle-button>
-      `);
-      }
       const isNativeBraveWalletEnabled = loadTimeData.getBoolean('isNativeBraveWalletFeatureEnabled')
       if (isNativeBraveWalletEnabled) {
         pages.insertAdjacentHTML('beforeend', `
diff --git a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
index 0114cfe2c087..0e25b302314f 100644
--- a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
+++ b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
@@ -54,6 +54,12 @@
         sub-label="$i18n{statsUsagePingEnabledDesc}"
         on-settings-boolean-control-change="onStatsUsagePingEnabledChange_">
     </settings-toggle-button>
+    <settings-toggle-button
+        class="cr-row"
+        pref="{{prefs.brave.de_amp.enabled}}"
+        label="$i18n{deAmpSettingLabel}"
+        sub-label="$i18n{deAmpSettingSubLabel}">
+    </settings-toggle-button>
   </template>
   <script src="brave_personalization_options.js"></script>
 </dom-module>