brave · AlexeyBarabash · Oct 19, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
diff --git a/browser/about_flags.cc b/browser/about_flags.cc
@@ -854,30 +854,13 @@
           kOsDesktop | kOsAndroid,                                             \
           FEATURE_VALUE_TYPE(translate::kTranslate),                           \
       },                                                                       \
-      {                                                                        \
-          "brave-sync-history-diagnostics",                                    \
-          "Enable Brave Sync History Diagnostics",                             \
-          "Brave Sync History Diagnostics flag displays additional sync "      \
-          "related information on History page",                               \
-          kOsAll,                                                              \
-          FEATURE_VALUE_TYPE(                                                  \
-              brave_sync::features::kBraveSyncHistoryDiagnostics),             \
-      },                                                                       \
       {                                                                        \
           "restrict-event-source-pool",                                        \
           "Restrict Event Source Pool",                                        \
           "Limits simultaneous active WebSockets connections per eTLD+1",      \
           kOsAll,                                                              \
           FEATURE_VALUE_TYPE(blink::features::kRestrictEventSourcePool),       \
       },                                                                       \
-      {                                                                        \
-          "brave-sync-send-all-history",                                       \
-          "Send All History to Brave Sync",                                    \
-          "With Send All History flag all sync entries are sent to Sync "      \
-          "server including transitions of link, bookmark, reload, etc",       \
-          kOsAll,                                                              \
-          FEATURE_VALUE_TYPE(brave_sync::features::kBraveSyncSendAllHistory),  \
-      },                                                                       \
       {                                                                        \
           "brave-copy-clean-link-by-default",                                  \
           "Override default copy hotkey with copy clean link",                 \

diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni
@@ -20,7 +20,6 @@ import("//brave/components/content_settings/core/browser/sources.gni")
 import("//brave/components/omnibox/browser/sources.gni")
 import("//brave/components/search_engines/sources.gni")
 import("//brave/components/sync/service/sources.gni")
-import("//brave/components/sync/sources.gni")
 import("//brave/components/sync_device_info/sources.gni")
 import("//brave/components/update_client/sources.gni")
 import("//brave/installer/linux/sources.gni")

@@ -39,8 +39,6 @@
         "chrome/install_static/brave_restore_google_update_integration.h",
         "chrome/install_static/brave_stash_google_update_integration.h",
         "chrome/install_static/brave_user_data_dir_win_unittest.cc",
-        "components/history/core/browser/sync/brave_typed_url_sync_bridge_unittest.cc",
-        "components/history/core/browser/sync/chromium_typed_url_sync_bridge_unittest.cc",
         "components/privacy_sandbox/privacy_sandbox_settings_unittest.cc",
         "components/search_engines/brave_template_url_prepopulate_data_unittest.cc",
         "components/search_engines/brave_template_url_service_util_unittest.cc",

@@ -0,0 +1,4 @@
+include_rules = [
+  "+brave/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h",
+  "+brave/components/history/core/browser/sync/brave_history_model_type_controller.h",
+]
@@ -0,0 +1,17 @@
+/* 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/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h"
+#include "brave/components/history/core/browser/sync/brave_history_model_type_controller.h"
+
+#define HistoryDeleteDirectivesModelTypeController \
+  BraveHistoryDeleteDirectivesModelTypeController
+
+#define HistoryModelTypeController BraveHistoryModelTypeController
+
+#include "src/components/browser_sync/sync_api_component_factory_impl.cc"
+
+#undef HistoryModelTypeController
+#undef HistoryDeleteDirectivesModelTypeController
@@ -0,0 +1,3 @@
+include_rules = [
+  "+src/components/history/core/browser/sync/delete_directive_handler_unittest.cc",
+]
@@ -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/. */
+
+#include "components/history/core/browser/sync/delete_directive_handler.h"
+
+#define CreateUrlDeleteDirective CreateUrlDeleteDirective_ChromiumImpl
+#include "src/components/history/core/browser/sync/delete_directive_handler.cc"
+#undef CreateUrlDeleteDirective
+
+namespace history {
+
+bool DeleteDirectiveHandler::CreateUrlDeleteDirective(const GURL& url) {
+  return false;
+}
+
+}  // namespace history
@@ -0,0 +1,17 @@
+/* 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_HISTORY_CORE_BROWSER_SYNC_DELETE_DIRECTIVE_HANDLER_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_SYNC_DELETE_DIRECTIVE_HANDLER_H_
+
+#define CreateTimeRangeDeleteDirective                    \
+  CreateUrlDeleteDirective_ChromiumImpl(const GURL& url); \
+  bool CreateTimeRangeDeleteDirective
+
+#include "src/components/history/core/browser/sync/delete_directive_handler.h"  // IWYU pragma: export
+
+#undef CreateTimeRangeDeleteDirective
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_SYNC_DELETE_DIRECTIVE_HANDLER_H_
@@ -0,0 +1,17 @@
+/* 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 "src/components/history/core/browser/sync/delete_directive_handler_unittest.cc"
+
+namespace history {
+namespace {
+
+TEST_F(HistoryDeleteDirectiveHandlerTest,
+       BraveCreateUrlDeleteDirectiveReturnsFalse) {
+  EXPECT_FALSE(handler()->CreateUrlDeleteDirective(GURL("https://brave.com")));
+}
+
+}  // namespace
+}  // namespace history