diff --git a/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.cc b/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.cc index 5a97bef79c9..f5db11f3227 100644 --- a/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.cc +++ b/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.cc @@ -25,7 +25,7 @@ BraveHistoryDeleteDirectivesModelTypeController:: BraveHistoryDeleteDirectivesModelTypeController:: ~BraveHistoryDeleteDirectivesModelTypeController() = default; -syncer::DataTypeController::PreconditionState +syncer::ModelTypeController::PreconditionState BraveHistoryDeleteDirectivesModelTypeController::GetPreconditionState() const { DCHECK(CalledOnValidThread()); return PreconditionState::kPreconditionsMet; diff --git a/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h b/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h index a2b8e6f97e4..c9a93aacc80 100644 --- a/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h +++ b/components/history/core/browser/sync/brave_history_delete_directives_model_type_controller.h @@ -36,7 +36,7 @@ class BraveHistoryDeleteDirectivesModelTypeController ~BraveHistoryDeleteDirectivesModelTypeController() override; - // DataTypeController overrides. + // ModelTypeController overrides. PreconditionState GetPreconditionState() const override; }; 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 index 0a980c4fe7f..2564da48734 100644 --- a/components/history/core/browser/sync/brave_history_model_type_controller.cc +++ b/components/history/core/browser/sync/brave_history_model_type_controller.cc @@ -19,7 +19,7 @@ BraveHistoryModelTypeController::BraveHistoryModelTypeController( BraveHistoryModelTypeController::~BraveHistoryModelTypeController() = default; -syncer::DataTypeController::PreconditionState +syncer::ModelTypeController::PreconditionState BraveHistoryModelTypeController::GetPreconditionState() const { 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 index cc585c00c9f..1858dd4bd71 100644 --- a/components/history/core/browser/sync/brave_history_model_type_controller.h +++ b/components/history/core/browser/sync/brave_history_model_type_controller.h @@ -39,7 +39,7 @@ class BraveHistoryModelTypeController : public HistoryModelTypeController { ~BraveHistoryModelTypeController() override; - // syncer::DataTypeController implementation. + // syncer::ModelTypeController implementation. PreconditionState GetPreconditionState() const override; }; diff --git a/components/sync/service/brave_sync_service_impl_unittest.cc b/components/sync/service/brave_sync_service_impl_unittest.cc index d6829a0d9d8..3ee3dd313a3 100644 --- a/components/sync/service/brave_sync_service_impl_unittest.cc +++ b/components/sync/service/brave_sync_service_impl_unittest.cc @@ -104,7 +104,7 @@ class BraveSyncServiceImplTest : public testing::Test { void CreateSyncService( ModelTypeSet registered_types = ModelTypeSet({BOOKMARKS})) { - DataTypeController::TypeVector controllers; + ModelTypeController::TypeVector controllers; for (ModelType type : registered_types) { controllers.push_back(std::make_unique(type)); } @@ -556,7 +556,7 @@ TEST_F(BraveSyncServiceImplTest, HistoryPreconditions) { auto history_precondition_state = history_model_type_controller->GetPreconditionState(); EXPECT_EQ(history_precondition_state, - DataTypeController::PreconditionState::kPreconditionsMet); + ModelTypeController::PreconditionState::kPreconditionsMet); auto test_model_type_store_service = std::make_unique(); @@ -568,7 +568,7 @@ TEST_F(BraveSyncServiceImplTest, HistoryPreconditions) { auto history_delete_directives_precondition_state = history_delete_directives_model_type_controller->GetPreconditionState(); EXPECT_EQ(history_delete_directives_precondition_state, - DataTypeController::PreconditionState::kPreconditionsMet); + ModelTypeController::PreconditionState::kPreconditionsMet); OSCryptMocker::TearDown(); }