From c754ec2b83e5decbaa0a1d9fc4c5b48787f35544 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Mon, 31 Jul 2023 21:16:41 +0200
Subject: [PATCH 01/11] implemented history clearing handler + reset leo
 confirmation

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 app/brave_settings_strings.grdp               | 15 ++++-
 .../brave_browsing_data_remover_delegate.cc   | 12 ++++
 .../brave_browsing_data_remover_delegate.h    |  3 +
 .../brave_clear_browsing_data.cc              |  7 +++
 .../brave_clear_browsing_data_browsertest.cc  |  3 +
 .../api/settings_private/brave_prefs_util.cc  |  4 ++
 ...rave_clear_browsing_data_on_exit_page.html |  8 +++
 .../brave_clear_browsing_data_on_exit_page.ts |  6 ++
 .../brave_leo_assistant_page.ts               |  6 +-
 .../clear_browsing_data_dialog.ts             | 33 +++++++++++
 ...ave_settings_localized_strings_provider.cc |  6 ++
 .../chrome_browsing_data_remover_constants.h  | 18 ++++++
 .../settings_clear_browsing_data_handler.cc   | 11 ++++
 .../components/browsing_data/core/DEPS        |  3 +
 .../browsing_data/core/browsing_data_utils.cc | 57 +++++++++++++++++++
 .../browsing_data/core/browsing_data_utils.h  | 18 ++++++
 .../browsing_data/core/pref_names.cc          |  9 +++
 .../browsing_data/core/pref_names.h           |  7 ++-
 18 files changed, 223 insertions(+), 3 deletions(-)
 create mode 100644 chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
 create mode 100644 chromium_src/components/browsing_data/core/DEPS
 create mode 100644 chromium_src/components/browsing_data/core/browsing_data_utils.cc
 create mode 100644 chromium_src/components/browsing_data/core/browsing_data_utils.h

diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp
index 1f48049b3a26..82c2004bc6f2 100644
--- a/app/brave_settings_strings.grdp
+++ b/app/brave_settings_strings.grdp
@@ -1415,7 +1415,20 @@
   <message name="IDS_SETTINGS_LEO_ASSISTANT_RESET_AND_CLEAR_DATA_LABEL" desc="The text for settings option">
     Clear Leo data
   </message>
