| Index: components/sync_driver/non_ui_model_type_controller_unittest.cc
|
| diff --git a/components/sync_driver/non_ui_model_type_controller_unittest.cc b/components/sync_driver/non_ui_model_type_controller_unittest.cc
|
| index a309c36a04f34b4ad6f19ab6b1e1b3928be3c6d8..edf8ce4d60f679079c19536d1bc09c7817ebb60e 100644
|
| --- a/components/sync_driver/non_ui_model_type_controller_unittest.cc
|
| +++ b/components/sync_driver/non_ui_model_type_controller_unittest.cc
|
| @@ -54,8 +54,6 @@ class TestNonUIModelTypeController : public NonUIModelTypeController {
|
| return model_task_runner_->PostTask(from_here, task);
|
| }
|
|
|
| - void InitializeProcessorInTest() { InitializeProcessor(); }
|
| -
|
| private:
|
| ~TestNonUIModelTypeController() override {}
|
|
|
| @@ -167,7 +165,6 @@ class NonUIModelTypeControllerTest : public testing::Test,
|
| controller_ = new TestNonUIModelTypeController(
|
| ui_loop_.task_runner(), model_thread_runner_, base::Closure(),
|
| syncer::DICTIONARY, this);
|
| - controller_->InitializeProcessorInTest();
|
| InitializeTypeProcessor();
|
| }
|
|
|
| @@ -186,7 +183,10 @@ class NonUIModelTypeControllerTest : public testing::Test,
|
| void InitializeTypeProcessor() {
|
| if (!model_thread_runner_ ||
|
| model_thread_runner_->BelongsToCurrentThread()) {
|
| - type_processor_ = controller_->get_type_processor();
|
| + // TODO(crbug.com/543407): Move the processor stuff out.
|
| + type_processor_ =
|
| + service_->SetUpProcessor(new syncer_v2::SharedModelTypeProcessor(
|
| + syncer::DICTIONARY, service_.get()));
|
| } else {
|
| model_thread_runner_->PostTask(
|
| FROM_HERE,
|
|
|