Account for new HistoryModelTypeController function signature

Chromium change: https://source.chromium.org/chromium/chromium/src/+/5f7858ba874b7339f9fdadd1b54f3a13e23ab0f4 commit 5f7858ba874b7339f9fdadd1b54f3a13e23ab0f4 Author: Marc Treib <[email protected]> Date: Mon Sep 11 15:42:55 2023 +0000 History Sync cleanup: Simplify HistoryModelTypeController This controller used to be used for both HISTORY and TYPED_URLS. Now TYPED_URLS is gone, allowing for some simplification. Bug: 1365291
brave · Oct 23, 2023 · a58caef · a58caef
1 parent 300344e
commit a58caef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/components/history/core/browser/sync/brave_history_model_type_controller.cc b/components/history/core/browser/sync/brave_history_model_type_controller.cc
@@ -5,19 +5,14 @@
 
 #include "brave/components/history/core/browser/sync/brave_history_model_type_controller.h"
 
-#include "base/feature_list.h"
-#include "components/sync/base/features.h"
-
 namespace history {
 
 BraveHistoryModelTypeController::BraveHistoryModelTypeController(
-    syncer::ModelType model_type,
     syncer::SyncService* sync_service,
     signin::IdentityManager* identity_manager,
     HistoryService* history_service,
     PrefService* pref_service)
-    : HistoryModelTypeController(model_type,
-                                 sync_service,
+    : HistoryModelTypeController(sync_service,
                                  identity_manager,
                                  history_service,
                                  pref_service) {}
@@ -26,16 +21,6 @@ BraveHistoryModelTypeController::~BraveHistoryModelTypeController() = default;
 
 syncer::DataTypeController::PreconditionState
 BraveHistoryModelTypeController::GetPreconditionState() const {
-  if (!base::FeatureList::IsEnabled(syncer::kSyncEnableHistoryDataType)) {
-    DCHECK_EQ(type(), syncer::TYPED_URLS);
-    return HistoryModelTypeController::GetPreconditionState();
-  }
-
-  // If the History feature flag is enabled, HISTORY replaces TYPED_URLS.
-  if (type() == syncer::TYPED_URLS) {
-    return PreconditionState::kMustStopAndClearData;
-  }
-  DCHECK_EQ(type(), syncer::HISTORY);
   return PreconditionState::kPreconditionsMet;
 }
 

diff --git a/components/history/core/browser/sync/brave_history_model_type_controller.h b/components/history/core/browser/sync/brave_history_model_type_controller.h
@@ -27,8 +27,7 @@ class HistoryService;
 
 class BraveHistoryModelTypeController : public HistoryModelTypeController {
  public:
-  BraveHistoryModelTypeController(syncer::ModelType model_type,
-                                  syncer::SyncService* sync_service,
+  BraveHistoryModelTypeController(syncer::SyncService* sync_service,
                                   signin::IdentityManager* identity_manager,
                                   HistoryService* history_service,
                                   PrefService* pref_service);

diff --git a/components/sync/service/brave_sync_service_impl_unittest.cc b/components/sync/service/brave_sync_service_impl_unittest.cc
@@ -531,7 +531,7 @@ TEST_F(BraveSyncServiceImplTest, HistoryPreconditions) {
 
   auto history_model_type_controller =
       std::make_unique<history::BraveHistoryModelTypeController>(
-          HISTORY, brave_sync_service_impl(), identity_manager(), nullptr,
+          brave_sync_service_impl(), identity_manager(), nullptr,
           pref_service());
 
   auto history_precondition_state =