-  <!-- Avatars. Generated via zsh and node:
+  <message name="IDS_SETTINGS_LEO_ASSISTANT_RESET_AND_CLEAR_DATA_CONFIRMATION_LABEL" desc="The confirmation window message for reset option">
+    Resetting the Leo assistant will require you to opt-in to use Brave
+Leo in the future and will also clear your chat history. Clearing your
+chat history will delete all your previous conversations with Brave
+Leo. This action cannot be undone.
+  </message>
+  <message name="IDS_SETTINGS_LEO_ASSISTANT_CLEAR_HISTORY_DATA_LABEL" desc="The text for settings option">
+    Brave Leo
+  </message>
+  <message name="IDS_SETTINGS_LEO_ASSISTANT_CLEAR_HISTORY_DATA_SUBLABEL" desc="The text for settings option">
+    Data and chat history
+  </message>
+
+<!-- Avatars. Generated via zsh and node:
         declare -i a=56
         for file in $(cat < avatarlist); do node -e "console.log(\`<message name=\"IDS_BRAVE_AVATAR_LABEL_$a\" desc=\"The label for the $file avatar.\">
     \${\`$file\`.split('_').map(w => w[0].toUpperCase() + w.substr(1)).join(' ').replace('.png', '')}
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
index 6ff46d3b6173..85a93d3b2e47 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
@@ -70,6 +70,11 @@ void BraveBrowsingDataRemoverDelegate::RemoveEmbedderData(
     brave_news::BraveNewsControllerFactory::GetForContext(profile_)
         ->ClearHistory();
   }
+#if BUILDFLAG(ENABLE_AI_CHAT)
+  if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY) {
+    ClearAiChatHistory(delete_begin, delete_end);
+  }
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 }
 
 void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings(
@@ -101,6 +106,13 @@ void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings(
   }
 }
 
+#if BUILDFLAG(ENABLE_AI_CHAT)
+void BraveBrowsingDataRemoverDelegate::ClearAiChatHistory(base::Time begin_time,
+                                                          base::Time end_time) {
+  // Handler for the Brave Leo History clearing
+}
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #if BUILDFLAG(ENABLE_IPFS)
 void BraveBrowsingDataRemoverDelegate::WaitForIPFSRepoGC(
     base::Process process) {
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.h b/browser/browsing_data/brave_browsing_data_remover_delegate.h
index a33d31a69aef..8571fe13f8b4 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.h
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.h
@@ -49,6 +49,9 @@ class BraveBrowsingDataRemoverDelegate
                           override;
 
   void ClearShieldsSettings(base::Time begin_time, base::Time end_time);
+#if BUILDFLAG(ENABLE_AI_CHAT)
+  void ClearAiChatHistory(base::Time begin_time, base::Time end_time);
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)  
 #if BUILDFLAG(ENABLE_IPFS)
   void ClearIPFSCache();
   void WaitForIPFSRepoGC(base::Process process);
diff --git a/browser/browsing_data/brave_clear_browsing_data.cc b/browser/browsing_data/brave_clear_browsing_data.cc
index 43f43b18d2ba..4810f0bb54c3 100644
--- a/browser/browsing_data/brave_clear_browsing_data.cc
+++ b/browser/browsing_data/brave_clear_browsing_data.cc
@@ -11,6 +11,7 @@
 #include "base/run_loop.h"
 #include "base/scoped_multi_source_observation.h"
 #include "base/trace_event/trace_event.h"
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
 #include "chrome/browser/lifetime/browser_shutdown.h"
@@ -102,6 +103,12 @@ bool BrowsingDataRemovalWatcher::GetClearBrowsingDataOnExitSettings(
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit))
     *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS;
 
+#if BUILDFLAG(ENABLE_AI_CHAT)
+  if (prefs->GetBoolean(browsing_data::prefs::kDeleteBraveLeoHistoryOnExit)) {
+    *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY;
+  }
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
   return (*remove_mask != 0);
 }
 
diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
index 466dc2d38d51..b2475f2fdb76 100644
--- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
+++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
@@ -160,6 +160,8 @@ class BraveClearDataOnExitTest
                             true);
     prefService->SetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit,
                             true);
+    prefService->SetBoolean(browsing_data::prefs::kDeleteBraveLeoHistoryOnExit,
+                            true);
   }
 
   uint64_t GetRemoveMaskAll() {
@@ -169,6 +171,7 @@ class BraveClearDataOnExitTest
            chrome_browsing_data_remover::DATA_TYPE_SITE_DATA |
            chrome_browsing_data_remover::DATA_TYPE_PASSWORDS |
            chrome_browsing_data_remover::DATA_TYPE_FORM_DATA |
+           chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY |
            chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS;
   }
 
diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
index 737fd39c602f..5dcb4f18fd95 100644
--- a/browser/extensions/api/settings_private/brave_prefs_util.cc
+++ b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -221,6 +221,10 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteHostedAppsDataOnExit] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+  (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistory] =
+      settings_api::PrefType::PREF_TYPE_BOOLEAN;
+  (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistoryOnExit] =
+      settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kAlwaysShowBookmarkBarOnNTP] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kMRUCyclingEnabled] =
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
index 939ac99c1bfa..bcad292d8e7b 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
@@ -28,6 +28,14 @@
                       sub-label="[[counters.cookies]]"
                       no-set-pref>
   </settings-checkbox>
+  <settings-checkbox id="leoResetOnExitCheckbox"
+                      class="cache-checkbox"
+                      pref="{{prefs.browser.clear_data.brave_leo_on_exit}}"
+                      label="$i18n{leoClearHistoryData}"
+                      sub-label="$i18n{leoClearHistoryDataSubLabel}"
+                      hidden="[[isLeoAssistantNotAllowed_]]"
+                      no-set-pref>
+  </settings-checkbox>
   <settings-checkbox id="cacheCheckboxOnExit"
                       class="cache-checkbox"
                       pref="{{prefs.browser.clear_data.cache_on_exit}}"
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
index 447a9ed55811..e31b029e7ce9 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
@@ -43,6 +43,12 @@ Polymer({
       },
     },
 
+    isLeoAssistantNotAllowed_: {
+      type: Boolean,
+      value: function() {
+        return !loadTimeData.getBoolean('isLeoAssistantAllowed');
+      },
+    }
   },
 
   listeners: {'settings-boolean-control-change': 'updateModified_'},
diff --git a/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts b/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
index b1be69a6833d..a145ea704629 100644
--- a/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
+++ b/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
@@ -44,7 +44,11 @@ class BraveLeoAssistantPageElement extends BraveLeoAssistantPageBase {
       BraveLeoAssistantBrowserProxyImpl.getInstance()
 
     onResetAssistantData_() {
-      this.browserProxy_.resetLeoData()
+      var message =
+        this.i18n('braveLeoAssistantResetAndClearDataConfirmationText')
+      if(window.confirm(message)) {
+        this.browserProxy_.resetLeoData()
+      }
     }
 
     override ready () {
diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
index 32daf585f698..76eb604f458e 100644
--- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
+++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
@@ -88,5 +88,38 @@ RegisterPolymerTemplateModifications({
     } else {
       rewardsResetLink.textContent = loadTimeData.getString('resetRewardsData')
     }
+
+    // Append Leo reset checkbox
+    const isLeoAssistantAllowed = loadTimeData
+      .getBoolean('isLeoAssistantAllowed')
+    if(isLeoAssistantAllowed) {
+      const cacheCheckbox = templateContent
+        .querySelector('[id="cacheCheckbox"]')
+      if (!cacheCheckbox) {
+        console.error(`[Brave Settings Overrides] cannot find
+         'id="cacheCheckbox"' in clear-browsing-data-dialog`)
+        return
+      }
+      cacheCheckbox.insertAdjacentHTML(
+        'beforebegin',
+        getTrustedHTML`
+        <settings-checkbox id="leoResetCheckbox"
+        class="cookies-checkbox"
+        pref="{{prefs.browser.clear_data.brave_leo}}"
+        disabled="[[clearingInProgress_]]"
+        no-set-pref></settings-checkbox>`)
+
+      const leoResetCheckbox =
+        templateContent.querySelector('[id="leoResetCheckbox"]')
+      if (!leoResetCheckbox) {
+        console.error(
+          '[Brave Settings Overrides] Couldn\'t find Leo reset link')
+      } else {
+        leoResetCheckbox.setAttribute(
+          'label', loadTimeData.getString('leoClearHistoryData'))
+        leoResetCheckbox.setAttribute(
+          'sub-label', loadTimeData.getString('leoClearHistoryDataSubLabel'))
+      }
+    }
   }
 })
diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc
index c2e0c851e78e..57992f6be23a 100644
--- a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc
+++ b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc
@@ -373,6 +373,12 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_LEO_ASSISTANT_SHOW_SUGGESTED_PROMPTS_LABEL},
     {"braveLeoAssistantResetAndClearDataLabel",
      IDS_SETTINGS_LEO_ASSISTANT_RESET_AND_CLEAR_DATA_LABEL},
+    {"braveLeoAssistantResetAndClearDataConfirmationText",
+     IDS_SETTINGS_LEO_ASSISTANT_RESET_AND_CLEAR_DATA_CONFIRMATION_LABEL},
+    {"leoClearHistoryData",
+     IDS_SETTINGS_LEO_ASSISTANT_CLEAR_HISTORY_DATA_LABEL},
+    {"leoClearHistoryDataSubLabel",
+     IDS_SETTINGS_LEO_ASSISTANT_CLEAR_HISTORY_DATA_SUBLABEL},
 
     // New Tab Page
     {"braveNewTab", IDS_SETTINGS_NEW_TAB},
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
new file mode 100644
index 000000000000..4c2caec4d3c4
--- /dev/null
+++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
@@ -0,0 +1,18 @@
+/* Copyright (c) 2023 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_
+
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
+
+#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"  // IWYU pragma: export
+namespace chrome_browsing_data_remover {
+#if BUILDFLAG(ENABLE_AI_CHAT)
+constexpr DataType DATA_TYPE_BRAVE_LEO_HISTORY = DATA_TYPE_EMBEDDER_BEGIN << 13;
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+}
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index fd0614e99871..d50f62bd4199 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
 #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h"
 #include "chrome/browser/profiles/profile.h"
 
@@ -25,7 +26,17 @@ void BraveRemoveJumplist(Profile* profile) {
   }                                                                    \
   browsing_data_important_sites_util
 #endif
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#define NUM_TYPES                                                           \
+  BRAVE_AI_CHAT:                                                            \
+  remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \
+  break;                                                                    \
+  case BrowsingDataType::NUM_TYPES
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 #include "src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc"
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#undef NUM_TYPES
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 #if BUILDFLAG(IS_WIN)
 #undef browsing_data_important_sites_util
 #endif
diff --git a/chromium_src/components/browsing_data/core/DEPS b/chromium_src/components/browsing_data/core/DEPS
new file mode 100644
index 000000000000..b06128fc2df5
--- /dev/null
+++ b/chromium_src/components/browsing_data/core/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+brave/components/ai_chat/common/buildflags/buildflags.h",
+]
diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.cc b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
new file mode 100644
index 000000000000..31c6677e06fd
--- /dev/null
+++ b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
@@ -0,0 +1,57 @@
+/* Copyright (c) 2023 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "brave/chromium_src/components/browsing_data/core/browsing_data_utils.h"
+
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#define GetDeletionPreferenceFromDataType \
+  GetDeletionPreferenceFromDataType_ChromiumImpl
+#define GetDataTypeFromDeletionPreference \
+  GetDataTypeFromDeletionPreference_ChromiumImpl
+#define NUM_TYPES \
+  NUM_TYPES:      \
+  case BrowsingDataType::BRAVE_AI_CHAT
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+#include "src/components/browsing_data/core/browsing_data_utils.cc"
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#undef NUM_TYPES
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+#undef GetDataTypeFromDeletionPreference
+#undef GetDeletionPreferenceFromDataType
+
+namespace browsing_data {
+
+#if BUILDFLAG(ENABLE_AI_CHAT)
+bool GetDeletionPreferenceFromDataType(
+    BrowsingDataType data_type,
+    ClearBrowsingDataTab clear_browsing_data_tab,
+    std::string* out_pref) {
+  if (clear_browsing_data_tab == ClearBrowsingDataTab::ADVANCED &&
+      data_type == BrowsingDataType::BRAVE_AI_CHAT) {
+    *out_pref = prefs::kDeleteBraveLeoHistory;
+    return true;
+  }
+
+  return GetDeletionPreferenceFromDataType_ChromiumImpl(
+      data_type, clear_browsing_data_tab, out_pref);
+}
+
+absl::optional<BrowsingDataType> GetDataTypeFromDeletionPreference(
+    const std::string& pref_name) {
+  using DataTypeMap = base::flat_map<std::string, BrowsingDataType>;
+  static base::NoDestructor<DataTypeMap> preference_to_datatype(
+      std::initializer_list<DataTypeMap::value_type>{
+          {prefs::kDeleteBraveLeoHistory, BrowsingDataType::BRAVE_AI_CHAT},
+      });
+
+  auto iter = preference_to_datatype->find(pref_name);
+  if (iter != preference_to_datatype->end()) {
+    return iter->second;
+  }
+  return GetDataTypeFromDeletionPreference_ChromiumImpl(pref_name);
+}
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
+}  // namespace browsing_data
diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.h b/chromium_src/components/browsing_data/core/browsing_data_utils.h
new file mode 100644
index 000000000000..fcececdfa8cc
--- /dev/null
+++ b/chromium_src/components/browsing_data/core/browsing_data_utils.h
@@ -0,0 +1,18 @@
+/* Copyright (c) 2023 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_
+
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
+
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#define NUM_TYPES NUM_TYPES, BRAVE_AI_CHAT
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+#include "src/components/browsing_data/core/browsing_data_utils.h"  // IWYU pragma: export
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#undef NUM_TYPES
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_
diff --git a/chromium_src/components/browsing_data/core/pref_names.cc b/chromium_src/components/browsing_data/core/pref_names.cc
index bf159db20254..f1b5304ce145 100644
--- a/chromium_src/components/browsing_data/core/pref_names.cc
+++ b/chromium_src/components/browsing_data/core/pref_names.cc
@@ -24,6 +24,11 @@ const char kDeleteHostedAppsDataOnExit[] =
     "browser.clear_data.hosted_apps_data_on_exit";
 const char kDeleteSiteSettingsOnExit[] =
     "browser.clear_data.site_settings_on_exit";
+#if BUILDFLAG(ENABLE_AI_CHAT)    
+const char kDeleteBraveLeoHistory[] = "browser.clear_data.brave_leo";
+const char kDeleteBraveLeoHistoryOnExit[] =
+    "browser.clear_data.brave_leo_on_exit";
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 
 void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterBrowserUserPrefs_ChromiumImpl(registry);
@@ -36,6 +41,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kDeleteFormDataOnExit, false);
   registry->RegisterBooleanPref(kDeleteHostedAppsDataOnExit, false);
   registry->RegisterBooleanPref(kDeleteSiteSettingsOnExit, false);
+#if BUILDFLAG(ENABLE_AI_CHAT)
+  registry->RegisterBooleanPref(kDeleteBraveLeoHistory, false);
+  registry->RegisterBooleanPref(kDeleteBraveLeoHistoryOnExit, false);
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 }
 
 }  // namespace prefs
diff --git a/chromium_src/components/browsing_data/core/pref_names.h b/chromium_src/components/browsing_data/core/pref_names.h
index bb4bcd3aa5d9..775052f05878 100644
--- a/chromium_src/components/browsing_data/core/pref_names.h
+++ b/chromium_src/components/browsing_data/core/pref_names.h
@@ -6,6 +6,8 @@
 #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_PREF_NAMES_H_
 #define BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_PREF_NAMES_H_
 
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
+
 #include "src/components/browsing_data/core/pref_names.h"  // IWYU pragma: export
 
 namespace browsing_data {
@@ -20,7 +22,10 @@ extern const char kDeletePasswordsOnExit[];
 extern const char kDeleteFormDataOnExit[];
 extern const char kDeleteHostedAppsDataOnExit[];
 extern const char kDeleteSiteSettingsOnExit[];
-
+#if BUILDFLAG(ENABLE_AI_CHAT)
+extern const char kDeleteBraveLeoHistory[];
+extern const char kDeleteBraveLeoHistoryOnExit[];
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 }  // namespace prefs
 
 }  // namespace browsing_data

From 18144897fba681286f8cc803bd7658a6de2da4aa Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Tue, 1 Aug 2023 16:06:12 +0200
Subject: [PATCH 02/11] fix format

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 browser/browsing_data/brave_browsing_data_remover_delegate.h    | 2 +-
 .../browsing_data/chrome_browsing_data_remover_constants.h      | 2 +-
 chromium_src/components/browsing_data/core/pref_names.cc        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.h b/browser/browsing_data/brave_browsing_data_remover_delegate.h
index 8571fe13f8b4..64f8b4e5e4f1 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.h
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.h
@@ -51,7 +51,7 @@ class BraveBrowsingDataRemoverDelegate
   void ClearShieldsSettings(base::Time begin_time, base::Time end_time);
 #if BUILDFLAG(ENABLE_AI_CHAT)
   void ClearAiChatHistory(base::Time begin_time, base::Time end_time);
-#endif  // BUILDFLAG(ENABLE_AI_CHAT)  
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 #if BUILDFLAG(ENABLE_IPFS)
   void ClearIPFSCache();
   void WaitForIPFSRepoGC(base::Process process);
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
index 4c2caec4d3c4..f78ac738e46a 100644
--- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
@@ -13,6 +13,6 @@ namespace chrome_browsing_data_remover {
 #if BUILDFLAG(ENABLE_AI_CHAT)
 constexpr DataType DATA_TYPE_BRAVE_LEO_HISTORY = DATA_TYPE_EMBEDDER_BEGIN << 13;
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
-}
+}  // namespace chrome_browsing_data_remover
 
 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_
diff --git a/chromium_src/components/browsing_data/core/pref_names.cc b/chromium_src/components/browsing_data/core/pref_names.cc
index f1b5304ce145..f27c28ae0569 100644
--- a/chromium_src/components/browsing_data/core/pref_names.cc
+++ b/chromium_src/components/browsing_data/core/pref_names.cc
@@ -24,7 +24,7 @@ const char kDeleteHostedAppsDataOnExit[] =
     "browser.clear_data.hosted_apps_data_on_exit";
 const char kDeleteSiteSettingsOnExit[] =
     "browser.clear_data.site_settings_on_exit";
-#if BUILDFLAG(ENABLE_AI_CHAT)    
+#if BUILDFLAG(ENABLE_AI_CHAT)
 const char kDeleteBraveLeoHistory[] = "browser.clear_data.brave_leo";
 const char kDeleteBraveLeoHistoryOnExit[] =
     "browser.clear_data.brave_leo_on_exit";

From b751a686d682511db149400863b2b22856a1800b Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Tue, 1 Aug 2023 23:29:31 +0200
Subject: [PATCH 03/11] added gn patch

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 build/config/brave_build.gni                         |  1 +
 components/browsing_data/core/sources.gni            |  7 +++++++
 patches/components-browsing_data-core-BUILD.gn.patch | 12 ++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 components/browsing_data/core/sources.gni
 create mode 100644 patches/components-browsing_data-core-BUILD.gn.patch

diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni
index bb2395dade8c..8265df440881 100644
--- a/build/config/brave_build.gni
+++ b/build/config/brave_build.gni
@@ -15,6 +15,7 @@ import("//brave/browser/resources/history/sources.gni")
 import("//brave/browser/resources/settings/sources.gni")
 import("//brave/browser/ui/color/sources.gni")
 import("//brave/build/mac/config.gni")
+import("//brave/components/browsing_data/core/sources.gni")
 import("//brave/components/content_settings/core/browser/sources.gni")
 import("//brave/components/omnibox/browser/sources.gni")
 import("//brave/components/search_engines/sources.gni")
diff --git a/components/browsing_data/core/sources.gni b/components/browsing_data/core/sources.gni
new file mode 100644
index 000000000000..e6271132aa6a
--- /dev/null
+++ b/components/browsing_data/core/sources.gni
@@ -0,0 +1,7 @@
+# Copyright (c) 2023 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at https://mozilla.org/MPL/2.0/.
+
+brave_components_browsing_data_core_deps =
+    [ "//brave/components/ai_chat/common/buildflags" ]
diff --git a/patches/components-browsing_data-core-BUILD.gn.patch b/patches/components-browsing_data-core-BUILD.gn.patch
new file mode 100644
index 000000000000..bfc059cc27b6
--- /dev/null
+++ b/patches/components-browsing_data-core-BUILD.gn.patch
@@ -0,0 +1,12 @@
+diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn
+index 47b02706c77ba04fa994dd922e125a2e9bcd6119..020f099e7b07a563c7f0553fa774834ab33357d3 100644
+--- a/components/browsing_data/core/BUILD.gn
++++ b/components/browsing_data/core/BUILD.gn
+@@ -47,6 +47,7 @@ static_library("core") {
+     "//components/webdata/common",
+     "//ui/base",
+   ]
++  import("//brave/components/browsing_data/core/sources.gni") deps += brave_components_browsing_data_core_deps
+ }
+ 
+ if (is_android) {

From 04c34552853faed9eeee69c35852f959e23030c2 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Wed, 2 Aug 2023 02:05:23 +0200
Subject: [PATCH 04/11] fixed build

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 browser/extensions/api/settings_private/brave_prefs_util.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
index 5dcb4f18fd95..aaffdb9c2b97 100644
--- a/browser/extensions/api/settings_private/brave_prefs_util.cc
+++ b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -221,10 +221,12 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteHostedAppsDataOnExit] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+#if BUILDFLAG(ENABLE_AI_CHAT)
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistory] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistoryOnExit] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
   (*s_brave_allowlist)[kAlwaysShowBookmarkBarOnNTP] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kMRUCyclingEnabled] =

From 95827d1921b82d40e1ec93b38c5fedd3b7071c74 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Tue, 29 Aug 2023 18:02:46 +0200
Subject: [PATCH 05/11] fixes after code review

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 browser/browsing_data/BUILD.gn                       |  1 +
 .../brave_browsing_data_remover_delegate.cc          |  3 ++-
 .../brave_browsing_data_remover_delegate.h           |  1 +
 .../brave_clear_browsing_data_browsertest.cc         |  3 +++
 .../chrome_browsing_data_remover_constants.h         |  9 ++++++++-
 .../browsing_data/core/browsing_data_utils.cc        | 12 ++++++++----
 .../browsing_data/core/browsing_data_utils.h         |  3 +++
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/browser/browsing_data/BUILD.gn b/browser/browsing_data/BUILD.gn
index f69531d4ec2f..8fab8b760dd8 100644
--- a/browser/browsing_data/BUILD.gn
+++ b/browser/browsing_data/BUILD.gn
@@ -16,6 +16,7 @@ source_set("browser_tests") {
     deps = [
       "//base",
       "//base/test:test_support",
+      "//brave/components/ai_chat/common/buildflags:buildflags",
       "//chrome/app:command_ids",
       "//chrome/browser",
       "//chrome/browser/browsing_data:constants",
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
index 85a93d3b2e47..8cf81677b377 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
@@ -109,7 +109,8 @@ void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings(
 #if BUILDFLAG(ENABLE_AI_CHAT)
 void BraveBrowsingDataRemoverDelegate::ClearAiChatHistory(base::Time begin_time,
                                                           base::Time end_time) {
-  // Handler for the Brave Leo History clearing
+  // Handler for the Brave Leo History clearing.
+  // It is prepared for future implementation.
 }
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
 
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.h b/browser/browsing_data/brave_browsing_data_remover_delegate.h
index 64f8b4e5e4f1..f69d93152739 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.h
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.h
@@ -10,6 +10,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 
diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
index b2475f2fdb76..4f0ea7ff862a 100644
--- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
+++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
@@ -14,6 +14,7 @@
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/scoped_feature_list.h"
 #include "brave/browser/browsing_data/brave_clear_browsing_data.h"
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
 #include "chrome/browser/profiles/profile.h"
@@ -171,7 +172,9 @@ class BraveClearDataOnExitTest
            chrome_browsing_data_remover::DATA_TYPE_SITE_DATA |
            chrome_browsing_data_remover::DATA_TYPE_PASSWORDS |
            chrome_browsing_data_remover::DATA_TYPE_FORM_DATA |
+#if BUILDFLAG(ENABLE_AI_CHAT)
            chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY |
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
            chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS;
   }
 
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
index f78ac738e46a..7b30ec6acd19 100644
--- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
@@ -9,9 +9,16 @@
 #include "brave/components/ai_chat/common/buildflags/buildflags.h"
 
 #include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"  // IWYU pragma: export
+
 namespace chrome_browsing_data_remover {
+constexpr int BRAVE_DATA_TYPE_EMBEDDER_START_SHIFT_POS = 64 - 24;
+constexpr DataType GetBraveDataTypeValue(const int& index) {
+  return DATA_TYPE_EMBEDDER_BEGIN
+         << (BRAVE_DATA_TYPE_EMBEDDER_START_SHIFT_POS - index - 1);
+}
+
 #if BUILDFLAG(ENABLE_AI_CHAT)
-constexpr DataType DATA_TYPE_BRAVE_LEO_HISTORY = DATA_TYPE_EMBEDDER_BEGIN << 13;
+constexpr DataType DATA_TYPE_BRAVE_LEO_HISTORY = GetBraveDataTypeValue(0);
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
 }  // namespace chrome_browsing_data_remover
 
diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.cc b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
index 31c6677e06fd..d30281fc8ce0 100644
--- a/chromium_src/components/browsing_data/core/browsing_data_utils.cc
+++ b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
@@ -4,6 +4,7 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "brave/chromium_src/components/browsing_data/core/browsing_data_utils.h"
+#include "base/containers/fixed_flat_map.h"
 
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #define GetDeletionPreferenceFromDataType \
@@ -14,7 +15,9 @@
   NUM_TYPES:      \
   case BrowsingDataType::BRAVE_AI_CHAT
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #include "src/components/browsing_data/core/browsing_data_utils.cc"
+
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #undef NUM_TYPES
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
@@ -40,13 +43,14 @@ bool GetDeletionPreferenceFromDataType(
 
 absl::optional<BrowsingDataType> GetDataTypeFromDeletionPreference(
     const std::string& pref_name) {
-  using DataTypeMap = base::flat_map<std::string, BrowsingDataType>;
+  using DataTypeMap =
+      base::fixed_flat_map<std::string, BrowsingDataType, 1, std::less<>>;
   static base::NoDestructor<DataTypeMap> preference_to_datatype(
-      std::initializer_list<DataTypeMap::value_type>{
+      base::MakeFixedFlatMap<std::string, BrowsingDataType>({
           {prefs::kDeleteBraveLeoHistory, BrowsingDataType::BRAVE_AI_CHAT},
-      });
+      }));
 
-  auto iter = preference_to_datatype->find(pref_name);
+  auto* iter = preference_to_datatype->find(pref_name);
   if (iter != preference_to_datatype->end()) {
     return iter->second;
   }
diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.h b/chromium_src/components/browsing_data/core/browsing_data_utils.h
index fcececdfa8cc..1e7cd05442cc 100644
--- a/chromium_src/components/browsing_data/core/browsing_data_utils.h
+++ b/chromium_src/components/browsing_data/core/browsing_data_utils.h
@@ -11,8 +11,11 @@
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #define NUM_TYPES NUM_TYPES, BRAVE_AI_CHAT
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #include "src/components/browsing_data/core/browsing_data_utils.h"  // IWYU pragma: export
+
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #undef NUM_TYPES
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_

From 60e2d65fd09562cd04daf821b0acba2d4e22a204 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Wed, 30 Aug 2023 13:51:03 +0200
Subject: [PATCH 06/11] fixes after code review #2

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 .../brave_clear_browsing_data_browsertest.cc      |  2 ++
 .../api/settings_private/brave_prefs_util.cc      |  2 --
 .../brave_clear_browsing_data_on_exit_page.html   |  3 +--
 .../brave_clear_browsing_data_on_exit_page.ts     |  4 ++--
 .../brave_overrides/clear_browsing_data_dialog.ts | 13 +++++++------
 .../chrome_browsing_data_remover_constants.h      |  6 ++----
 .../settings_clear_browsing_data_handler.cc       |  4 ++++
 .../browsing_data/core/browsing_data_utils.cc     | 15 ++++++++-------
 .../components/browsing_data/core/pref_names.cc   |  7 -------
 .../components/browsing_data/core/pref_names.h    |  9 +++------
 10 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
index 4f0ea7ff862a..690d4c09626e 100644
--- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
+++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
@@ -161,8 +161,10 @@ class BraveClearDataOnExitTest
                             true);
     prefService->SetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit,
                             true);
+#if BUILDFLAG(ENABLE_AI_CHAT)
     prefService->SetBoolean(browsing_data::prefs::kDeleteBraveLeoHistoryOnExit,
                             true);
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
   }
 
   uint64_t GetRemoveMaskAll() {
diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
index aaffdb9c2b97..5dcb4f18fd95 100644
--- a/browser/extensions/api/settings_private/brave_prefs_util.cc
+++ b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -221,12 +221,10 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteHostedAppsDataOnExit] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
-#if BUILDFLAG(ENABLE_AI_CHAT)
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistory] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[browsing_data::prefs::kDeleteBraveLeoHistoryOnExit] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
-#endif  // BUILDFLAG(ENABLE_AI_CHAT)
   (*s_brave_allowlist)[kAlwaysShowBookmarkBarOnNTP] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kMRUCyclingEnabled] =
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
index bcad292d8e7b..8c83184a5971 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
@@ -29,11 +29,10 @@
                       no-set-pref>
   </settings-checkbox>
   <settings-checkbox id="leoResetOnExitCheckbox"
-                      class="cache-checkbox"
                       pref="{{prefs.browser.clear_data.brave_leo_on_exit}}"
                       label="$i18n{leoClearHistoryData}"
                       sub-label="$i18n{leoClearHistoryDataSubLabel}"
-                      hidden="[[isLeoAssistantNotAllowed_]]"
+                      hidden="[[!isLeoAssistantAllowed_]]"
                       no-set-pref>
   </settings-checkbox>
   <settings-checkbox id="cacheCheckboxOnExit"
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
index e31b029e7ce9..fd441b70da4d 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
@@ -43,10 +43,10 @@ Polymer({
       },
     },
 
-    isLeoAssistantNotAllowed_: {
+    isLeoAssistantAllowed_: {
       type: Boolean,
       value: function() {
-        return !loadTimeData.getBoolean('isLeoAssistantAllowed');
+        return loadTimeData.getBoolean('isLeoAssistantAllowed');
       },
     }
   },
diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
index 76eb604f458e..35d66cbbd03f 100644
--- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
+++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
@@ -92,7 +92,7 @@ RegisterPolymerTemplateModifications({
     // Append Leo reset checkbox
     const isLeoAssistantAllowed = loadTimeData
       .getBoolean('isLeoAssistantAllowed')
-    if(isLeoAssistantAllowed) {
+    if (isLeoAssistantAllowed) {
       const cacheCheckbox = templateContent
         .querySelector('[id="cacheCheckbox"]')
       if (!cacheCheckbox) {
@@ -103,11 +103,12 @@ RegisterPolymerTemplateModifications({
       cacheCheckbox.insertAdjacentHTML(
         'beforebegin',
         getTrustedHTML`
-        <settings-checkbox id="leoResetCheckbox"
-        class="cookies-checkbox"
-        pref="{{prefs.browser.clear_data.brave_leo}}"
-        disabled="[[clearingInProgress_]]"
-        no-set-pref></settings-checkbox>`)
+        <settings-checkbox 
+          id="leoResetCheckbox"
+          pref="{{prefs.browser.clear_data.brave_leo}}"
+          disabled="[[clearingInProgress_]]"
+          no-set-pref>
+        </settings-checkbox>`)
 
       const leoResetCheckbox =
         templateContent.querySelector('[id="leoResetCheckbox"]')
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
index 7b30ec6acd19..acac839f3b7f 100644
--- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
@@ -11,10 +11,8 @@
 #include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"  // IWYU pragma: export
 
 namespace chrome_browsing_data_remover {
-constexpr int BRAVE_DATA_TYPE_EMBEDDER_START_SHIFT_POS = 64 - 24;
-constexpr DataType GetBraveDataTypeValue(const int& index) {
-  return DATA_TYPE_EMBEDDER_BEGIN
-         << (BRAVE_DATA_TYPE_EMBEDDER_START_SHIFT_POS - index - 1);
+constexpr DataType GetBraveDataTypeValue(const int index) {
+  return DataType(1) << (63 - index);
 }
 
 #if BUILDFLAG(ENABLE_AI_CHAT)
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index d50f62bd4199..7c281583e34d 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -26,6 +26,7 @@ void BraveRemoveJumplist(Profile* profile) {
   }                                                                    \
   browsing_data_important_sites_util
 #endif
+
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #define NUM_TYPES                                                           \
   BRAVE_AI_CHAT:                                                            \
@@ -33,10 +34,13 @@ void BraveRemoveJumplist(Profile* profile) {
   break;                                                                    \
   case BrowsingDataType::NUM_TYPES
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #include "src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc"
+
 #if BUILDFLAG(ENABLE_AI_CHAT)
 #undef NUM_TYPES
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
+
 #if BUILDFLAG(IS_WIN)
 #undef browsing_data_important_sites_util
 #endif
diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.cc b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
index d30281fc8ce0..763dc81a9bc2 100644
--- a/chromium_src/components/browsing_data/core/browsing_data_utils.cc
+++ b/chromium_src/components/browsing_data/core/browsing_data_utils.cc
@@ -4,6 +4,7 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "brave/chromium_src/components/browsing_data/core/browsing_data_utils.h"
+
 #include "base/containers/fixed_flat_map.h"
 
 #if BUILDFLAG(ENABLE_AI_CHAT)
@@ -43,15 +44,15 @@ bool GetDeletionPreferenceFromDataType(
 
 absl::optional<BrowsingDataType> GetDataTypeFromDeletionPreference(
     const std::string& pref_name) {
-  using DataTypeMap =
-      base::fixed_flat_map<std::string, BrowsingDataType, 1, std::less<>>;
-  static base::NoDestructor<DataTypeMap> preference_to_datatype(
-      base::MakeFixedFlatMap<std::string, BrowsingDataType>({
+  static constexpr auto kPreferenceToDataType =
+      base::MakeFixedFlatMap<base::StringPiece, BrowsingDataType>({
           {prefs::kDeleteBraveLeoHistory, BrowsingDataType::BRAVE_AI_CHAT},
-      }));
+          {prefs::kDeleteBraveLeoHistoryOnExit,
+           BrowsingDataType::BRAVE_AI_CHAT},
+      });
 
-  auto* iter = preference_to_datatype->find(pref_name);
-  if (iter != preference_to_datatype->end()) {
+  auto* iter = kPreferenceToDataType.find(pref_name);
+  if (iter != kPreferenceToDataType.end()) {
     return iter->second;
   }
   return GetDataTypeFromDeletionPreference_ChromiumImpl(pref_name);
diff --git a/chromium_src/components/browsing_data/core/pref_names.cc b/chromium_src/components/browsing_data/core/pref_names.cc
index f27c28ae0569..76c996fc4c89 100644
--- a/chromium_src/components/browsing_data/core/pref_names.cc
+++ b/chromium_src/components/browsing_data/core/pref_names.cc
@@ -24,11 +24,6 @@ const char kDeleteHostedAppsDataOnExit[] =
     "browser.clear_data.hosted_apps_data_on_exit";
 const char kDeleteSiteSettingsOnExit[] =
     "browser.clear_data.site_settings_on_exit";
-#if BUILDFLAG(ENABLE_AI_CHAT)
-const char kDeleteBraveLeoHistory[] = "browser.clear_data.brave_leo";
-const char kDeleteBraveLeoHistoryOnExit[] =
-    "browser.clear_data.brave_leo_on_exit";
-#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 
 void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterBrowserUserPrefs_ChromiumImpl(registry);
@@ -41,10 +36,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kDeleteFormDataOnExit, false);
   registry->RegisterBooleanPref(kDeleteHostedAppsDataOnExit, false);
   registry->RegisterBooleanPref(kDeleteSiteSettingsOnExit, false);
-#if BUILDFLAG(ENABLE_AI_CHAT)
   registry->RegisterBooleanPref(kDeleteBraveLeoHistory, false);
   registry->RegisterBooleanPref(kDeleteBraveLeoHistoryOnExit, false);
-#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 }
 
 }  // namespace prefs
diff --git a/chromium_src/components/browsing_data/core/pref_names.h b/chromium_src/components/browsing_data/core/pref_names.h
index 775052f05878..db6757ad8bb0 100644
--- a/chromium_src/components/browsing_data/core/pref_names.h
+++ b/chromium_src/components/browsing_data/core/pref_names.h
@@ -6,8 +6,6 @@
 #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_PREF_NAMES_H_
 #define BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_PREF_NAMES_H_
 
-#include "brave/components/ai_chat/common/buildflags/buildflags.h"
-
 #include "src/components/browsing_data/core/pref_names.h"  // IWYU pragma: export
 
 namespace browsing_data {
@@ -22,10 +20,9 @@ extern const char kDeletePasswordsOnExit[];
 extern const char kDeleteFormDataOnExit[];
 extern const char kDeleteHostedAppsDataOnExit[];
 extern const char kDeleteSiteSettingsOnExit[];
-#if BUILDFLAG(ENABLE_AI_CHAT)
-extern const char kDeleteBraveLeoHistory[];
-extern const char kDeleteBraveLeoHistoryOnExit[];
-#endif  // BUILDFLAG(ENABLE_AI_CHAT)
+constexpr char kDeleteBraveLeoHistory[] = "browser.clear_data.brave_leo";
+constexpr char kDeleteBraveLeoHistoryOnExit[] =
+    "browser.clear_data.brave_leo_on_exit";
 }  // namespace prefs
 
 }  // namespace browsing_data

From c02fba72e455222da3d7d1b3274c07a147c8702b Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Wed, 30 Aug 2023 22:20:47 +0200
Subject: [PATCH 07/11] fixed label and sub-label loading

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 .../settings/brave_overrides/clear_browsing_data_dialog.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
index 35d66cbbd03f..47d5aa09eccc 100644
--- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
+++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
@@ -106,6 +106,8 @@ RegisterPolymerTemplateModifications({
         <settings-checkbox 
           id="leoResetCheckbox"
           pref="{{prefs.browser.clear_data.brave_leo}}"
+          label="[[i18n('leoClearHistoryData')]]"
+          sub-label="[[i18n('leoClearHistoryDataSubLabel')]]"
           disabled="[[clearingInProgress_]]"
           no-set-pref>
         </settings-checkbox>`)
@@ -115,11 +117,6 @@ RegisterPolymerTemplateModifications({
       if (!leoResetCheckbox) {
         console.error(
           '[Brave Settings Overrides] Couldn\'t find Leo reset link')
-      } else {
-        leoResetCheckbox.setAttribute(
-          'label', loadTimeData.getString('leoClearHistoryData'))
-        leoResetCheckbox.setAttribute(
-          'sub-label', loadTimeData.getString('leoClearHistoryDataSubLabel'))
       }
     }
   }

From f11eb16de49755afd26f07a3525411d82d923798 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Thu, 31 Aug 2023 16:04:16 +0200
Subject: [PATCH 08/11] added new feature flag 'brave-ai-chat-history', put the
 ai-chat history cleaning and related UX behind

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 browser/about_flags.cc                                 | 10 ++++++++++
 .../brave_browsing_data_remover_delegate.cc            |  8 +++++++-
 .../brave_clear_browsing_data_on_exit_page.html        |  2 +-
 .../brave_clear_browsing_data_on_exit_page.ts          |  5 +++--
 .../brave_overrides/clear_browsing_data_dialog.ts      |  9 +++++----
 browser/ui/webui/brave_settings_ui.cc                  |  3 +++
 components/ai_chat/common/features.cc                  |  8 ++++++++
 components/ai_chat/common/features.h                   |  4 ++++
 8 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/browser/about_flags.cc b/browser/about_flags.cc
index 65fe79ae48b0..7a4b6fc57e27 100644
--- a/browser/about_flags.cc
+++ b/browser/about_flags.cc
@@ -382,8 +382,17 @@
       kOsWin | kOsMac | kOsLinux | kOsAndroid,                 \
       FEATURE_VALUE_TYPE(ai_chat::features::kAIChat),          \
   })
+#define BRAVE_AI_CHAT_HISTORY                                \
+  EXPAND_FEATURE_ENTRIES({                                   \
+      "brave-ai-chat-history",                               \
+      "Brave AI Chat History",                               \
+      "Enables AI Chat History persistence and management",  \
+      kOsWin | kOsMac | kOsLinux,                            \
+      FEATURE_VALUE_TYPE(ai_chat::features::kAIChatHistory), \
+  })
 #else
 #define BRAVE_AI_CHAT
+#define BRAVE_AI_CHAT_HISTORY
 #endif
 
 // Keep the last item empty.
@@ -880,6 +889,7 @@
   BRAVE_CHANGE_ACTIVE_TAB_ON_SCROLL_EVENT_FEATURE_ENTRIES                      \
   BRAVE_SHARED_PINNED_TABS                                                     \
   BRAVE_AI_CHAT                                                                \
+  BRAVE_AI_CHAT_HISTORY                                                        \
   LAST_BRAVE_FEATURE_ENTRIES_ITEM  // Keep it as the last item.
 namespace flags_ui {
 namespace {
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
index 8cf81677b377..315a8452bd99 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
@@ -32,6 +32,10 @@
 #include "brave/components/ipfs/ipfs_service.h"
 #endif
 
+#if BUILDFLAG(ENABLE_AI_CHAT)
+#include "brave/components/ai_chat/common/features.h"
+#endif
+
 BraveBrowsingDataRemoverDelegate::BraveBrowsingDataRemoverDelegate(
     content::BrowserContext* browser_context)
     : ChromeBrowsingDataRemoverDelegate(browser_context),
@@ -71,7 +75,9 @@ void BraveBrowsingDataRemoverDelegate::RemoveEmbedderData(
         ->ClearHistory();
   }
 #if BUILDFLAG(ENABLE_AI_CHAT)
-  if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY) {
+  if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY &&
+      ai_chat::features::IsAIChatEnabled() &&
+      ai_chat::features::IsAIChatHistoryEnabled()) {
     ClearAiChatHistory(delete_begin, delete_end);
   }
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
index 8c83184a5971..fac819e1c81f 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.html
@@ -32,7 +32,7 @@
                       pref="{{prefs.browser.clear_data.brave_leo_on_exit}}"
                       label="$i18n{leoClearHistoryData}"
                       sub-label="$i18n{leoClearHistoryDataSubLabel}"
-                      hidden="[[!isLeoAssistantAllowed_]]"
+                      hidden="[[!isLeoAssistantAndHistoryAllowed_]]"
                       no-set-pref>
   </settings-checkbox>
   <settings-checkbox id="cacheCheckboxOnExit"
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
index fd441b70da4d..dc427c1ad1d7 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.ts
@@ -43,10 +43,11 @@ Polymer({
       },
     },
 
-    isLeoAssistantAllowed_: {
+    isLeoAssistantAndHistoryAllowed_: {
       type: Boolean,
       value: function() {
-        return loadTimeData.getBoolean('isLeoAssistantAllowed');
+        return loadTimeData.getBoolean('isLeoAssistantAllowed')
+          && loadTimeData.getBoolean('isLeoAssistantHistoryAllowed');
       },
     }
   },
diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
index 47d5aa09eccc..773be529337a 100644
--- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
+++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts
@@ -90,9 +90,10 @@ RegisterPolymerTemplateModifications({
     }
 
     // Append Leo reset checkbox
-    const isLeoAssistantAllowed = loadTimeData
-      .getBoolean('isLeoAssistantAllowed')
-    if (isLeoAssistantAllowed) {
+    const isLeoAssistantAndHistoryAllowed =
+      loadTimeData.getBoolean('isLeoAssistantAllowed')
+        && loadTimeData.getBoolean('isLeoAssistantHistoryAllowed')
+    if (isLeoAssistantAndHistoryAllowed) {
       const cacheCheckbox = templateContent
         .querySelector('[id="cacheCheckbox"]')
       if (!cacheCheckbox) {
@@ -103,7 +104,7 @@ RegisterPolymerTemplateModifications({
       cacheCheckbox.insertAdjacentHTML(
         'beforebegin',
         getTrustedHTML`
-        <settings-checkbox 
+        <settings-checkbox
           id="leoResetCheckbox"
           pref="{{prefs.browser.clear_data.brave_leo}}"
           label="[[i18n('leoClearHistoryData')]]"
diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc
index 6ee5d45a6da1..7b99fbf2e435 100644
--- a/browser/ui/webui/brave_settings_ui.cc
+++ b/browser/ui/webui/brave_settings_ui.cc
@@ -192,8 +192,11 @@ void BraveSettingsUI::AddResources(content::WebUIDataSource* html_source,
 #if BUILDFLAG(ENABLE_AI_CHAT)
   html_source->AddBoolean("isLeoAssistantAllowed",
                           ai_chat::features::IsAIChatEnabled());
+  html_source->AddBoolean("isLeoAssistantHistoryAllowed",
+                          ai_chat::features::IsAIChatHistoryEnabled());
 #else
   html_source->AddBoolean("isLeoAssistantAllowed", false);
+  html_source->AddBoolean("isLeoAssistantHistoryAllowed", false);
 #endif
 }
 
diff --git a/components/ai_chat/common/features.cc b/components/ai_chat/common/features.cc
index f08b0c4780c7..5de62f33f8bd 100644
--- a/components/ai_chat/common/features.cc
+++ b/components/ai_chat/common/features.cc
@@ -22,4 +22,12 @@ bool IsAIChatEnabled() {
   return base::FeatureList::IsEnabled(features::kAIChat);
 }
 
+BASE_FEATURE(kAIChatHistory,
+             "kAIChatHistory",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
+bool IsAIChatHistoryEnabled() {
+  return base::FeatureList::IsEnabled(features::kAIChatHistory);
+}
+
 }  // namespace ai_chat::features
diff --git a/components/ai_chat/common/features.h b/components/ai_chat/common/features.h
index 23b35ea3282a..137510e98399 100644
--- a/components/ai_chat/common/features.h
+++ b/components/ai_chat/common/features.h
@@ -20,6 +20,10 @@ extern const base::FeatureParam<double> kAITemperature;
 
 bool IsAIChatEnabled();
 
+BASE_DECLARE_FEATURE(kAIChatHistory);
+
+bool IsAIChatHistoryEnabled();
+
 }  // namespace ai_chat::features
 
 #endif  // BRAVE_COMPONENTS_AI_CHAT_COMMON_FEATURES_H_

From 6d95267f599b1cc326994126f81188785fe7ffd7 Mon Sep 17 00:00:00 2001
From: vadims <118171981+vadimstruts@users.noreply.github.com>
Date: Mon, 18 Sep 2023 10:57:25 +0200
Subject: [PATCH 09/11] Update
 browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts

applied nit fix

Co-authored-by: Jay Harris <jay.harris@outlook.co.nz>
---
 .../brave_leo_assistant_page/brave_leo_assistant_page.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts b/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
index a145ea704629..d3e53055610d 100644
--- a/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
+++ b/browser/resources/settings/brave_leo_assistant_page/brave_leo_assistant_page.ts
@@ -44,7 +44,7 @@ class BraveLeoAssistantPageElement extends BraveLeoAssistantPageBase {
       BraveLeoAssistantBrowserProxyImpl.getInstance()
 
     onResetAssistantData_() {
-      var message =
+      const message =
         this.i18n('braveLeoAssistantResetAndClearDataConfirmationText')
       if(window.confirm(message)) {
         this.browserProxy_.resetLeoData()

From feb1b88b7fe2733849cc476b631080d07c4a79cd Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Wed, 20 Sep 2023 00:49:06 +0200
Subject: [PATCH 10/11] fixed build on android

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 .../android/browsing_data/browsing_data_bridge.cc     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
index ec993b4a503c..db7e4b629f8c 100644
--- a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
+++ b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -3,9 +3,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "brave/components/ai_chat/common/buildflags/buildflags.h"
+
+#if !BUILDFLAG(ENABLE_AI_CHAT)
 #define BRAVE_CLEAR_BROWSING_DATA                          \
   remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; \
   break;
+#else  // BUILDFLAG(ENABLE_AI_CHAT)
+#define BRAVE_CLEAR_BROWSING_DATA                                           \
+  remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS;                  \
+  break;                                                                    \
+  case browsing_data::BrowsingDataType::BRAVE_AI_CHAT:                      \
+  remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \
+  break;
+#endif  // BUILDFLAG(ENABLE_AI_CHAT)
 
 #include "src/chrome/browser/android/browsing_data/browsing_data_bridge.cc"
 #undef BRAVE_CLEAR_BROWSING_DATA

From 2cd79880f1fa61f2aa521b375b47d879be100912 Mon Sep 17 00:00:00 2001
From: Vadym Struts <vstruts@brave.com>
Date: Wed, 20 Sep 2023 00:52:04 +0200
Subject: [PATCH 11/11] fixed build & format

Signed-off-by: Vadym Struts <vstruts@brave.com>
---
 .../android/browsing_data/browsing_data_bridge.cc    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
index db7e4b629f8c..623014cf1af0 100644
--- a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
+++ b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -10,12 +10,12 @@
   remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; \
   break;
 #else  // BUILDFLAG(ENABLE_AI_CHAT)
-#define BRAVE_CLEAR_BROWSING_DATA                                           \
-  remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS;                  \
-  break;                                                                    \
-  case browsing_data::BrowsingDataType::BRAVE_AI_CHAT:                      \
-  remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \
-  break;
+#define BRAVE_CLEAR_BROWSING_DATA                                             \
+  remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS;                    \
+  break;                                                                      \
+  case browsing_data::BrowsingDataType::BRAVE_AI_CHAT:                        \
+    remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \
+    break;
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
 
 #include "src/chrome/browser/android/browsing_data/browsing_data_bridge.cc"