DataTypeController renamed

`DataTypeController` has been renamed to `ModelTypeController`. This
change corrects the references to the old type to use the new one.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/2508ad67e158360e8b9b682c0c403a31deae91ee

commit 2508ad67e158360e8b9b682c0c403a31deae91ee
Author: Marc Treib <treib@chromium.org>
Date:   Mon Mar 25 13:52:49 2024 +0000

    Cleanup: Merge DataTypeController into ModelTypeController

    DataTypeController was the (abstract) base class of
    ModelTypeController.
    In the past, there were multiple implementations of
    DataTypeController, but that's no longer the case, so the split of
    Data.. vs Model.. was no longer necessary.

    This CL merges DataTypeController into ModelTypeController.
    "DataTypeController" still exists as an alias, so that all the (many)
    references to it can be cleaned up separately in followup CLs.

    Bug: 41487792
This commit is contained in:
Claudio DeSouza
2024-05-03 16:54:05 -04:00
committed by mkarolin
parent 5c021646e0
commit 3b918149ee
5 changed files with 7 additions and 7 deletions
@@ -25,7 +25,7 @@ BraveHistoryDeleteDirectivesModelTypeController::
BraveHistoryDeleteDirectivesModelTypeController::
~BraveHistoryDeleteDirectivesModelTypeController() = default;
syncer::DataTypeController::PreconditionState
syncer::ModelTypeController::PreconditionState
BraveHistoryDeleteDirectivesModelTypeController::GetPreconditionState() const {
DCHECK(CalledOnValidThread());
return PreconditionState::kPreconditionsMet;
@@ -36,7 +36,7 @@ class BraveHistoryDeleteDirectivesModelTypeController
~BraveHistoryDeleteDirectivesModelTypeController() override;
// DataTypeController overrides.
// ModelTypeController overrides.
PreconditionState GetPreconditionState() const override;
};
@@ -19,7 +19,7 @@ BraveHistoryModelTypeController::BraveHistoryModelTypeController(
BraveHistoryModelTypeController::~BraveHistoryModelTypeController() = default;
syncer::DataTypeController::PreconditionState
syncer::ModelTypeController::PreconditionState
BraveHistoryModelTypeController::GetPreconditionState() const {
return PreconditionState::kPreconditionsMet;
}
@@ -39,7 +39,7 @@ class BraveHistoryModelTypeController : public HistoryModelTypeController {
~BraveHistoryModelTypeController() override;
// syncer::DataTypeController implementation.
// syncer::ModelTypeController implementation.
PreconditionState GetPreconditionState() const override;
};
@@ -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<FakeDataTypeController>(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<TestModelTypeStoreService>();
@@ -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();
}