Chromium Code Reviews| 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..7e79341e9a708d14f5fa995323504956ffc44ddc 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,11 @@ class NonUIModelTypeControllerTest : public testing::Test, |
| void InitializeTypeProcessor() { |
| if (!model_thread_runner_ || |
| model_thread_runner_->BelongsToCurrentThread()) { |
| - type_processor_ = controller_->get_type_processor(); |
| + syncer_v2::ModelTypeChangeProcessor* model_type_change_processor = |
| + service_->CreateProcessorForTest(); |
|
maxbogue
2016/03/22 21:40:12
You're using CreateProcessorForTest to sidestep th
Gang Wu
2016/03/24 15:56:26
Done.
|
| + type_processor_ = static_cast<syncer_v2::SharedModelTypeProcessor*>( |
| + model_type_change_processor) |
| + ->AsWeakPtrForUI(); |
| } else { |
| model_thread_runner_->PostTask( |
| FROM_HERE, |